diff --git a/.changeset/afraid-horses-argue.md b/.changeset/afraid-horses-argue.md
new file mode 100644
index 0000000000..fa4b46df5d
--- /dev/null
+++ b/.changeset/afraid-horses-argue.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Updated kubernetes config schema to match available options
diff --git a/.changeset/blue-walls-drop.md b/.changeset/blue-walls-drop.md
new file mode 100644
index 0000000000..a8e9ea1d33
--- /dev/null
+++ b/.changeset/blue-walls-drop.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': minor
+---
+
+Plugins that instantiate the `KubernetesProxy` must now provide a parameter of the type `KubernetesProxyOptions` which includes providing a `KubernetesAuthTranslator`. The `KubernetesBuilder` now builds its own `KubernetesAuthTranslatorMap` that it provides to the `KubernetesProxy`. The `DispatchingKubernetesAuthTranslator` expects a `KubernetesTranslatorMap` to be provided as a parameter. The `KubernetesBuilder` now has a method called `setAuthTranslatorMap` which allows integrators to bring their own `KubernetesAuthTranslator's` to the `KubernetesPlugin`.
diff --git a/.changeset/brave-forks-pull.md b/.changeset/brave-forks-pull.md
new file mode 100644
index 0000000000..b7088f2721
--- /dev/null
+++ b/.changeset/brave-forks-pull.md
@@ -0,0 +1,9 @@
+---
+'@backstage/backend-common': patch
+---
+
+Support commit hashes at `GithubUrlReader.readTree/search` additionally to branch names.
+
+Additionally, this will reduce the number of API calls from 2 to 1 for retrieving the "repo details"
+for all cases besides when the default branch has to be resolved and used
+(e.g., repo URL without any branch or commit hash).
diff --git a/.changeset/bright-hats-compare.md b/.changeset/bright-hats-compare.md
new file mode 100644
index 0000000000..148eaa29ce
--- /dev/null
+++ b/.changeset/bright-hats-compare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli-node': minor
+---
+
+Introduced the new `@backstage/cli-node` package, which provides utilities for use across Backstage CLIs.
diff --git a/.changeset/calm-geese-obey.md b/.changeset/calm-geese-obey.md
new file mode 100644
index 0000000000..b45295f8ff
--- /dev/null
+++ b/.changeset/calm-geese-obey.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-kubernetes': minor
+---
+
+refactor kubernetes error detection to make way for proposed solutions
+
+**BREAKING**: `DetectedError` now appears once per Kubernetes resource per error instead of for all resources which have that error, `namespace` and `name` fields are now in `sourceRef` object `message` is now a `string` instead of a `string[]`. `ErrorDetectableKind` has been removed.
diff --git a/.changeset/calm-otters-destroy.md b/.changeset/calm-otters-destroy.md
new file mode 100644
index 0000000000..cf3792cf4c
--- /dev/null
+++ b/.changeset/calm-otters-destroy.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
diff --git a/.changeset/clever-lizards-whisper.md b/.changeset/clever-lizards-whisper.md
new file mode 100644
index 0000000000..4f2820c347
--- /dev/null
+++ b/.changeset/clever-lizards-whisper.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+When building a backend package with dependencies any `--config <path>` options will now be forwarded to any dependent app package builds, unless the build script in the app package already contains a `--config` option.
diff --git a/.changeset/clever-plums-decide.md b/.changeset/clever-plums-decide.md
new file mode 100644
index 0000000000..7d01792f00
--- /dev/null
+++ b/.changeset/clever-plums-decide.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-bazaar-backend': patch
+'@backstage/plugin-bazaar': patch
+---
+
+Added the `docs` parameter (optional) to link the project documentation
diff --git a/.changeset/cold-coats-nail.md b/.changeset/cold-coats-nail.md
new file mode 100644
index 0000000000..db28b6f27a
--- /dev/null
+++ b/.changeset/cold-coats-nail.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+`scaffolder/next`: Bump `@rjsf/*` dependencies to 5.5.2
diff --git a/.changeset/cold-seahorses-greet.md b/.changeset/cold-seahorses-greet.md
new file mode 100644
index 0000000000..71bc5db2cc
--- /dev/null
+++ b/.changeset/cold-seahorses-greet.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Updates and moves OpenAPI spec to `src/schema/openapi.yaml` and uses `ApiRouter` type from `@backstage/backend-openapi-utils` to handle automatic types from the OpenAPI spec file.
diff --git a/.changeset/create-app-1681222813.md b/.changeset/create-app-1681222813.md
new file mode 100644
index 0000000000..b50d431d4b
--- /dev/null
+++ b/.changeset/create-app-1681222813.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Bumped create-app version.
diff --git a/.changeset/dependabot-ff5881d.md b/.changeset/dependabot-ff5881d.md
new file mode 100644
index 0000000000..d08ceea0e4
--- /dev/null
+++ b/.changeset/dependabot-ff5881d.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-code-coverage-backend': patch
+---
+
+Bump `xml2js` from 0.4.23 to 0.5.0
diff --git a/.changeset/eight-trainers-smoke.md b/.changeset/eight-trainers-smoke.md
new file mode 100644
index 0000000000..4c3cd33fbb
--- /dev/null
+++ b/.changeset/eight-trainers-smoke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-client': patch
+---
+
+Fixed bug in `queryEntities` of `CatalogClient` where the `sortField` is supposed to be changed to `orderField`.
diff --git a/.changeset/famous-beds-break.md b/.changeset/famous-beds-break.md
new file mode 100644
index 0000000000..a3d2e929a8
--- /dev/null
+++ b/.changeset/famous-beds-break.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-permission-node': patch
+---
+
+Introduced alpha export of the `policyExtensionPoint` for use in the new backend system.
diff --git a/.changeset/famous-beds-repair.md b/.changeset/famous-beds-repair.md
new file mode 100644
index 0000000000..f08506b130
--- /dev/null
+++ b/.changeset/famous-beds-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-permission-backend': patch
+---
+
+Introduced alpha export of the `permissionPlugin` for use in the new backend system, along with a `permissionModuleAllowAllPolicy` that can be used to allow all requests.
diff --git a/.changeset/famous-olives-try.md b/.changeset/famous-olives-try.md
new file mode 100644
index 0000000000..3150197203
--- /dev/null
+++ b/.changeset/famous-olives-try.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix some hard-coded white font colors in scaffolder
diff --git a/.changeset/forty-adults-divide.md b/.changeset/forty-adults-divide.md
new file mode 100644
index 0000000000..55d1e3f5d8
--- /dev/null
+++ b/.changeset/forty-adults-divide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Internal refactor to move many internal utilities to the new `@backstage/cli-node` package.
diff --git a/.changeset/fresh-lions-compete.md b/.changeset/fresh-lions-compete.md
new file mode 100644
index 0000000000..87f15f538d
--- /dev/null
+++ b/.changeset/fresh-lions-compete.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': minor
+---
+
+Adding two new commands to support OpenAPI spec writing, `schema:openapi:generate` to generate the Typescript file that `@backstage/backend-openapi-utils` needs for typing and `schema:openapi:verify` to verify that this file exists and matches your `src/schema/openapi.yaml` file.
diff --git a/.changeset/gentle-walls-invent.md b/.changeset/gentle-walls-invent.md
new file mode 100644
index 0000000000..82469df6d3
--- /dev/null
+++ b/.changeset/gentle-walls-invent.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Accessibility issues identified using lighthouse fixed.
diff --git a/.changeset/itchy-bulldogs-hunt.md b/.changeset/itchy-bulldogs-hunt.md
new file mode 100644
index 0000000000..af03f51f33
--- /dev/null
+++ b/.changeset/itchy-bulldogs-hunt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-puppetdb': minor
+---
+
+Initial version of [PuppetDB plugin](https://github.com/backstage/backstage/blob/master/plugins/puppetdb/README.md).
diff --git a/.changeset/itchy-kiwis-unite.md b/.changeset/itchy-kiwis-unite.md
new file mode 100644
index 0000000000..0e3bcae282
--- /dev/null
+++ b/.changeset/itchy-kiwis-unite.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-explore': patch
+---
+
+Extracted generic `CatalogKindExploreContent` component so that it is easy to show any component kinds in their own tab in the explore page.
diff --git a/.changeset/late-waves-march.md b/.changeset/late-waves-march.md
new file mode 100644
index 0000000000..0691abd0fd
--- /dev/null
+++ b/.changeset/late-waves-march.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-lighthouse-backend': minor
+---
+
+Lighthouse backend plugin can now use an authenticated catalog backend API.
+
+- Breaking \* You must now pass the `tokenManager` to the lighthouse `createScheduler`.
diff --git a/.changeset/lazy-books-design.md b/.changeset/lazy-books-design.md
new file mode 100644
index 0000000000..c7f24fb0cc
--- /dev/null
+++ b/.changeset/lazy-books-design.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-sonarqube': patch
+---
+
+amend getSecurityHotspotsUrl to conditionally remove project path if sonarqube is self hosted
diff --git a/.changeset/mean-rice-beg.md b/.changeset/mean-rice-beg.md
new file mode 100644
index 0000000000..19cef51292
--- /dev/null
+++ b/.changeset/mean-rice-beg.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-vault': patch
+---
+
+Use `fetchApi` instead of raw `fetch` in order to pass auth header if necessary.
diff --git a/.changeset/mighty-tips-flow.md b/.changeset/mighty-tips-flow.md
new file mode 100644
index 0000000000..514d514588
--- /dev/null
+++ b/.changeset/mighty-tips-flow.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+The `microsoft` (i.e. Azure) auth provider now supports negotiating tokens for
+Azure resources besides Microsoft Graph (e.g. AKS, Virtual Machines, Machine
+Learning Services, etc.). When the `/frame/handler` endpoint is called with an
+authorization code for a non-Microsoft Graph scope, the user profile will not be
+fetched. Similarly no user profile or photo data will be fetched by the backend
+if the `/refresh` endpoint is called with the `scope` query parameter strictly
+containing scopes for resources besides Microsoft Graph.
+
+Furthermore, the `offline_access` scope will be requested by default, even when
+it is not mentioned in the argument to `getAccessToken`. This means that any
+Azure access token can be automatically refreshed, even if the user has not
+signed in via Azure.
diff --git a/.changeset/modern-seahorses-marry.md b/.changeset/modern-seahorses-marry.md
new file mode 100644
index 0000000000..11c24ed6d7
--- /dev/null
+++ b/.changeset/modern-seahorses-marry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs-node': minor
+---
+
+Use the latest version `v.1.2.0` of the spotify/techdocs docker image as default
diff --git a/.changeset/modern-snakes-check.md b/.changeset/modern-snakes-check.md
new file mode 100644
index 0000000000..29510ad712
--- /dev/null
+++ b/.changeset/modern-snakes-check.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+bug: Invert `templateFilter` predicate to align with `Array.filter`
diff --git a/.changeset/nice-schools-remember.md b/.changeset/nice-schools-remember.md
new file mode 100644
index 0000000000..1b362532f8
--- /dev/null
+++ b/.changeset/nice-schools-remember.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-adr': minor
+---
+
+Use `fetchApi` instead of raw `fetch` in order to pass auth header if necessary.
diff --git a/.changeset/odd-plums-bake.md b/.changeset/odd-plums-bake.md
new file mode 100644
index 0000000000..427ab776b5
--- /dev/null
+++ b/.changeset/odd-plums-bake.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-adr-common': patch
+'@backstage/plugin-adr': patch
+---
+
+use path attribute to fetch files instead of name and update the UI to navigate over subdirectories
diff --git a/.changeset/perfect-deers-add.md b/.changeset/perfect-deers-add.md
new file mode 100644
index 0000000000..c932351a19
--- /dev/null
+++ b/.changeset/perfect-deers-add.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-playlist': patch
+---
+
+Added config properties to change dynamically the group noun for all the components in the UI
diff --git a/.changeset/plenty-eels-listen.md b/.changeset/plenty-eels-listen.md
new file mode 100644
index 0000000000..6b4776f808
--- /dev/null
+++ b/.changeset/plenty-eels-listen.md
@@ -0,0 +1,19 @@
+---
+'@backstage/plugin-catalog-react': minor
+---
+
+Attempt to load entity owner names in the EntityOwnerPicker through the `by-refs` endpoint. If `spec.profile.displayName` or `metadata.title` are populated, we now attempt to show those before showing the `humanizeEntityRef`'d version.
+
+**BREAKING**: `EntityOwnerFilter` now uses the full entity ref instead of the `humanizeEntityRef`. If you rely on `EntityOwnerFilter.values` or the `queryParameters.owners` of `useEntityList`, you will need to adjust your code like the following.
+
+```tsx
+const { queryParameters: { owners } } = useEntityList();
+// or
+const { filter: { owners } } = useEntityList();
+
+// Instead of,
+if (owners.some(ref => ref === humanizeEntityRef(myEntity))) ...
+
+// You'll need to use,
+if (owners.some(ref => ref === stringifyEntityRef(myEntity))) ...
+```
diff --git a/.changeset/poor-horses-approve.md b/.changeset/poor-horses-approve.md
new file mode 100644
index 0000000000..ecd60e2c6c
--- /dev/null
+++ b/.changeset/poor-horses-approve.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Add an indication that the validators are running when clicking `next` on each step of the form.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index cfe5cab8e7..391e8dbd8d 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "next",
   "initialVersions": {
     "example-app": "0.2.81",
@@ -216,22 +216,45 @@
     "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.0.0",
     "@backstage/plugin-search-backend-module-catalog": "0.0.0",
     "@backstage/plugin-search-backend-module-explore": "0.0.0",
-    "@backstage/plugin-search-backend-module-techdocs": "0.0.0"
+    "@backstage/plugin-search-backend-module-techdocs": "0.0.0",
+    "@backstage/backend-openapi-utils": "0.0.0",
+    "@backstage/cli-node": "0.0.0"
   },
   "changesets": [
+    "afraid-horses-argue",
     "all-my-auth-wanna-ride-today",
+    "blue-walls-drop",
+    "bright-hats-compare",
     "bright-pumpkins-bake",
+    "calm-geese-obey",
+    "calm-otters-destroy",
     "chatty-coats-thank",
     "clean-dolls-search",
+    "clean-items-draw",
+    "clean-teachers-thank",
+    "clever-lizards-whisper",
+    "cold-seahorses-greet",
     "create-app-1679405836",
+    "create-app-1681222813",
     "curly-boats-trade",
     "curly-jobs-kneel",
+    "curly-steaks-mate",
     "curvy-rocks-guess",
+    "dependabot-ff5881d",
+    "eight-trainers-smoke",
     "eleven-bats-tease",
     "eleven-coats-refuse",
     "fair-roses-stare",
+    "famous-beds-break",
+    "famous-beds-repair",
+    "famous-olives-try",
+    "fast-gorillas-approve",
     "fast-snakes-buy",
+    "flat-ways-compete",
+    "forty-adults-divide",
+    "forty-days-tell",
     "forty-gorillas-help",
+    "fresh-lions-compete",
     "fresh-schools-fly",
     "funny-pots-hide",
     "funny-rivers-grin",
@@ -242,54 +265,90 @@
     "heavy-colts-wash",
     "hungry-lies-cry",
     "hungry-monkeys-reply",
+    "itchy-ads-sit",
+    "itchy-kiwis-unite",
     "khaki-cars-drum",
     "khaki-doors-compare",
     "khaki-guests-turn",
+    "late-waves-march",
     "lazy-apples-destroy",
     "lazy-monkeys-worry",
     "long-gorillas-remain",
     "many-eggs-press",
+    "mean-rice-beg",
     "mighty-lamps-cross",
+    "mighty-tips-flow",
+    "modern-snakes-check",
     "nasty-nails-appear",
     "neat-donkeys-work",
+    "neat-pears-argue",
     "new-pigs-jam",
     "odd-grapes-double",
+    "odd-plums-bake",
     "old-cougars-sit",
     "olive-cycles-join",
     "olive-months-talk",
     "orange-rabbits-jam",
+    "perfect-deers-add",
+    "plenty-eels-listen",
+    "poor-cars-fold",
+    "poor-horses-approve",
     "popular-parents-crash",
+    "popular-radios-visit",
     "pretty-carpets-cross",
     "rare-seals-decide",
     "renovate-179fa0e",
+    "renovate-3e8a992",
+    "renovate-8010f99",
     "renovate-a9116b7",
     "renovate-c574b04",
     "rotten-carrots-cheer",
+    "serious-items-walk",
     "seven-gifts-fetch",
+    "shaggy-crews-carry",
     "short-panthers-float",
+    "silent-nails-bake",
     "silly-adults-accept",
+    "six-jobs-hear",
+    "sixty-insects-visit",
+    "slimy-scissors-play",
+    "slow-ravens-destroy",
+    "smart-crabs-dream",
     "soft-roses-cover",
     "sour-buttons-collect",
     "sour-dragons-cheat",
+    "sour-laws-walk",
+    "spicy-carrots-argue",
     "stale-cobras-beg",
+    "stale-files-sniff",
+    "stale-paws-sparkle",
     "strong-crews-repeat",
+    "stupid-laws-play",
+    "sweet-eels-hunt",
     "swift-meals-live",
     "tall-chairs-explain",
+    "tall-meals-dress",
     "tall-oranges-own",
     "ten-hounds-bathe",
     "ten-mayflies-beam",
+    "tender-parrots-fry",
+    "tender-terms-return",
     "thick-forks-prove",
     "thin-spoons-prove",
     "thirty-crabs-tell",
     "tiny-apes-scream",
     "tough-cameras-beam",
+    "tricky-beans-knock",
     "twelve-parrots-camp",
     "twelve-vans-sell",
+    "unlucky-snakes-smile",
     "warm-buses-switch",
+    "weak-oranges-give",
     "weak-turtles-arrive",
     "wet-lamps-happen",
     "wise-garlics-camp",
     "witty-berries-love",
-    "witty-points-visit"
+    "witty-points-visit",
+    "yellow-candles-kiss"
   ]
 }
diff --git a/.changeset/proud-pigs-look.md b/.changeset/proud-pigs-look.md
new file mode 100644
index 0000000000..7b50a72feb
--- /dev/null
+++ b/.changeset/proud-pigs-look.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Updated the alpha `scaffolderPlugin` to not require options.
diff --git a/.changeset/renovate-3e8a992.md b/.changeset/renovate-3e8a992.md
new file mode 100644
index 0000000000..2c76f0e050
--- /dev/null
+++ b/.changeset/renovate-3e8a992.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Updated dependency `@rjsf/core-v5` to `npm:@rjsf/core@5.5.2`.
diff --git a/.changeset/renovate-8010f99.md b/.changeset/renovate-8010f99.md
new file mode 100644
index 0000000000..64817f07be
--- /dev/null
+++ b/.changeset/renovate-8010f99.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependency `@swc/helpers` to `^0.5.0`.
diff --git a/.changeset/serious-items-walk.md b/.changeset/serious-items-walk.md
new file mode 100644
index 0000000000..c4cdfe34c4
--- /dev/null
+++ b/.changeset/serious-items-walk.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Stripped entity types and namespace before passing to GitHub API
diff --git a/.changeset/shaggy-crews-carry.md b/.changeset/shaggy-crews-carry.md
new file mode 100644
index 0000000000..db9aa5225b
--- /dev/null
+++ b/.changeset/shaggy-crews-carry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+---
+
+fix ElasticSearch throwing error when index is missing
diff --git a/.changeset/shy-carpets-own.md b/.changeset/shy-carpets-own.md
new file mode 100644
index 0000000000..95c907d117
--- /dev/null
+++ b/.changeset/shy-carpets-own.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Added `entityLimit` to change the limit of entities displayed in the ownership boxes.
+
+[StoryBook Example for Ownership Card](https://backstage.io/storybook/?path=/story/plugins-org-ownership-card--default)
diff --git a/.changeset/silent-nails-bake.md b/.changeset/silent-nails-bake.md
new file mode 100644
index 0000000000..1161686b34
--- /dev/null
+++ b/.changeset/silent-nails-bake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Add common identify resolvers for `oidc` auth provider.
diff --git a/.changeset/six-jobs-hear.md b/.changeset/six-jobs-hear.md
new file mode 100644
index 0000000000..3e9d10f0e9
--- /dev/null
+++ b/.changeset/six-jobs-hear.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fixed bug in the `DefaultCatalogProcessingEngine` where entities that contained multiple different types of relations for the same source entity would not properly trigger stitching for that source entity.
diff --git a/.changeset/sixty-insects-visit.md b/.changeset/sixty-insects-visit.md
new file mode 100644
index 0000000000..adbe27e0ac
--- /dev/null
+++ b/.changeset/sixty-insects-visit.md
@@ -0,0 +1,9 @@
+---
+'@backstage/core-app-api': minor
+---
+
+The `AuthConnector` interface now supports specifying a set of scopes when
+refreshing a session. The `DefaultAuthConnector` implementation passes the
+`scope` query parameter to the auth-backend plugin appropriately. The
+`RefreshingAuthSessionManager` passes any scopes in its `GetSessionRequest`
+appropriately.
diff --git a/.changeset/slimy-scissors-play.md b/.changeset/slimy-scissors-play.md
new file mode 100644
index 0000000000..4a65bc8dce
--- /dev/null
+++ b/.changeset/slimy-scissors-play.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+fixes a bug where an empty authorization header was provided to the proxy endpoint when a cluster had a server-side auth provider
diff --git a/.changeset/slow-ravens-destroy.md b/.changeset/slow-ravens-destroy.md
new file mode 100644
index 0000000000..a75793f86f
--- /dev/null
+++ b/.changeset/slow-ravens-destroy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+---
+
+Allow for a commit message to differ from the PR title when publishing a GitHub pull request.
diff --git a/.changeset/smart-crabs-dream.md b/.changeset/smart-crabs-dream.md
new file mode 100644
index 0000000000..3699021482
--- /dev/null
+++ b/.changeset/smart-crabs-dream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Reverted the check if the selected options list is different than the query parameters list before invoking `setSelectedOptions` method. This was preventing updating list items when a query string was already present in the URL when loading the page.
diff --git a/.changeset/soft-doors-count.md b/.changeset/soft-doors-count.md
new file mode 100644
index 0000000000..d6abd3e1d6
--- /dev/null
+++ b/.changeset/soft-doors-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-shortcuts': patch
+---
+
+Added the Analytics event in the save handler of AddShortcut and EditShortcut
diff --git a/.changeset/sour-laws-walk.md b/.changeset/sour-laws-walk.md
new file mode 100644
index 0000000000..073e3dc6a8
--- /dev/null
+++ b/.changeset/sour-laws-walk.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Export Azure Easy Auth provider so it can actually be used.
diff --git a/.changeset/spicy-carrots-argue.md b/.changeset/spicy-carrots-argue.md
new file mode 100644
index 0000000000..b6475b1f7d
--- /dev/null
+++ b/.changeset/spicy-carrots-argue.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Add monorepo support to CodeOwnersProccesor.
diff --git a/.changeset/stale-files-sniff.md b/.changeset/stale-files-sniff.md
new file mode 100644
index 0000000000..b6f35645c4
--- /dev/null
+++ b/.changeset/stale-files-sniff.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-model': minor
+---
+
+Modified the regex for DNS label validation to support IDN domains
diff --git a/.changeset/stupid-laws-play.md b/.changeset/stupid-laws-play.md
new file mode 100644
index 0000000000..837fd08f40
--- /dev/null
+++ b/.changeset/stupid-laws-play.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+`scaffolder/next`: bump `rjsf` dependencies to `5.5.0`
diff --git a/.changeset/sweet-eels-hunt.md b/.changeset/sweet-eels-hunt.md
new file mode 100644
index 0000000000..39f124a860
--- /dev/null
+++ b/.changeset/sweet-eels-hunt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+`KubernetesBackendClient` now requires a `kubernetesAuthProvidersApi` value to be provided. `KubernetesApi` interface now has a proxy method requirement.
diff --git a/.changeset/tall-meals-dress.md b/.changeset/tall-meals-dress.md
new file mode 100644
index 0000000000..3d39c369fe
--- /dev/null
+++ b/.changeset/tall-meals-dress.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-events-backend': patch
+---
+
+Export `DefaultEventBroker` to allow decoupling of the catalog and events backends in the `example-backend`.
+
+Please look at `plugins/events-backend/README.md` for the currently advised way to set up the event backend and catalog providers.
diff --git a/.changeset/tender-terms-return.md b/.changeset/tender-terms-return.md
new file mode 100644
index 0000000000..9e8ab6beb7
--- /dev/null
+++ b/.changeset/tender-terms-return.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Fix a bug in sub-path navigation due to double addition of a sub-path if one was set up in `app.baseUrl`.
diff --git a/.changeset/tricky-beans-knock.md b/.changeset/tricky-beans-knock.md
new file mode 100644
index 0000000000..1bdd95a365
--- /dev/null
+++ b/.changeset/tricky-beans-knock.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': patch
+---
+
+New plugin! Primary focus is to support types on `Router`s in backend packages. Developers can use the `ApiRouter` from this package in their packages to support a typed experience based on their OpenAPI specs. The `ApiRouter` supports request bodies, response bodies, query parameters and path parameters, as well as full path-based context of the above. This means no more guessing on an endpoint like `req.post('/not-my-route', (req, res)=>{res.send(req.body.badparam)})`. Typescript would catch `/not-my-route`, `req.body.badparam`, `res.send(req.body.badparam)`.
diff --git a/.changeset/tricky-wombats-explode.md b/.changeset/tricky-wombats-explode.md
new file mode 100644
index 0000000000..aeb5b7849f
--- /dev/null
+++ b/.changeset/tricky-wombats-explode.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-stack-overflow-backend': minor
+---
+
+Adding support for v2.3 API and PAT authentication
diff --git a/.changeset/yellow-candles-kiss.md b/.changeset/yellow-candles-kiss.md
new file mode 100644
index 0000000000..e365be2a0a
--- /dev/null
+++ b/.changeset/yellow-candles-kiss.md
@@ -0,0 +1,21 @@
+---
+'@backstage/core-components': minor
+---
+
+**BREAKING:** Removing `Tabs` component from `core-components` as it is neither used in the core Backstage app nor in the monorepo plugins. If you are using this component in your instance please consider replacing it with the [Material UI `Tabs`](https://v4.mui.com/components/tabs/#tabs) component like the following:
+
+```diff
+- <Tabs
+-    tabs={[{
+-       icon: <AccessAlarmIcon />,
+-       content: <div>Label</div>,
+-    }]}
+- />
+
++ <Tabs>
++    <Tab
++       label = "Label"
++       icon = { <AccessAlarmIcon /> }
++    />
++ </Tabs>
+```
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b4be92e4ec..3880a0facd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,13 +26,13 @@ yarn.lock                                           @backstage/maintainers @back
 /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-core
-/plugins/catalog-*                                  @backstage/maintainers @backstage/catalog-core
-/plugins/catalog-backend-module-aws                 @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-bitbucket-cloud     @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-msgraph             @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-puppetdb            @backstage/maintainers @backstage/catalog-core @tdabasinskas
-/plugins/catalog-graph                              @backstage/maintainers @backstage/catalog-core @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
@@ -67,6 +67,7 @@ yarn.lock                                           @backstage/maintainers @back
 /plugins/newrelic-dashboard                         @backstage/maintainers @mufaddal7
 /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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd67d2742a..fb03709cce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,6 +92,9 @@ jobs:
       - name: verify api reference
         run: node scripts/verify-api-reference.js
 
+      - name: verify openapi yaml file matches generated ts file
+        run: yarn backstage-repo-tools schema:openapi:verify
+
       - name: verify doc links
         run: node scripts/verify-links.js
 
diff --git a/.github/workflows/uffizzi-preview.yaml b/.github/workflows/uffizzi-preview.yaml
index 6390671bbd..87c1eaa02f 100644
--- a/.github/workflows/uffizzi-preview.yaml
+++ b/.github/workflows/uffizzi-preview.yaml
@@ -14,6 +14,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     outputs:
       compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
+      git-ref: ${{ env.GIT_REF }}
       pr-number: ${{ env.PR_NUMBER }}
     steps:
       - name: 'Download artifacts'
@@ -67,10 +68,15 @@ jobs:
         id: pr
         run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
 
+      - name: Read Git Ref From Event Object
+        id: ref
+        run: echo "GIT_REF=${{ fromJSON(env.EVENT_JSON).pull_request.head.sha }}" >> $GITHUB_ENV
+
       - name: DEBUG - Print Job Outputs
         if: ${{ runner.debug }}
         run: |
           echo "PR number: ${{ env.PR_NUMBER }}"
+          echo "Git Ref: ${{ env.GIT_REF }}"
           echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
           cat event.json
 
@@ -85,8 +91,9 @@ jobs:
       # and this reusable workflow will delete the preview deployment.
       compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }}
       compose-file-cache-path: docker-compose.rendered.yml
-      server: https://app.uffizzi.com
+      git-ref: ${{ needs.cache-compose-file.outputs.git-ref }}
       pr-number: ${{ needs.cache-compose-file.outputs.pr-number }}
+      server: https://app.uffizzi.com
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/verify_accessibility_core.yml b/.github/workflows/verify_accessibility_core.yml
new file mode 100644
index 0000000000..459071ce75
--- /dev/null
+++ b/.github/workflows/verify_accessibility_core.yml
@@ -0,0 +1,30 @@
+name: Verify Accessibility Core features
+on:
+  pull_request:
+    branches: [master]
+    paths:
+      - 'plugins/catalog/**'
+      - 'plugins/techdocs/**'
+      - 'plugins/scaffolder/**'
+      - 'plugins/search/**'
+
+jobs:
+  lhci:
+    name: Lighthouse
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - name: yarn install
+        uses: backstage/actions/yarn-install@v0.6.3
+        with:
+          cache-prefix: ${{ runner.os }}-16.x
+      - name: run Lighthouse CI
+        run: |
+          npm install -g @lhci/cli@0.11.x
+          lhci autorun
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index b7bfe7a84d..f3c687d49c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,7 @@ tsconfig.tmp.json
 
 # vscode database functionality support files
 *.session.sql
+
+# Lighthouse CI Reports
+**/.lighthouseci/*
+!**/.lighthouseci/scripts
\ No newline at end of file
diff --git a/.lighthouseci/scripts/guest-auth.js b/.lighthouseci/scripts/guest-auth.js
new file mode 100644
index 0000000000..7f686cbbc6
--- /dev/null
+++ b/.lighthouseci/scripts/guest-auth.js
@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = async (browser, context) => {
+  // launch browser for LHCI
+  const page = await browser.newPage();
+  await page.goto('http://localhost:3000');
+  await page.evaluate(() => {
+    localStorage.setItem('@backstage/core:SignInPage:provider', 'guest');
+  });
+  await page.goto('http://localhost:3000');
+};
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 306ae24280..24c889f518 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -237,3 +237,9 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [Comcast](https://comcast.github.io/)                                         | [Ryan Emerle](https://github.com/remerle)                                                                                                                                                                                                                        | Developer portal enabling discovery of products, services, and documentation throughout the enterprise to ultimately reduce friction and improve time-to-market.                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | [Syntasso](https://www.syntasso.io/)                                        | [@syntassodev](https://github.com/syntassodev)                                                                                                                                                                                                                   | Backstage is used as a optional UI for the [Kratix project](https://kratix.io), a framework for building platforms.
 | [Bankdata](https://www.bankdata.dk)                                                      | [Thomas Grønbæk](https://www.linkedin.com/in/thomas-grønbæk/)                                                                                                                                                                                                     | We are assessing Backstage as our internal developer portal @Bankdata. Goal is to reduce cognitive load and friction for developers and thereby improving developer experience, onboarding and productivity. Expect use of Software Catalog for discoverability and ownership, Tech Docs and Software Templates to integrate tooling and best practices.
+| [B3](https://www.b3.com.br/)                              | [Marcos Rodrigues](https://www.linkedin.com/in/marcos-rodrigues-cloud/)                                                                                                                                                                                                                   | B3 (Brazilian Stock Exchange) will implement a self-service platform focused on software development based on Backstage. The tool will primarily focus on product development and software engineering teams, as well as professionals from other areas who are also involved in software delivery. The new platform will function as a portal where teams can access tools, codes, and templates that have already been tested and are available, serving as building blocks for the development of new solutions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| [Porto](https://www.portoseguro.com.br/)                              | [Camilo Alessandro](https://www.linkedin.com/in/camilo-alessandro/)                                                                                                                                                                                                                   | Porto (Brazilian insurance company) Centralized developer portal with software catalog, application templates, maturity radar, component taxonomy standardization, and automation in the integration with DevSecOps processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| [Einride](https://github.com/einride) | [@odsod](https://github.com/odsod/) | We use Backstage to create a great developer experience across Einride's entire software stack - from autonomous and electric vehicles to cloud systems - and we've developed a [Backstage Go SDK](https://github.com/einride/backstage-go) for interfacing with Backstage from our Go tooling.
+| [Chartboost](https://www.chartboost.com)| [@brucearctor](https://github.com/brucearctor), [@ArtemChekunov](https://github.com/ArtemChekunov) | We are building our internal develper portal on top of Backstage.|
+| [Quantum Metric](https://www.quantummetric.com/) | [Eric Irwin](https://www.linkedin.com/in/ericirwin1124/) | Backstage is used within our Developer Experience Platform (DXP) in order to increase self-service, standardization and discoverability across our Engineering teams. |
+| [VodafoneZiggo](https://www.vodafoneziggo.nl/) | [Peter Macdonald](https://github.com/Parsifal-M) | We use Backstage as our go-to platform for managing our internal tools and services. With Backstage, we can easily discover and access all the services we need to do our work, whether it's deploying code, managing infrastructure, or accessing documentation. We appreciate the standardized, consistent interface and the ability to easily create custom plugins to integrate with our existing workflows. Overall, Backstage is streamlining our internal operations and helps us work more efficiently as a team. |
diff --git a/OWNERS.md b/OWNERS.md
index 2124863f8d..0a567ee269 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -20,9 +20,14 @@ These are the separate project areas of Backstage, each with their own project a
 
 Team: @backstage/catalog-maintainers
 
-| Name | Organization | Team      | GitHub                       | Discord |
-| ---- | ------------ | --------- | ---------------------------- | ------- |
-| TBD  | Spotify      | Chipmunks | [TBD](http://github.com/TBD) | -       |
+Scope: The catalog plugin and catalog model
+
+| Name           | Organization | Team      | GitHub                                   | Discord          |
+| -------------- | ------------ | --------- | ---------------------------------------- | ---------------- |
+| Rickard Dybeck | Spotify      | Chipmunks | [alde](http://github.com/alde)           | rdybeck#8083     |
+| Mike Blockley  | Spotify      | Chipmunks | [mikeyhc](http://github.com/mikeyhc)     | mikey-spot#5363  |
+| Elon Jefferson | Spotify      | Chipmunks | [Edje-C](http://github.com/Edje-C)       | elon-spotty#6086 |
+| Nurit Izrailov | Spotify      | Chipmunks | [nuritizra](http://github.com/nuritizra) | -                |
 
 ### Discoverability
 
@@ -82,21 +87,24 @@ Scope: The TechDocs plugin and related tooling
 
 ## Organization Members
 
-| Name                           | Organization              | GitHub                                          | Discord                        |
-| ------------------------------ | ------------------------- | ----------------------------------------------- | ------------------------------ |
-| Adam Harvey                    | Cisco                     | [adamdmharvey](https://github.com/adamdmharvey) | `adamharvey#3739`              |
-| Andre Wanlin                   | Keyloop                   | [awanlin](https://github.com/awanlin)           | `Ahhhndre#3095`                |
-| Andrew Thauer                  | Wealthsimple              | [andrewthauer](https://github.com/andrewthauer) | `andrewthauer#3060`            |
-| Brian Fletcher                 | RoadieHQ                  | [punkle](https://github.com/punkle)             | `Brian Fletcher#7051`          |
-| Carlos Esteban Lopez Jaramillo | VMWare                    | [luchillo17](https://github.com/luchillo17)     | `luchillo17#8777`              |
-| David Tuite                    | Roadie                    | [dtuite](https://github.com/dtuite)             | `David Tuite (roadie.io)#1010` |
-| Himanshu Mishra                | Harness.io                | [OrkoHunter](https://github.com/OrkoHunter)     | `OrkoHunter#1520`              |
-| Jamie Klassen                  | VMware                    | [jamieklassen](https://github.com/jamieklassen) | `jamieklassen#3047`            |
-| Jussi Hallila                  | Roadie                    | [Xantier](https://github.com/Xantier)           | `Xantier#0086`                 |
-| Mark Avery                     | Cvent                     | [webark](https://github.com/webark)             | `webark#8471`                  |
-| Patrick Jungermann             | Bonial International GmbH | [pjungermann](https://github.com/pjungermann)   | `pjungermann#6933`             |
-| Phil Kuang                     | FactSet Research Systems  | [kuangp](https://github.com/kuangp)             | `pkuang#3202`                  |
-| Taras Mankovski                | Frontside                 | [taras](https://github.com/taras)               | `tarasm#1256`                  |
+| Name                           | Organization              | GitHub                                                | Discord                        |
+| ------------------------------ | ------------------------- | ----------------------------------------------------- | ------------------------------ |
+| Adam Harvey                    | Cisco                     | [adamdmharvey](https://github.com/adamdmharvey)       | `adamharvey#3739`              |
+| Andre Wanlin                   | Keyloop                   | [awanlin](https://github.com/awanlin)                 | `Ahhhndre#3095`                |
+| Andrew Thauer                  | Wealthsimple              | [andrewthauer](https://github.com/andrewthauer)       | `andrewthauer#3060`            |
+| Brian Fletcher                 | Roadie.io                 | [punkle](https://github.com/punkle)                   | `Brian Fletcher#7051`          |
+| Carlos Esteban Lopez Jaramillo | VMWare                    | [luchillo17](https://github.com/luchillo17)           | `luchillo17#8777`              |
+| David Tuite                    | Roadie.io                 | [dtuite](https://github.com/dtuite)                   | `David Tuite (roadie.io)#1010` |
+| Himanshu Mishra                | Harness.io                | [OrkoHunter](https://github.com/OrkoHunter)           | `OrkoHunter#1520`              |
+| Irma Solakovic                 | Roadie.io                 | [Irma12](https://github.com/Irma12)                   | `Irma#7629`                    |
+| Jamie Klassen                  | VMware                    | [jamieklassen](https://github.com/jamieklassen)       | `jamieklassen#3047`            |
+| Jorge Lainfiesta               | Roadie.io                 | [jorgelainfiesta](https://github.com/jorgelainfiesta) | `jorgel#8733`                  |
+| Jussi Hallila                  | Roadie.io                 | [Xantier](https://github.com/Xantier)                 | `Xantier#0086`                 |
+| Mark Avery                     | Cvent                     | [webark](https://github.com/webark)                   | `webark#8471`                  |
+| Miklós Kiss                    | Roadie.io                 | [kissmikijr](https://github.com/kissmikijr)           | `Miklos#7416`                  |
+| Patrick Jungermann             | Bonial International GmbH | [pjungermann](https://github.com/pjungermann)         | `pjungermann#6933`             |
+| Phil Kuang                     | FactSet Research Systems  | [kuangp](https://github.com/kuangp)                   | `pkuang#3202`                  |
+| Taras Mankovski                | Frontside                 | [taras](https://github.com/taras)                     | `tarasm#1256`                  |
 
 ## Emeritus Core Maintainers
 
diff --git a/app-config.yaml b/app-config.yaml
index 385c9c2e0e..e2b03786c4 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -123,6 +123,9 @@ proxy:
     headers:
       St2-Api-Key: ${ST2_API_KEY}
 
+  '/puppetdb':
+    target: https://your.puppetdb.instance.com
+
 organization:
   name: My Company
 
diff --git a/docs/auth/microsoft/azure-easyauth.md b/docs/auth/microsoft/azure-easyauth.md
index 4daf0851f0..8ea626288c 100644
--- a/docs/auth/microsoft/azure-easyauth.md
+++ b/docs/auth/microsoft/azure-easyauth.md
@@ -1,10 +1,12 @@
 ---
-id: azure-easy-auth
+id: easy-auth
 title: Azure EasyAuth Provider
-sidebar_label: Azure EasyAuth
+sidebar_label: Azure Easy Auth
 description: Adding Azure's EasyAuth Proxy as an authentication provider in Backstage
 ---
 
+The Backstage `core-plugin-api` package comes with a Microsoft authentication provider that can authenticate users using Azure Active Directory for PaaS service hosted in Azure that support Easy Auth, such as Azure App Services.
+
 ## Backstage Changes
 
 Add the following into your `app-config.yaml` or `app-config.production.yaml` file
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index 88c22afb9b..f96204b413 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -37,10 +37,6 @@ The required steps in the host build are to install dependencies with
 `yarn install`, generate type definitions using `yarn tsc`, and build the backend
 package with `yarn build:backend`.
 
-> NOTE: If you created your app prior to 2021-02-18, follow the
-> [migration step](https://github.com/backstage/backstage/releases/tag/release-2021-02-18)
-> to move from `backend:build` to `backend:bundle`.
-
 In a CI workflow it might look something like this:
 
 ```bash
@@ -50,7 +46,8 @@ yarn install --frozen-lockfile
 yarn tsc
 
 # Build the backend, which bundles it all up into the packages/backend/dist folder.
-yarn build:backend
+# The configuration files here should match the one you use inside the Dockerfile below.
+yarn build:backend --config app-config.yaml
 ```
 
 Once the host build is complete, we are ready to build our image. The following
diff --git a/docs/features/kubernetes/proxy.md b/docs/features/kubernetes/proxy.md
index b53dfeb29d..5811ff8ec4 100644
--- a/docs/features/kubernetes/proxy.md
+++ b/docs/features/kubernetes/proxy.md
@@ -14,42 +14,16 @@ Kubernetes backend plugin's proxy endpoint to allow them to make arbitrary
 requests to the [REST
 API](https://kubernetes.io/docs/reference/using-api/api-concepts/).
 
-Here is a snippet fetching namespaces from a cluster configured with the
-`google` [auth provider](https://backstage.io/docs/features/kubernetes/configuration#clustersauthprovider):
+Here is a snippet fetching namespaces using the `KubernetesBackendClient` library
 
 ```typescript
-import {
-  discoveryApiRef,
-  googleAuthApiRef,
-  useApi,
-  identityApiRef,
-} from '@backstage/core-plugin-api';
+import { useApi } from '@backstage/core-plugin-api';
+import { kubernetesApiRef } from '@backstage/plugin-kubernetes';
 
 const CLUSTER_NAME = ''; // use a known cluster name
 
-// get a bearer token from Google
-const googleAuthApi = useApi(googleAuthApiRef);
-const token = await googleAuthApi.getAccessToken(
-  'https://www.googleapis.com/auth/cloud-platform',
-);
-
-// get a backstage ID token
-const identityApi = useApi(identityApiRef);
-const { token: userToken } = await identityApi.getCredentials();
-
-const discoveryApi = useApi(discoveryApiRef);
-const kubernetesBaseUrl = await discoveryApi.getBaseUrl('kubernetes');
-const kubernetesProxyEndpoint = `${kubernetesBaseUrl}/proxy`;
-
-// fetch namespaces
-await fetch(`${kubernetesProxyEndpoint}/api/v1/namespaces`, {
-  method: 'GET',
-  headers: {
-    'Backstage-Kubernetes-Cluster': CLUSTER_NAME,
-    'Backstage-Kubernetes-Authorization': `Bearer ${token}`,
-    Authorization: `Bearer ${userToken}`,
-  },
-});
+const kubernetesApi = useApi(kubernetesApiRef);
+await kubernetesApi.proxy(CLUSTER_NAME, '/api/v1/namespaces');
 ```
 
 ## How it works
@@ -69,15 +43,9 @@ Overall, the only changes to each request are:
 - the endpoint's base URL prefix is stripped.
 - the `Backstage-Kubernetes-Authorization` header becomes the `Authorization` header that is used when forwarding the request.
 
-## Authentication
+The proxy expects a `KubernetesAuthTranslator` to be provided that is used to decorate all requests with `Auth` by default. It does this by supplying a `serviceAccountToken` field into `clusterDetails` using the defined `authProvider` in `clusterDetails`.
 
-Until some security and permission decisions are made (see [this
-conversation](https://github.com/backstage/backstage/pull/13026/files#r1029376939)
-for context), contributors consuming the proxy endpoint in their plugin code are
-responsible for negotiating their own bearer token out-of-band. This requires
-knowing some auth details about the cluster being contacted -- in practice, only
-clusters with [client side auth
-providers](https://backstage.io/docs/features/kubernetes/authentication#client-side-providers) can reasonably be reached.
+## Authentication
 
 The proxy has no provisions for mTLS, so it cannot be used to connect to
 clusters using the [x509 Client
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 52ba540430..9fb57cb82f 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -400,12 +400,8 @@ follows.
   // ...
   "relations": [
     {
-      "target": {
-        "kind": "group",
-        "namespace": "default",
-        "name": "dev.infra"
-      },
-      "type": "ownedBy"
+      "type": "ownedBy",
+      "targetRef": "group:default/dev.infra"
     }
   ],
   "spec": {
@@ -417,11 +413,11 @@ follows.
 
 The fields of a relation are:
 
-| Field      | Type   | Description                                                                      |
-| ---------- | ------ | -------------------------------------------------------------------------------- |
-| `target`   | Object | A complete [compound reference](references.md) to the other end of the relation. |
-| `type`     | String | The type of relation FROM a source entity TO the target entity.                  |
-| `metadata` | Object | Reserved for future use.                                                         |
+| Field       | Type   | Description                                                                |
+| ----------- | ------ | -------------------------------------------------------------------------- |
+| `targetRef` | String | A full [entity reference](references.md) to the other end of the relation. |
+| `type`      | String | The type of relation FROM a source entity TO the target entity.            |
+| `metadata`  | Object | Reserved for future use.                                                   |
 
 Entity descriptor YAML files are not supposed to contain this field. Instead,
 catalog processors analyze the entity descriptor data and its surroundings, and
diff --git a/docs/integrations/azure/discovery.md b/docs/integrations/azure/discovery.md
index 8dd5da85c9..7b91308b56 100644
--- a/docs/integrations/azure/discovery.md
+++ b/docs/integrations/azure/discovery.md
@@ -67,7 +67,7 @@ The parameters available are:
 
 - **`host:`** _(optional)_ Leave empty for Cloud hosted, otherwise set to your self-hosted instance host.
 - **`organization:`** Your Organization slug (or Collection for on-premise users). Required.
-- **`project:`** _(optional)_ Your project slug. Wildcards are supported as show on the examples above. If not set, all projects will be searched. For a project name containing spaces, use both single and double quotes as in `project: '"My Project Name"'`.
+- **`project:`** _(required)_ Your project slug. Wildcards are supported as shown on the examples above. Using '\*' will search all projects. For a project name containing spaces, use both single and double quotes as in `project: '"My Project Name"'`.
 - **`repository:`** _(optional)_ The repository name. Wildcards are supported as show on the examples above. If not set, all repositories will be searched.
 - **`path:`** _(optional)_ Where to find catalog-info.yaml files. Defaults to /catalog-info.yaml.
 - **`branch:`** _(optional)_ The branch name to use.
diff --git a/docs/integrations/bitbucketCloud/discovery.md b/docs/integrations/bitbucketCloud/discovery.md
index c5a7eee4a0..6e1533dea0 100644
--- a/docs/integrations/bitbucketCloud/discovery.md
+++ b/docs/integrations/bitbucketCloud/discovery.md
@@ -76,36 +76,37 @@ Additionally, you need to decide how you want to receive events from external so
 
 Set up your provider
 
-```ts title="packages/backend/src/plugins/catalogEventBasedProviders.ts"
+```ts title="packages/backend/src/plugins/catalog.ts"
+import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 /* highlight-add-start */
-import { CatalogClient } from '@backstage/catalog-client';
 import { BitbucketCloudEntityProvider } from '@backstage/plugin-catalog-backend-module-bitbucket-cloud';
 /* highlight-add-end */
-import { EntityProvider } from '@backstage/plugin-catalog-node';
-import { EventSubscriber } from '@backstage/plugin-events-node';
+
+import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
+import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
-export default async function createCatalogEventBasedProviders(
-  /* highlight-remove-next-line */
-  _: PluginEnvironment,
-  /* highlight-add-next-line */
+export default async function createPlugin(
   env: PluginEnvironment,
-): Promise<Array<EntityProvider & EventSubscriber>> {
-  const providers: Array<
-    (EntityProvider & EventSubscriber) | Array<EntityProvider & EventSubscriber>
-  > = [];
-  // add your event-based entity providers here
+): Promise<Router> {
+  const builder = await CatalogBuilder.create(env);
+  builder.addProcessor(new ScaffolderEntitiesProcessor());
   /* highlight-add-start */
-  providers.push(
-    BitbucketCloudEntityProvider.fromConfig(env.config, {
+  const bitbucketCloudProvider = BitbucketCloudEntityProvider.fromConfig(
+    env.config,
+    {
       catalogApi: new CatalogClient({ discoveryApi: env.discovery }),
       logger: env.logger,
       scheduler: env.scheduler,
       tokenManager: env.tokenManager,
-    }),
+    },
   );
+  env.eventBroker.subscribe(bitbucketCloudProvider);
+  builder.addEntityProvider(bitbucketCloudProvider);
   /* highlight-add-end */
-  return providers.flat();
+  const { processingEngine, router } = await builder.build();
+  await processingEngine.start();
+  return router;
 }
 ```
 
diff --git a/docs/integrations/github/discovery.md b/docs/integrations/github/discovery.md
index fb65173b28..7d7744cb09 100644
--- a/docs/integrations/github/discovery.md
+++ b/docs/integrations/github/discovery.md
@@ -69,37 +69,36 @@ Additionally, you need to decide how you want to receive events from external so
 
 Set up your provider
 
-```ts title="packages/backend/src/plugins/catalogEventBasedProviders.ts"
+```ts title="packages/backend/src/plugins/catalog.ts"
+import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 /* highlight-add-next-line */
 import { GithubEntityProvider } from '@backstage/plugin-catalog-backend-module-github';
-import { EntityProvider } from '@backstage/plugin-catalog-node';
-import { EventSubscriber } from '@backstage/plugin-events-node';
+import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
+import { Router } from 'express';
 import { PluginEnvironment } from '../types';
-export default async function createCatalogEventBasedProviders(
-  /* highlight-remove-next-line */
-  _: PluginEnvironment,
-  /* highlight-add-next-line */
+
+export default async function createPlugin(
   env: PluginEnvironment,
-): Promise<Array<EntityProvider & EventSubscriber>> {
-  const providers: Array<
-    (EntityProvider & EventSubscriber) | Array<EntityProvider & EventSubscriber>
-  > = [];
-  // add your event-based entity providers here
+): Promise<Router> {
+  const builder = await CatalogBuilder.create(env);
+  builder.addProcessor(new ScaffolderEntitiesProcessor());
   /* highlight-add-start */
-  providers.push(
-    GithubEntityProvider.fromConfig(env.config, {
-      logger: env.logger,
-      // optional: alternatively, use scheduler with schedule defined in app-config.yaml
-      schedule: env.scheduler.createScheduledTaskRunner({
-        frequency: { minutes: 30 },
-        timeout: { minutes: 3 },
-      }),
-      // optional: alternatively, use schedule
-      scheduler: env.scheduler,
+  const githubProvider = GithubEntityProvider.fromConfig(env.config, {
+    logger: env.logger,
+    // optional: alternatively, use scheduler with schedule defined in app-config.yaml
+    schedule: env.scheduler.createScheduledTaskRunner({
+      frequency: { minutes: 30 },
+      timeout: { minutes: 3 },
     }),
-  );
+    // optional: alternatively, use schedule
+    scheduler: env.scheduler,
+  });
+  env.eventBroker.subscribe(githubProvider);
+  builder.addEntityProvider(demoProvider);
   /* highlight-add-end */
-  return providers.flat();
+  const { processingEngine, router } = await builder.build();
+  await processingEngine.start();
+  return router;
 }
 ```
 
diff --git a/docs/integrations/github/org.md b/docs/integrations/github/org.md
index 8f67e2a43f..ccffe60bd1 100644
--- a/docs/integrations/github/org.md
+++ b/docs/integrations/github/org.md
@@ -79,25 +79,21 @@ Additionally, you need to decide how you want to receive events from external so
 
 Set up your provider
 
-```ts title="packages/backend/src/plugins/catalogEventBasedProviders.ts"
+```ts title="packages/backend/src/plugins/catalog.ts"
+import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 /* highlight-add-next-line */
 import { GithubOrgEntityProvider } from '@backstage/plugin-catalog-backend-module-github';
-import { EntityProvider } from '@backstage/plugin-catalog-node';
-import { EventSubscriber } from '@backstage/plugin-events-node';
+import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
+import { Router } from 'express';
 import { PluginEnvironment } from '../types';
-export default async function createCatalogEventBasedProviders(
-  /* highlight-remove-next-line */
-  _: PluginEnvironment,
-  /* highlight-add-next-line */
+
+export default async function createPlugin(
   env: PluginEnvironment,
-): Promise<Array<EntityProvider & EventSubscriber>> {
-  const providers: Array<
-    (EntityProvider & EventSubscriber) | Array<EntityProvider & EventSubscriber>
-  > = [];
-  // add your event-based entity providers here
+): Promise<Router> {
+  const builder = await CatalogBuilder.create(env);
+  builder.addProcessor(new ScaffolderEntitiesProcessor());
   /* highlight-add-start */
-  providers.push(
-    GithubOrgEntityProvider.fromConfig(env.config, {
+  const githubOrgProvider = GithubOrgEntityProvider.fromConfig(env.config, {
       id: 'production',
       orgUrl: 'https://github.com/backstage',
       logger: env.logger,
@@ -105,10 +101,12 @@ export default async function createCatalogEventBasedProviders(
         frequency: { minutes: 60 },
         timeout: { minutes: 15 },
       }),
-    }),
-  );
+  env.eventBroker.subscribe(githubOrgProvider);
+  builder.addEntityProvider(githubOrgProvider);
   /* highlight-add-end */
-  return providers.flat();
+  const { processingEngine, router } = await builder.build();
+  await processingEngine.start();
+  return router;
 }
 ```
 
diff --git a/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md b/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md
index 103e463cda..e714301ded 100644
--- a/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md
+++ b/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md
@@ -91,7 +91,7 @@ This enables decisions based on characteristics of the resource, but it's import
 Install the missing module:
 
 ```bash
-$ yarn workspace @internal/plugin-todo-list-backend add @backstage/plugin-permission-node zod@~3.18.0
+$ yarn workspace @internal/plugin-todo-list-backend add @backstage/plugin-permission-node zod
 ```
 
 Create a new `plugins/todo-list-backend/src/service/rules.ts` file and append the following code:
diff --git a/docs/plugins/backend-plugin.md b/docs/plugins/backend-plugin.md
index 9ce835f5f5..73b8f9027a 100644
--- a/docs/plugins/backend-plugin.md
+++ b/docs/plugins/backend-plugin.md
@@ -184,9 +184,10 @@ export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {
   const router = Router();
+  const { identity } = options;
 
   router.post('/example', async (req, res) => {
-    const identity = await identity.getIdentity({ request: req });
+    const userIdentity = await identity.getIdentity({ request: req });
     ...
   });
 ```
diff --git a/docs/releases/v1.13.0-next.2-changelog.md b/docs/releases/v1.13.0-next.2-changelog.md
new file mode 100644
index 0000000000..a6c4808306
--- /dev/null
+++ b/docs/releases/v1.13.0-next.2-changelog.md
@@ -0,0 +1,2337 @@
+# Release v1.13.0-next.2
+
+## @backstage/plugin-kubernetes-backend@0.10.0-next.2
+
+### Minor Changes
+
+- e6c7c850129: Plugins that instantiate the `KubernetesProxy` must now provide a parameter of the type `KubernetesProxyOptions` which includes providing a `KubernetesAuthTranslator`. The `KubernetesBuilder` now builds its own `KubernetesAuthTranslatorMap` that it provides to the `KubernetesProxy`. The `DispatchingKubernetesAuthTranslator` expects a `KubernetesTranslatorMap` to be provided as a parameter. The `KubernetesBuilder` now has a method called `setAuthTranslatorMap` which allows integrators to bring their own `KubernetesAuthTranslator's` to the `KubernetesPlugin`.
+
+### Patch Changes
+
+- 76e8f08fa24: fix localKubectlProxy auth provider fetching
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-scaffolder@1.13.0-next.2
+
+### Minor Changes
+
+- cf18c32934a: The Installed Actions page now shows details for nested objects and arrays
+
+### Patch Changes
+
+- 90dda42cfd2: bug: Invert `templateFilter` predicate to align with `Array.filter`
+- 34dab7ee7f8: `scaffolder/next`: bump `rjsf` dependencies to `5.5.0`
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-scaffolder-react@1.3.0-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
+## @backstage/plugin-search@1.2.0-next.2
+
+### Minor Changes
+
+- d6b73b0380d: Search modal auto closes on location change
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/app-defaults@1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/backend-app-api@0.4.2-next.2
+
+### Patch Changes
+
+- 5c7ce585824: Allow an additionalConfig to be provided to loadBackendConfig that fetches config values during runtime.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/backend-common@0.18.4-next.2
+
+### Patch Changes
+
+- 5c7ce585824: Allow an additionalConfig to be provided to loadBackendConfig that fetches config values during runtime.
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/types@1.0.2
+
+## @backstage/backend-defaults@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+
+## @backstage/backend-plugin-api@0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/backend-tasks@0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+
+## @backstage/backend-test-utils@0.1.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/catalog-client@1.4.1-next.0
+
+### Patch Changes
+
+- c1c4e080b79: Fixed bug in `queryEntities` of `CatalogClient` where the `sortField` is supposed to be changed to `orderField`.
+- Updated dependencies
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+
+## @backstage/cli@0.22.6-next.2
+
+### Patch Changes
+
+- 8075b67e64c: When building a backend package with dependencies any `--config <path>` options will now be forwarded to any dependent app package builds, unless the build script in the app package already contains a `--config` option.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/eslint-plugin@0.1.3-next.0
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.0.2
+
+## @backstage/core-app-api@1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/core-components@0.12.6-next.2
+
+### Patch Changes
+
+- 67140d9f96f: Upgrade `react-virtualized-auto-sizer´ to version `^1.0.11\`
+- 7e60bee2dea: Split the `BackstageSidebar` style `drawer` class, such that the `width` property is in a separate `drawerWidth` class instead. This makes it such that you can style the `drawer` class in your theme again.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/core-plugin-api@1.5.1-next.1
+
+### Patch Changes
+
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/create-app@0.4.39-next.2
+
+### Patch Changes
+
+- 2945923b133: Upgraded the TypeScript version to 5.0
+
+  To apply this change in your own project, switch the TypeScript version in your root `package.json`:
+
+  ```diff
+  -    "typescript": "~4.6.4",
+  +    "typescript": "~5.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/integration-react@1.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @techdocs/cli@1.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
+## @backstage/test-utils@1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/plugin-adr@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-adr-common@0.2.8-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/plugin-adr-backend@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-common@0.2.8-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-airbrake@0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/dev-utils@1.0.14-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-airbrake-backend@0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+
+## @backstage/plugin-allure@0.1.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-analytics-module-ga@0.1.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-apache-airflow@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## @backstage/plugin-api-docs@0.9.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+
+## @backstage/plugin-apollo-explorer@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-app-backend@0.3.44-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-auth-backend@0.18.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/plugin-auth-node@0.2.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-azure-devops@0.2.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-badges-backend@0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-bazaar@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+
+## @backstage/plugin-bazaar-backend@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/plugin-bitrise@0.1.44-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-catalog@1.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/plugin-catalog-backend@1.8.1-next.2
+
+### Patch Changes
+
+- 62a725e3a94: Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
+- c36b89f2af3: Fixed bug in the `DefaultCatalogProcessingEngine` where entities that contained multiple different types of relations for the same source entity would not properly trigger stitching for that source entity.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.15-next.2
+
+### Patch Changes
+
+- 62a725e3a94: Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-github@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-catalog-graph@0.2.29-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-catalog-import@0.9.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
+## @backstage/plugin-catalog-node@1.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
+## @backstage/plugin-catalog-react@1.4.1-next.2
+
+### Patch Changes
+
+- 81bee24c5de: Fixed bug in catalog filters where you could not click on the text to select a value.
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/plugin-cicd-statistics@0.1.19-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.19-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
+## @backstage/plugin-circleci@0.3.17-next.2
+
+### Patch Changes
+
+- d14ac997c36: Add hover over CircleCI avatar icon to show user name in builds table
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-cloudbuild@0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-climate@0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-coverage@0.2.10-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-coverage-backend@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
+## @backstage/plugin-codescene@0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-config-schema@0.1.40-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-cost-insights@0.12.6-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-dynatrace@3.0.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-entity-feedback@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## @backstage/plugin-entity-feedback-backend@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## @backstage/plugin-entity-validation@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
+## @backstage/plugin-events-backend@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-github@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-backend-test-utils@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-events-node@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+
+## @backstage/plugin-explore@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.28-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/plugin-explore-backend@0.0.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-explore-react@0.0.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-fossa@0.2.49-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gcalendar@0.3.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gcp-projects@0.3.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-git-release-manager@0.3.30-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-actions@0.5.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-deployments@0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-issues@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-pull-requests-board@0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gitops-profiles@0.3.35-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gocd@0.1.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-graphiql@0.2.49-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-graphql-backend@0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-graphql@0.3.20-next.1
+
+## @backstage/plugin-graphql-voyager@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-home@0.4.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-ilert@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-jenkins@0.7.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-jenkins-common@0.1.15-next.0
+
+## @backstage/plugin-jenkins-backend@0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-jenkins-common@0.1.15-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-kafka@0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-kafka-backend@0.2.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-kubernetes@0.7.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+
+## @backstage/plugin-lighthouse@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## @backstage/plugin-lighthouse-backend@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## @backstage/plugin-linguist@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-linguist-common@0.1.0
+
+## @backstage/plugin-linguist-backend@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+
+## @backstage/plugin-microsoft-calendar@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-newrelic@0.3.35-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-newrelic-dashboard@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-octopus-deploy@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-org@0.6.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-org-react@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-pagerduty@0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-periskop@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-periskop-backend@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+
+## @backstage/plugin-permission-backend@0.5.19-next.2
+
+### Patch Changes
+
+- 84946a580c4: Introduced alpha export of the `permissionPlugin` for use in the new backend system, along with a `permissionModuleAllowAllPolicy` that can be used to allow all requests.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-permission-node@0.7.7-next.2
+
+### Patch Changes
+
+- 788f0f5a152: Introduced alpha export of the `policyExtensionPoint` for use in the new backend system.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-permission-react@0.4.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-playlist@0.1.8-next.2
+
+### Patch Changes
+
+- 1b3c0546047: Added config properties to change dynamically the group noun for all the components in the UI
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/plugin-playlist-backend@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+
+## @backstage/plugin-proxy-backend@0.2.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+
+## @backstage/plugin-rollbar@0.4.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-rollbar-backend@0.1.41-next.2
+
+### Patch Changes
+
+- 66b6cfc5716: Replace `camelcase-keys` dependency with one with better compatibility.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+
+## @backstage/plugin-scaffolder-backend@1.13.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-node@0.1.2-next.2
+
+### Patch Changes
+
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
+## @backstage/plugin-scaffolder-react@1.3.0-next.2
+
+### Patch Changes
+
+- 90dda42cfd2: bug: Invert `templateFilter` predicate to align with `Array.filter`
+- 34dab7ee7f8: `scaffolder/next`: bump `rjsf` dependencies to `5.5.0`
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
+## @backstage/plugin-search-backend@1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
+## @backstage/plugin-search-backend-node@1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-react@1.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-sentry@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-shortcuts@0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-sonarqube@0.6.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-sonarqube-react@0.1.5-next.1
+
+## @backstage/plugin-sonarqube-backend@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-sonarqube-react@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
+## @backstage/plugin-splunk-on-call@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-stack-overflow@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-home@0.4.33-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
+## @backstage/plugin-stack-overflow-backend@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-stackstorm@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-tech-insights@0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
+## @backstage/plugin-tech-insights-backend@0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.28-next.2
+
+### Patch Changes
+
+- 9cb1db6546a: When multiple fact retrievers are used for a check, allow for cases where only one returns a given fact
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
+## @backstage/plugin-tech-insights-node@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
+## @backstage/plugin-tech-radar@0.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-techdocs@1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
+## @backstage/plugin-techdocs-backend@1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.2
+
+### Patch Changes
+
+- c657d0a610e: Bump `photoswipe` dependency to `^5.3.7`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
+## @backstage/plugin-techdocs-node@1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-techdocs-react@1.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/plugin-todo@0.2.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-todo-backend@0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
+## @backstage/plugin-user-settings@0.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-user-settings-backend@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/plugin-vault@0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-vault-backend@0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-xcmetrics@0.2.37-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## example-app@0.2.82-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-circleci@0.3.17-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.2
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-scaffolder-react@1.3.0-next.2
+  - @backstage/plugin-scaffolder@1.13.0-next.2
+  - @backstage/plugin-code-coverage@0.2.10-next.2
+  - @backstage/plugin-cost-insights@0.12.6-next.2
+  - @backstage/plugin-playlist@0.1.8-next.2
+  - @backstage/plugin-search@1.2.0-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-airbrake@0.3.17-next.2
+  - @backstage/plugin-apache-airflow@0.2.10-next.2
+  - @backstage/plugin-api-docs@0.9.2-next.2
+  - @backstage/plugin-azure-devops@0.2.8-next.2
+  - @backstage/plugin-azure-sites@0.1.6-next.2
+  - @backstage/plugin-badges@0.2.41-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-graph@0.2.29-next.2
+  - @backstage/plugin-catalog-import@0.9.7-next.2
+  - @backstage/plugin-cloudbuild@0.3.17-next.2
+  - @backstage/plugin-dynatrace@3.0.1-next.2
+  - @backstage/plugin-entity-feedback@0.2.0-next.2
+  - @backstage/plugin-explore@0.4.2-next.2
+  - @backstage/plugin-gcalendar@0.3.13-next.2
+  - @backstage/plugin-gcp-projects@0.3.36-next.2
+  - @backstage/plugin-github-actions@0.5.17-next.2
+  - @backstage/plugin-gocd@0.1.23-next.2
+  - @backstage/plugin-graphiql@0.2.49-next.2
+  - @backstage/plugin-home@0.4.33-next.2
+  - @backstage/plugin-jenkins@0.7.16-next.2
+  - @backstage/plugin-kafka@0.3.17-next.2
+  - @backstage/plugin-kubernetes@0.7.10-next.2
+  - @backstage/plugin-lighthouse@0.4.2-next.2
+  - @backstage/plugin-linguist@0.1.2-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+  - @backstage/plugin-microsoft-calendar@0.1.2-next.2
+  - @backstage/plugin-newrelic@0.3.35-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.10-next.2
+  - @backstage/plugin-org@0.6.7-next.2
+  - @backstage/plugin-pagerduty@0.5.10-next.2
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-rollbar@0.4.17-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-sentry@0.5.2-next.2
+  - @backstage/plugin-shortcuts@0.3.9-next.2
+  - @backstage/plugin-stack-overflow@0.1.13-next.2
+  - @backstage/plugin-stackstorm@0.1.1-next.2
+  - @backstage/plugin-tech-insights@0.3.9-next.2
+  - @backstage/plugin-tech-radar@0.6.3-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+  - @backstage/plugin-todo@0.2.19-next.2
+  - @backstage/plugin-user-settings@0.7.2-next.2
+  - @internal/plugin-catalog-customized@0.0.9-next.2
+
+## example-backend@0.2.82-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-rollbar-backend@0.1.41-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.28-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - example-app@0.2.82-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-backend@0.3.2-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-backend@0.18.2-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.23-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.6-next.2
+  - @backstage/plugin-badges-backend@0.1.38-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.10-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.2-next.2
+  - @backstage/plugin-events-backend@0.2.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-explore-backend@0.0.6-next.2
+  - @backstage/plugin-graphql-backend@0.1.34-next.2
+  - @backstage/plugin-jenkins-backend@0.1.34-next.2
+  - @backstage/plugin-kafka-backend@0.2.37-next.2
+  - @backstage/plugin-lighthouse-backend@0.1.2-next.2
+  - @backstage/plugin-linguist-backend@0.2.1-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-playlist-backend@0.2.7-next.2
+  - @backstage/plugin-proxy-backend@0.2.38-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.2
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.5-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.10-next.2
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.2
+  - @backstage/plugin-todo-backend@0.1.41-next.2
+
+## example-backend-next@0.0.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/backend-defaults@0.1.9-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.1
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.2
+  - @backstage/plugin-todo-backend@0.1.41-next.2
+
+## e2e-test@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.4.39-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
+## techdocs-cli-embedded-app@0.2.81-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
+## @internal/plugin-catalog-customized@0.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-catalog@1.10.0-next.2
+
+## @internal/plugin-todo-list@1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @internal/plugin-todo-list-backend@1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
diff --git a/docs/releases/v1.13.0-next.3-changelog.md b/docs/releases/v1.13.0-next.3-changelog.md
new file mode 100644
index 0000000000..80da2aaa77
--- /dev/null
+++ b/docs/releases/v1.13.0-next.3-changelog.md
@@ -0,0 +1,2087 @@
+# Release v1.13.0-next.3
+
+## @backstage/catalog-model@1.3.0-next.0
+
+### Minor Changes
+
+- be9c4228073: Modified the regex for DNS label validation to support IDN domains
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+
+## @backstage/cli-node@0.1.0-next.0
+
+### Minor Changes
+
+- 3156b0d85dc: Introduced the new `@backstage/cli-node` package, which provides utilities for use across Backstage CLIs.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+
+## @backstage/core-app-api@1.7.0-next.3
+
+### Minor Changes
+
+- c15e0cedbe1: The `AuthConnector` interface now supports specifying a set of scopes when
+  refreshing a session. The `DefaultAuthConnector` implementation passes the
+  `scope` query parameter to the auth-backend plugin appropriately. The
+  `RefreshingAuthSessionManager` passes any scopes in its `GetSessionRequest`
+  appropriately.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/core-components@0.13.0-next.3
+
+### Minor Changes
+
+- 01cd4e25754: **BREAKING:** Removing `Tabs` component from `core-components` as it is neither used in the core Backstage app nor in the monorepo plugins. If you are using this component in your instance please consider replacing it with the [Material UI `Tabs`](https://v4.mui.com/components/tabs/#tabs) component like the following:
+
+  ```diff
+  - <Tabs
+  -    tabs={[{
+  -       icon: <AccessAlarmIcon />,
+  -       content: <div>Label</div>,
+  -    }]}
+  - />
+
+  + <Tabs>
+  +    <Tab
+  +       label = "Label"
+  +       icon = { <AccessAlarmIcon /> }
+  +    />
+  + </Tabs>
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/repo-tools@0.2.0-next.2
+
+### Minor Changes
+
+- a876e69b20e: Adding two new commands to support OpenAPI spec writing, `schema:openapi:generate` to generate the Typescript file that `@backstage/backend-openapi-utils` needs for typing and `schema:openapi:verify` to verify that this file exists and matches your `src/schema/openapi.yaml` file.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-catalog-backend@1.9.0-next.3
+
+### Minor Changes
+
+- 92a4590fc3a: Add monorepo support to CodeOwnersProccesor.
+
+### Patch Changes
+
+- be5aca50114: Updates and moves OpenAPI spec to `src/schema/openapi.yaml` and uses `ApiRouter` type from `@backstage/backend-openapi-utils` to handle automatic types from the OpenAPI spec file.
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-catalog-react@1.5.0-next.3
+
+### Minor Changes
+
+- a49fb39df5a: Attempt to load entity owner names in the EntityOwnerPicker through the `by-refs` endpoint. If `spec.profile.displayName` or `metadata.title` are populated, we now attempt to show those before showing the `humanizeEntityRef`'d version.
+
+  **BREAKING**: `EntityOwnerFilter` now uses the full entity ref instead of the `humanizeEntityRef`. If you rely on `EntityOwnerFilter.values` or the `queryParameters.owners` of `useEntityList`, you will need to adjust your code like the following.
+
+  ```tsx
+  const { queryParameters: { owners } } = useEntityList();
+  // or
+  const { filter: { owners } } = useEntityList();
+
+  // Instead of,
+  if (owners.some(ref => ref === humanizeEntityRef(myEntity))) ...
+
+  // You'll need to use,
+  if (owners.some(ref => ref === stringifyEntityRef(myEntity))) ...
+  ```
+
+### Patch Changes
+
+- d1f5324dff7: Reverted the check if the selected options list is different than the query parameters list before invoking `setSelectedOptions` method. This was preventing updating list items when a query string was already present in the URL when loading the page.
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/plugin-kubernetes@0.8.0-next.3
+
+### Minor Changes
+
+- 754be7c5106: refactor kubernetes error detection to make way for proposed solutions
+
+  **BREAKING**: `DetectedError` now appears once per Kubernetes resource per error instead of for all resources which have that error, `namespace` and `name` fields are now in `sourceRef` object `message` is now a `string` instead of a `string[]`. `ErrorDetectableKind` has been removed.
+
+### Patch Changes
+
+- e7fb0117485: fixes a bug where an empty authorization header was provided to the proxy endpoint when a cluster had a server-side auth provider
+- c159ab64a60: `KubernetesBackendClient` now requires a `kubernetesAuthProvidersApi` value to be provided. `KubernetesApi` interface now has a proxy method requirement.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+
+## @backstage/plugin-lighthouse-backend@0.2.0-next.3
+
+### Minor Changes
+
+- 7a89555e73d: Lighthouse backend plugin can now use an authenticated catalog backend API.
+
+  - Breaking \* You must now pass the `tokenManager` to the lighthouse `createScheduler`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## @backstage/plugin-scaffolder-backend@1.13.0-next.3
+
+### Minor Changes
+
+- d7c8c222e25: Allow for a commit message to differ from the PR title when publishing a GitHub pull request.
+
+### Patch Changes
+
+- f37a95adcd8: Stripped entity types and namespace before passing to GitHub API
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/app-defaults@1.3.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/backend-openapi-utils@0.0.1-next.0
+
+### Patch Changes
+
+- 62fe726fdc5: New plugin! Primary focus is to support types on `Router`s in backend packages. Developers can use the `ApiRouter` from this package in their packages to support a typed experience based on their OpenAPI specs. The `ApiRouter` supports request bodies, response bodies, query parameters and path parameters, as well as full path-based context of the above. This means no more guessing on an endpoint like `req.post('/not-my-route', (req, res)=>{res.send(req.body.badparam)})`. Typescript would catch `/not-my-route`, `req.body.badparam`, `res.send(req.body.badparam)`.
+
+## @backstage/catalog-client@1.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/errors@1.1.5
+
+## @backstage/cli@0.22.6-next.3
+
+### Patch Changes
+
+- 3156b0d85dc: Internal refactor to move many internal utilities to the new `@backstage/cli-node` package.
+- 9bbb00d5b49: Updated dependency `@swc/helpers` to `^0.5.0`.
+- Updated dependencies
+  - @backstage/cli-node@0.1.0-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/eslint-plugin@0.1.3-next.0
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.0.2
+
+## @backstage/create-app@0.4.39-next.3
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## @backstage/dev-utils@1.0.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/integration-react@1.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @techdocs/cli@1.4.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## @backstage/test-utils@1.3.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## @backstage/plugin-adr@0.4.2-next.3
+
+### Patch Changes
+
+- 77aa3a4d47e: use path attribute to fetch files instead of name and update the UI to navigate over subdirectories
+- Updated dependencies
+  - @backstage/plugin-adr-common@0.2.8-next.1
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-adr-backend@0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-adr-common@0.2.8-next.1
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-adr-common@0.2.8-next.1
+
+### Patch Changes
+
+- 77aa3a4d47e: use path attribute to fetch files instead of name and update the UI to navigate over subdirectories
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-airbrake@0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/dev-utils@1.0.14-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-allure@0.1.33-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-analytics-module-ga@0.1.28-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-apache-airflow@0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## @backstage/plugin-api-docs@0.9.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## @backstage/plugin-apollo-explorer@0.1.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-auth-backend@0.18.2-next.3
+
+### Patch Changes
+
+- 475abd1dc3f: The `microsoft` (i.e. Azure) auth provider now supports negotiating tokens for
+  Azure resources besides Microsoft Graph (e.g. AKS, Virtual Machines, Machine
+  Learning Services, etc.). When the `/frame/handler` endpoint is called with an
+  authorization code for a non-Microsoft Graph scope, the user profile will not be
+  fetched. Similarly no user profile or photo data will be fetched by the backend
+  if the `/refresh` endpoint is called with the `scope` query parameter strictly
+  containing scopes for resources besides Microsoft Graph.
+
+  Furthermore, the `offline_access` scope will be requested by default, even when
+  it is not mentioned in the argument to `getAccessToken`. This means that any
+  Azure access token can be automatically refreshed, even if the user has not
+  signed in via Azure.
+
+- 6a900951336: Add common identify resolvers for `oidc` auth provider.
+
+- a0ef1ec7349: Export Azure Easy Auth provider so it can actually be used.
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/plugin-azure-devops@0.2.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-badges-backend@0.1.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-bazaar@0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## @backstage/plugin-bitrise@0.1.44-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-catalog@1.10.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.18-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-github@0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.3.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-catalog-common@1.0.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-catalog-graph@0.2.29-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-catalog-graphql@0.3.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-import@0.9.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## @backstage/plugin-catalog-node@1.3.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## @backstage/plugin-cicd-statistics@0.1.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-cicd-statistics@0.1.19-next.3
+
+## @backstage/plugin-circleci@0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-cloudbuild@0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-climate@0.1.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-coverage@0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-code-coverage-backend@0.2.10-next.3
+
+### Patch Changes
+
+- d3645a62b74: Bump `xml2js` from 0.4.23 to 0.5.0
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
+## @backstage/plugin-codescene@0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-config-schema@0.1.40-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-cost-insights@0.12.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-dynatrace@4.0.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-entity-feedback@0.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## @backstage/plugin-entity-feedback-backend@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## @backstage/plugin-entity-validation@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## @backstage/plugin-events-backend@0.2.5-next.3
+
+### Patch Changes
+
+- 3538d9ad2c4: Export `DefaultEventBroker` to allow decoupling of the catalog and events backends in the `example-backend`.
+
+  Please look at `plugins/events-backend/README.md` for the currently advised way to set up the event backend and catalog providers.
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## @backstage/plugin-explore@0.4.2-next.3
+
+### Patch Changes
+
+- f9ea944422e: Extracted generic `CatalogKindExploreContent` component so that it is easy to show any component kinds in their own tab in the explore page.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.28-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-firehydrant@0.2.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-fossa@0.2.49-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gcalendar@0.3.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gcp-projects@0.3.36-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-git-release-manager@0.3.30-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-actions@0.5.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-deployments@0.1.48-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-issues@0.2.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-github-pull-requests-board@0.1.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gitops-profiles@0.3.35-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-gocd@0.1.23-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-graphiql@0.2.49-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-graphql-backend@0.1.34-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-graphql@0.3.20-next.2
+
+## @backstage/plugin-graphql-voyager@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-home@0.4.33-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-ilert@0.2.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-jenkins@0.7.16-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-jenkins-common@0.1.15-next.1
+
+## @backstage/plugin-jenkins-backend@0.1.34-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-jenkins-common@0.1.15-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-jenkins-common@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-kafka@0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-kafka-backend@0.2.37-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-kubernetes-backend@0.10.0-next.3
+
+### Patch Changes
+
+- 56a28b559e5: Updated kubernetes config schema to match available options
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+
+## @backstage/plugin-kubernetes-common@0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-lighthouse@0.4.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## @backstage/plugin-linguist@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-linguist-common@0.1.0
+
+## @backstage/plugin-linguist-backend@0.2.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+
+## @backstage/plugin-microsoft-calendar@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-newrelic@0.3.35-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-newrelic-dashboard@0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+
+## @backstage/plugin-octopus-deploy@0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-org@0.6.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-org-react@0.1.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-pagerduty@0.5.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-periskop@0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-playlist@0.1.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-playlist-backend@0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+
+## @backstage/plugin-rollbar@0.4.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-scaffolder@1.13.0-next.3
+
+### Patch Changes
+
+- 7917cfccfc7: Fix some hard-coded white font colors in scaffolder
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-scaffolder-react@1.3.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.1.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## @backstage/plugin-scaffolder-react@1.3.0-next.3
+
+### Patch Changes
+
+- d2488f5e54c: Add indication that the validators are running
+- 8c40997df44: Updated dependency `@rjsf/core-v5` to `npm:@rjsf/core@5.5.2`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## @backstage/plugin-search@1.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-search-backend-module-catalog@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.3
+
+### Patch Changes
+
+- 104b6b19487: fix ElasticSearch throwing error when index is missing
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## @backstage/plugin-search-react@1.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-sentry@0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-shortcuts@0.3.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-sonarqube@0.6.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-sonarqube-react@0.1.5-next.2
+
+## @backstage/plugin-sonarqube-react@0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## @backstage/plugin-splunk-on-call@0.4.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-stack-overflow@0.1.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-home@0.4.33-next.3
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## @backstage/plugin-stackstorm@0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-tech-insights@0.3.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
+## @backstage/plugin-tech-insights-backend@0.5.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
+## @backstage/plugin-tech-radar@0.6.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-techdocs@1.6.1-next.3
+
+### Patch Changes
+
+- 2e493480626: Fix a bug in sub-path navigation due to double addition of a sub-path if one was set up in `app.baseUrl`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## @backstage/plugin-techdocs-backend@1.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## @backstage/plugin-techdocs-node@1.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## @backstage/plugin-techdocs-react@1.1.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/version-bridge@1.0.4-next.0
+
+## @backstage/plugin-todo@0.2.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-todo-backend@0.1.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## @backstage/plugin-user-settings@0.7.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-user-settings-backend@0.1.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## @backstage/plugin-vault@0.1.11-next.3
+
+### Patch Changes
+
+- 7c7f8d38a51: Use `fetchApi` instead of raw `fetch` in order to pass auth header if necessary.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## @backstage/plugin-xcmetrics@0.2.37-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## example-app@0.2.82-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes@0.8.0-next.3
+  - @backstage/plugin-scaffolder@1.13.0-next.3
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/plugin-explore@0.4.2-next.3
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-scaffolder-react@1.3.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-airbrake@0.3.17-next.3
+  - @backstage/plugin-apache-airflow@0.2.10-next.3
+  - @backstage/plugin-api-docs@0.9.2-next.3
+  - @backstage/plugin-azure-devops@0.2.8-next.3
+  - @backstage/plugin-azure-sites@0.1.6-next.3
+  - @backstage/plugin-badges@0.2.41-next.3
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-graph@0.2.29-next.3
+  - @backstage/plugin-catalog-import@0.9.7-next.3
+  - @backstage/plugin-circleci@0.3.17-next.3
+  - @backstage/plugin-cloudbuild@0.3.17-next.3
+  - @backstage/plugin-code-coverage@0.2.10-next.3
+  - @backstage/plugin-cost-insights@0.12.6-next.3
+  - @backstage/plugin-dynatrace@4.0.0-next.3
+  - @backstage/plugin-entity-feedback@0.2.0-next.3
+  - @backstage/plugin-gcalendar@0.3.13-next.3
+  - @backstage/plugin-gcp-projects@0.3.36-next.3
+  - @backstage/plugin-github-actions@0.5.17-next.3
+  - @backstage/plugin-gocd@0.1.23-next.3
+  - @backstage/plugin-graphiql@0.2.49-next.3
+  - @backstage/plugin-home@0.4.33-next.3
+  - @backstage/plugin-jenkins@0.7.16-next.3
+  - @backstage/plugin-kafka@0.3.17-next.3
+  - @backstage/plugin-lighthouse@0.4.2-next.3
+  - @backstage/plugin-linguist@0.1.2-next.3
+  - @backstage/plugin-linguist-common@0.1.0
+  - @backstage/plugin-microsoft-calendar@0.1.2-next.3
+  - @backstage/plugin-newrelic@0.3.35-next.3
+  - @backstage/plugin-newrelic-dashboard@0.2.10-next.3
+  - @backstage/plugin-org@0.6.7-next.3
+  - @backstage/plugin-pagerduty@0.5.10-next.3
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist@0.1.8-next.3
+  - @backstage/plugin-rollbar@0.4.17-next.3
+  - @backstage/plugin-search@1.2.0-next.3
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-sentry@0.5.2-next.3
+  - @backstage/plugin-shortcuts@0.3.9-next.3
+  - @backstage/plugin-stack-overflow@0.1.13-next.3
+  - @backstage/plugin-stackstorm@0.1.1-next.3
+  - @backstage/plugin-tech-insights@0.3.9-next.3
+  - @backstage/plugin-tech-radar@0.6.3-next.3
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+  - @backstage/plugin-todo@0.2.19-next.3
+  - @backstage/plugin-user-settings@0.7.2-next.3
+  - @internal/plugin-catalog-customized@0.0.9-next.3
+
+## example-backend@0.2.82-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.3
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/plugin-code-coverage-backend@0.2.10-next.3
+  - @backstage/plugin-lighthouse-backend@0.2.0-next.3
+  - @backstage/plugin-auth-backend@0.18.2-next.3
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-events-backend@0.2.5-next.3
+  - example-app@0.2.82-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-backend@0.3.2-next.3
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.23-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.6-next.2
+  - @backstage/plugin-badges-backend@0.1.38-next.3
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-entity-feedback-backend@0.1.2-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-explore-backend@0.0.6-next.2
+  - @backstage/plugin-graphql-backend@0.1.34-next.3
+  - @backstage/plugin-jenkins-backend@0.1.34-next.3
+  - @backstage/plugin-kafka-backend@0.2.37-next.3
+  - @backstage/plugin-linguist-backend@0.2.1-next.3
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-playlist-backend@0.2.7-next.3
+  - @backstage/plugin-proxy-backend@0.2.38-next.2
+  - @backstage/plugin-rollbar-backend@0.1.41-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.3
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.5-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.10-next.3
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.28-next.2
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.3
+  - @backstage/plugin-todo-backend@0.1.41-next.3
+
+## example-backend-next@0.0.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.3
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-defaults@0.1.9-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.3
+  - @backstage/plugin-todo-backend@0.1.41-next.3
+
+## e2e-test@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.4.39-next.3
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
+## techdocs-cli-embedded-app@0.2.81-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## @internal/plugin-catalog-customized@0.0.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## @internal/plugin-todo-list@1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
diff --git a/lighthouserc.js b/lighthouserc.js
new file mode 100644
index 0000000000..5d7e0e8017
--- /dev/null
+++ b/lighthouserc.js
@@ -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.
+ */
+module.exports = {
+  ci: {
+    collect: {
+      url: [
+        /** Software Catalog */
+        'http://localhost:3000/catalog',
+        'http://localhost:3000/catalog-import',
+        'http://localhost:3000/catalog/default/component/backstage',
+        /** TechDocs */
+        'http://localhost:3000/docs',
+        'http://localhost:3000/docs/default/component/backstage',
+        /** Software Templates */
+        'http://localhost:3000/create',
+        'http://localhost:3000/create/tasks',
+        'http://localhost:3000/create/actions',
+        'http://localhost:3000/create/edit',
+        'http://localhost:3000/create/templates/default/react-ssr-template',
+        /** Search */
+        'http://localhost:3000/search',
+      ],
+      settings: {
+        onlyCategories: ['accessibility'],
+        // need to disable storage reset because of auth
+        disableStorageReset: true,
+        output: ['html', 'json'],
+        outputPath: './.lighthouseci/reports',
+        preset: 'desktop',
+      },
+      startServerCommand: 'yarn dev',
+      startServerReadyTimeout: 600000,
+      numberOfRuns: 1,
+      puppeteerScript: './.lighthouseci/scripts/guest-auth.js',
+      startServerReadyPattern: 'Listening on :7007',
+    },
+    assert: {
+      assertions: {
+        'categories:performance': 'off',
+        'categories:pwa': 'off',
+        'categories:best-practices': 'off',
+        'categories:seo': 'off',
+        'categories:accessibility': ['error', { minScore: 0.85 }],
+      },
+    },
+  },
+};
diff --git a/microsite/data/plugins/api-spectral-linter.yaml b/microsite/data/plugins/api-spectral-linter.yaml
new file mode 100644
index 0000000000..292279e324
--- /dev/null
+++ b/microsite/data/plugins/api-spectral-linter.yaml
@@ -0,0 +1,10 @@
+---
+title: API Spectral Linter
+author: dweber019
+authorUrl: https://github.com/dweber019
+category: Linting
+description: API Spectral Linter is a quality assurance tool that checks the compliance of API's specifications Spectral rule sets.
+documentation: https://github.com/dweber019/backstage-plugin-api-docs-spectral-linter
+iconUrl: https://raw.githubusercontent.com/dweber019/backstage-plugin-api-docs-spectral-linter/main/plugins/api-docs-spectral-linter/docs/pluginIcon.png
+npmPackageName: '@dweber019/backstage-plugin-api-docs-spectral-linter'
+addedDate: '2023-03-27'
diff --git a/microsite/data/plugins/bulletin-board.yaml b/microsite/data/plugins/bulletin-board.yaml
new file mode 100644
index 0000000000..67791f6f84
--- /dev/null
+++ b/microsite/data/plugins/bulletin-board.yaml
@@ -0,0 +1,10 @@
+---
+title: Bulletin Board
+author: v-ngu
+authorUrl: https://github.com/v-ngu
+category: Discovery
+description: Share interesting ideas, news and links with your teammates within Backstage.
+documentation: https://github.com/v-ngu/backstage-plugin-bulletin-board
+iconUrl: /img/bulletin-board.png
+npmPackageName: 'backstage-plugin-bulletin-board'
+addedDate: '2023-04-01'
diff --git a/microsite/data/plugins/microcks.yaml b/microsite/data/plugins/microcks.yaml
new file mode 100644
index 0000000000..4f94e5b465
--- /dev/null
+++ b/microsite/data/plugins/microcks.yaml
@@ -0,0 +1,12 @@
+---
+title: Microcks
+author: Microcks
+authorUrl: https://microcks.io
+category: Discovery
+description: Import API definitions (OpenAPI, AsyncAPI, gRPC) from Microcks instances, linking to their mock endpoints and test results.
+documentation: https://github.com/microcks/microcks-backstage-provider
+iconUrl: https://microcks.io/images/microcks-logo-blue.png
+npmPackageName: '@microcks/microcks-backstage-provider'
+tags:
+  - mock
+addedDate: '2023-04-06'
diff --git a/microsite/data/plugins/microsoft-calendar.yaml b/microsite/data/plugins/microsoft-calendar.yaml
index 183c991761..a1eb981dd1 100644
--- a/microsite/data/plugins/microsoft-calendar.yaml
+++ b/microsite/data/plugins/microsoft-calendar.yaml
@@ -6,7 +6,6 @@ description: |
   The plugin integrates with your Microsoft Calendar.
   It displays all your calendars and events in it.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/microsoft-calendar
-iconUrl: /img/outlook-statusneo.png
 npmPackageName: '@backstage/plugin-microsoft-calendar'
 tags:
   - Microsoft
diff --git a/microsite/data/plugins/microsoft-forms.yaml b/microsite/data/plugins/microsoft-forms.yaml
new file mode 100644
index 0000000000..7b36fe2ad6
--- /dev/null
+++ b/microsite/data/plugins/microsoft-forms.yaml
@@ -0,0 +1,12 @@
+title: Microsoft Forms
+author: ZcMander
+authorUrl: https://github.com/zcmander
+category: Productivity
+description: Embed a form into the entity page with ease!
+documentation: https://github.com/zcmander/backstage-plugin-msforms
+iconUrl: /img/microsoft-forms.png
+npmPackageName: '@zcmander/backstage-plugin-msforms'
+tags:
+  - Microsoft
+  - forms
+addedDate: '2023-04-11'
diff --git a/microsite/data/plugins/puppetdb.yaml b/microsite/data/plugins/puppetdb.yaml
new file mode 100644
index 0000000000..d3b6bd2bcb
--- /dev/null
+++ b/microsite/data/plugins/puppetdb.yaml
@@ -0,0 +1,13 @@
+---
+title: PuppetDB
+author: TDabasinskas
+authorUrl: https://github.com/tdabasinskas
+category: Configuration Management
+description: Visualize resource information and Puppet facts from PuppetDB.
+documentation: https://github.com/backstage/backstage/blob/master/plugins/puppetdb/README.md
+iconUrl: /img/puppet.png
+npmPackageName: '@backstage/plugin-puppetdb'
+tags:
+  - puppet
+  - puppetdb
+addedDate: '2023-04-06'
diff --git a/microsite/package.json b/microsite/package.json
index 09409518ee..76696ce939 100644
--- a/microsite/package.json
+++ b/microsite/package.json
@@ -32,7 +32,7 @@
     "@docusaurus/core": "2.4.0",
     "@docusaurus/plugin-client-redirects": "^2.3.1",
     "@docusaurus/preset-classic": "2.4.0",
-    "@swc/core": "^1.3.36",
+    "@swc/core": "^1.3.46",
     "clsx": "^1.1.1",
     "docusaurus-plugin-sass": "^0.2.3",
     "prism-react-renderer": "^1.3.5",
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index 09727685a0..b3e6f07b0e 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -277,15 +277,16 @@
         "items": [
           "auth/auth0/provider",
           "auth/atlassian/provider",
-          "auth/bitbucket/provider",
           "auth/microsoft/provider",
+          "auth/microsoft/easy-auth",
+          "auth/bitbucket/provider",
           "auth/github/provider",
           "auth/gitlab/provider",
           "auth/google/provider",
           "auth/google/gcp-iap-auth",
           "auth/okta/provider",
-          "auth/onelogin/provider",
-          "auth/oauth2-proxy/provider"
+          "auth/oauth2-proxy/provider",
+          "auth/onelogin/provider"
         ]
       },
       "auth/identity-resolver",
diff --git a/microsite/static/img/bulletin-board.png b/microsite/static/img/bulletin-board.png
new file mode 100644
index 0000000000..918d81827a
Binary files /dev/null and b/microsite/static/img/bulletin-board.png differ
diff --git a/microsite/static/img/microsoft-forms.png b/microsite/static/img/microsoft-forms.png
new file mode 100644
index 0000000000..d15c299545
Binary files /dev/null and b/microsite/static/img/microsoft-forms.png differ
diff --git a/microsite/static/img/outlook-statusneo.png b/microsite/static/img/outlook-statusneo.png
deleted file mode 100644
index 99e3b6a0bc..0000000000
Binary files a/microsite/static/img/outlook-statusneo.png and /dev/null differ
diff --git a/microsite/static/img/puppet.png b/microsite/static/img/puppet.png
new file mode 100644
index 0000000000..daa3313333
Binary files /dev/null and b/microsite/static/img/puppet.png differ
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 021d21a043..4b8ea8c58e 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2624,90 +2624,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-arm64@npm:1.3.42"
+"@swc/core-darwin-arm64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-arm64@npm:1.3.50"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-x64@npm:1.3.42"
+"@swc/core-darwin-x64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-x64@npm:1.3.50"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.42"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.50"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.42"
+"@swc/core-linux-arm64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.42"
+"@swc/core-linux-arm64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.42"
+"@swc/core-linux-x64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.42"
+"@swc/core-linux-x64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.42"
+"@swc/core-win32-arm64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.42"
+"@swc/core-win32-ia32-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.42"
+"@swc/core-win32-x64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.3.36":
-  version: 1.3.42
-  resolution: "@swc/core@npm:1.3.42"
+"@swc/core@npm:^1.3.46":
+  version: 1.3.50
+  resolution: "@swc/core@npm:1.3.50"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.42
-    "@swc/core-darwin-x64": 1.3.42
-    "@swc/core-linux-arm-gnueabihf": 1.3.42
-    "@swc/core-linux-arm64-gnu": 1.3.42
-    "@swc/core-linux-arm64-musl": 1.3.42
-    "@swc/core-linux-x64-gnu": 1.3.42
-    "@swc/core-linux-x64-musl": 1.3.42
-    "@swc/core-win32-arm64-msvc": 1.3.42
-    "@swc/core-win32-ia32-msvc": 1.3.42
-    "@swc/core-win32-x64-msvc": 1.3.42
+    "@swc/core-darwin-arm64": 1.3.50
+    "@swc/core-darwin-x64": 1.3.50
+    "@swc/core-linux-arm-gnueabihf": 1.3.50
+    "@swc/core-linux-arm64-gnu": 1.3.50
+    "@swc/core-linux-arm64-musl": 1.3.50
+    "@swc/core-linux-x64-gnu": 1.3.50
+    "@swc/core-linux-x64-musl": 1.3.50
+    "@swc/core-win32-arm64-msvc": 1.3.50
+    "@swc/core-win32-ia32-msvc": 1.3.50
+    "@swc/core-win32-x64-msvc": 1.3.50
+  peerDependencies:
+    "@swc/helpers": ^0.5.0
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -2729,7 +2731,10 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  checksum: 5c28c03ee6a4e1f630c4a519b56d7e23a0102f70fad977a3ab144a3da96231cf4849e473cdc9ee7be6b9266ba0838d0bc0b6b3575a75540f302befe96cc9606e
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 63364c0bf6f395a57b576c4f7c5f79542a7c018c7bcc121e1bccdb157ca3ead97ee30920cf5ec6e93b0bd58e0145cb388721d7862ede867927137a437b4ef21a
   languageName: node
   linkType: hard
 
@@ -3732,7 +3737,7 @@ __metadata:
     "@docusaurus/plugin-client-redirects": ^2.3.1
     "@docusaurus/preset-classic": 2.4.0
     "@spotify/prettier-config": ^14.0.0
-    "@swc/core": ^1.3.36
+    "@swc/core": ^1.3.46
     "@tsconfig/docusaurus": ^1.0.6
     "@types/webpack-env": ^1.18.0
     clsx: ^1.1.1
diff --git a/mkdocs.yml b/mkdocs.yml
index 4b5c2cf7a2..4a75c3f67f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,6 +6,7 @@ edit_uri: edit/master/docs
 plugins:
   - techdocs-core
 
+# For sidebar navigation on https://backstage.io/, see `microsite/sidebars.json`
 nav:
   - Overview:
       - What is Backstage?: 'overview/what-is-backstage.md'
diff --git a/package.json b/package.json
index 6cf9251a6c..5bf140d66b 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@types/react": "^17",
     "@types/react-dom": "^17"
   },
-  "version": "1.13.0-next.1",
+  "version": "1.13.0-next.3",
   "dependencies": {
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3"
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index 4f073e1b2d..e8ad84d5d7 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/app-defaults
 
+## 1.3.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## 1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
 ## 1.3.0-next.1
 
 ### Patch Changes
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index 7d47452b77..b8bbec2227 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.3.0-next.1",
+  "version": "1.3.0-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index 1af398f7c7..2cfd48a509 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,143 @@
 # example-app
 
+## 0.2.82-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes@0.8.0-next.3
+  - @backstage/plugin-scaffolder@1.13.0-next.3
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/plugin-explore@0.4.2-next.3
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-scaffolder-react@1.3.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-airbrake@0.3.17-next.3
+  - @backstage/plugin-apache-airflow@0.2.10-next.3
+  - @backstage/plugin-api-docs@0.9.2-next.3
+  - @backstage/plugin-azure-devops@0.2.8-next.3
+  - @backstage/plugin-azure-sites@0.1.6-next.3
+  - @backstage/plugin-badges@0.2.41-next.3
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-graph@0.2.29-next.3
+  - @backstage/plugin-catalog-import@0.9.7-next.3
+  - @backstage/plugin-circleci@0.3.17-next.3
+  - @backstage/plugin-cloudbuild@0.3.17-next.3
+  - @backstage/plugin-code-coverage@0.2.10-next.3
+  - @backstage/plugin-cost-insights@0.12.6-next.3
+  - @backstage/plugin-dynatrace@4.0.0-next.3
+  - @backstage/plugin-entity-feedback@0.2.0-next.3
+  - @backstage/plugin-gcalendar@0.3.13-next.3
+  - @backstage/plugin-gcp-projects@0.3.36-next.3
+  - @backstage/plugin-github-actions@0.5.17-next.3
+  - @backstage/plugin-gocd@0.1.23-next.3
+  - @backstage/plugin-graphiql@0.2.49-next.3
+  - @backstage/plugin-home@0.4.33-next.3
+  - @backstage/plugin-jenkins@0.7.16-next.3
+  - @backstage/plugin-kafka@0.3.17-next.3
+  - @backstage/plugin-lighthouse@0.4.2-next.3
+  - @backstage/plugin-linguist@0.1.2-next.3
+  - @backstage/plugin-linguist-common@0.1.0
+  - @backstage/plugin-microsoft-calendar@0.1.2-next.3
+  - @backstage/plugin-newrelic@0.3.35-next.3
+  - @backstage/plugin-newrelic-dashboard@0.2.10-next.3
+  - @backstage/plugin-org@0.6.7-next.3
+  - @backstage/plugin-pagerduty@0.5.10-next.3
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist@0.1.8-next.3
+  - @backstage/plugin-rollbar@0.4.17-next.3
+  - @backstage/plugin-search@1.2.0-next.3
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-sentry@0.5.2-next.3
+  - @backstage/plugin-shortcuts@0.3.9-next.3
+  - @backstage/plugin-stack-overflow@0.1.13-next.3
+  - @backstage/plugin-stackstorm@0.1.1-next.3
+  - @backstage/plugin-tech-insights@0.3.9-next.3
+  - @backstage/plugin-tech-radar@0.6.3-next.3
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+  - @backstage/plugin-todo@0.2.19-next.3
+  - @backstage/plugin-user-settings@0.7.2-next.3
+  - @internal/plugin-catalog-customized@0.0.9-next.3
+
+## 0.2.82-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-circleci@0.3.17-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.12-next.2
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-scaffolder-react@1.3.0-next.2
+  - @backstage/plugin-scaffolder@1.13.0-next.2
+  - @backstage/plugin-code-coverage@0.2.10-next.2
+  - @backstage/plugin-cost-insights@0.12.6-next.2
+  - @backstage/plugin-playlist@0.1.8-next.2
+  - @backstage/plugin-search@1.2.0-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-airbrake@0.3.17-next.2
+  - @backstage/plugin-apache-airflow@0.2.10-next.2
+  - @backstage/plugin-api-docs@0.9.2-next.2
+  - @backstage/plugin-azure-devops@0.2.8-next.2
+  - @backstage/plugin-azure-sites@0.1.6-next.2
+  - @backstage/plugin-badges@0.2.41-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-graph@0.2.29-next.2
+  - @backstage/plugin-catalog-import@0.9.7-next.2
+  - @backstage/plugin-cloudbuild@0.3.17-next.2
+  - @backstage/plugin-dynatrace@3.0.1-next.2
+  - @backstage/plugin-entity-feedback@0.2.0-next.2
+  - @backstage/plugin-explore@0.4.2-next.2
+  - @backstage/plugin-gcalendar@0.3.13-next.2
+  - @backstage/plugin-gcp-projects@0.3.36-next.2
+  - @backstage/plugin-github-actions@0.5.17-next.2
+  - @backstage/plugin-gocd@0.1.23-next.2
+  - @backstage/plugin-graphiql@0.2.49-next.2
+  - @backstage/plugin-home@0.4.33-next.2
+  - @backstage/plugin-jenkins@0.7.16-next.2
+  - @backstage/plugin-kafka@0.3.17-next.2
+  - @backstage/plugin-kubernetes@0.7.10-next.2
+  - @backstage/plugin-lighthouse@0.4.2-next.2
+  - @backstage/plugin-linguist@0.1.2-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+  - @backstage/plugin-microsoft-calendar@0.1.2-next.2
+  - @backstage/plugin-newrelic@0.3.35-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.10-next.2
+  - @backstage/plugin-org@0.6.7-next.2
+  - @backstage/plugin-pagerduty@0.5.10-next.2
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-rollbar@0.4.17-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-sentry@0.5.2-next.2
+  - @backstage/plugin-shortcuts@0.3.9-next.2
+  - @backstage/plugin-stack-overflow@0.1.13-next.2
+  - @backstage/plugin-stackstorm@0.1.1-next.2
+  - @backstage/plugin-tech-insights@0.3.9-next.2
+  - @backstage/plugin-tech-radar@0.6.3-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+  - @backstage/plugin-todo@0.2.19-next.2
+  - @backstage/plugin-user-settings@0.7.2-next.2
+  - @internal/plugin-catalog-customized@0.0.9-next.2
+
 ## 0.2.82-next.1
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index d43dd4ac3a..8eedb5d219 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.82-next.1",
+  "version": "0.2.82-next.3",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -51,6 +51,7 @@
     "@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:^",
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index ea465e4ed8..19edd9640d 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -108,6 +108,7 @@ import { PlaylistIndexPage } from '@backstage/plugin-playlist';
 import { TwoColumnLayout } from './components/scaffolder/customScaffolderLayouts';
 import { ScoreBoardPage } from '@oriflame/backstage-plugin-score-card';
 import { StackstormPage } from '@backstage/plugin-stackstorm';
+import { PuppetDbPage } from '@backstage/plugin-puppetdb';
 
 const app = createApp({
   apis,
@@ -289,6 +290,7 @@ const routes = (
     <Route path="/playlist" element={<PlaylistIndexPage />} />
     <Route path="/score-board" element={<ScoreBoardPage />} />
     <Route path="/stackstorm" element={<StackstormPage />} />
+    <Route path="/puppetdb" element={<PuppetDbPage />} />
   </FlatRoutes>
 );
 
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index d07870194b..d2f6fbe109 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -116,6 +116,7 @@ import {
   EntityRollbarContent,
   isRollbarAvailable,
 } from '@backstage/plugin-rollbar';
+import { PuppetDbPage, isPuppetDbAvailable } from '@backstage/plugin-puppetdb';
 import { EntitySentryContent } from '@backstage/plugin-sentry';
 import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
 import { EntityTechInsightsScorecardCard } from '@backstage/plugin-tech-insights';
@@ -836,6 +837,35 @@ const domainPage = (
   </EntityLayoutWrapper>
 );
 
+const resourcePage = (
+  <EntityLayoutWrapper>
+    <EntityLayout.Route path="/" title="Overview">
+      <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
+        <Grid item md={6}>
+          <EntityAboutCard variant="gridItem" />
+        </Grid>
+        <Grid item md={6} xs={12}>
+          <EntityCatalogGraphCard variant="gridItem" height={400} />
+        </Grid>
+        <Grid item md={6}>
+          <EntityHasSystemsCard variant="gridItem" />
+        </Grid>
+      </Grid>
+    </EntityLayout.Route>
+    <EntityLayout.Route
+      path="/puppetdb"
+      title="Puppet"
+      if={isPuppetDbAvailable}
+    >
+      <PuppetDbPage />
+    </EntityLayout.Route>
+    <EntityLayout.Route path="/todos" title="TODOs">
+      <EntityTodoContent />
+    </EntityLayout.Route>
+  </EntityLayoutWrapper>
+);
+
 export const entityPage = (
   <EntitySwitch>
     <EntitySwitch.Case if={isKind('component')} children={componentPage} />
@@ -844,6 +874,7 @@ export const entityPage = (
     <EntitySwitch.Case if={isKind('user')} children={userPage} />
     <EntitySwitch.Case if={isKind('system')} children={systemPage} />
     <EntitySwitch.Case if={isKind('domain')} children={domainPage} />
+    <EntitySwitch.Case if={isKind('resource')} children={resourcePage} />
 
     <EntitySwitch.Case>{defaultEntityPage}</EntitySwitch.Case>
   </EntitySwitch>
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index 806a6e98b5..429a9ba824 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/backend-app-api
 
+## 0.4.2-next.2
+
+### Patch Changes
+
+- 5c7ce585824: Allow an additionalConfig to be provided to loadBackendConfig that fetches config values during runtime.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 5006884430..708b9769d5 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-app-api",
   "description": "Core API used by Backstage backend apps",
-  "version": "0.4.2-next.1",
+  "version": "0.4.2-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index 6b001cb651..cd363a7d83 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/backend-common
 
+## 0.18.4-next.2
+
+### Patch Changes
+
+- 5c7ce585824: Allow an additionalConfig to be provided to loadBackendConfig that fetches config values during runtime.
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-dev-utils@0.1.1
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/types@1.0.2
+
 ## 0.18.4-next.1
 
 ### Patch Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 4082089a08..aa902bea47 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.18.4-next.1",
+  "version": "0.18.4-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-common/src/reading/GithubUrlReader.test.ts b/packages/backend-common/src/reading/GithubUrlReader.test.ts
index 1ee25920f2..499f97d6ec 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.test.ts
@@ -30,7 +30,7 @@ import path from 'path';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import {
   GhBlobResponse,
-  GhBranchResponse,
+  GhCombinedCommitStatusResponse,
   GhRepoResponse,
   GhTreeResponse,
   GithubUrlReader,
@@ -309,12 +309,15 @@ describe('GithubUrlReader', () => {
         'https://ghe.github.com/api/v3/repos/backstage/mock/{archive_format}{/ref}',
     } as Partial<GhRepoResponse>;
 
-    const branchesApiResponse = {
-      name: 'main',
-      commit: {
-        sha: 'etag123abc',
-      },
-    } as Partial<GhBranchResponse>;
+    const commitStatusGithubResponse = {
+      sha: 'etag123abc',
+      repository: reposGithubApiResponse,
+    } as Partial<GhCombinedCommitStatusResponse>;
+
+    const commitStatusGheResponse = {
+      sha: 'etag123abc',
+      repository: reposGheApiResponse,
+    } as Partial<GhCombinedCommitStatusResponse>;
 
     beforeEach(() => {
       worker.use(
@@ -326,13 +329,18 @@ describe('GithubUrlReader', () => {
           ),
         ),
         rest.get(
-          'https://api.github.com/repos/backstage/mock/branches/main',
-          (_, res, ctx) =>
-            res(
-              ctx.status(200),
-              ctx.set('Content-Type', 'application/json'),
-              ctx.json(branchesApiResponse),
-            ),
+          'https://api.github.com/repos/backstage/mock/commits/main/status',
+          (req, res, ctx) => {
+            if (req.url.searchParams.get('per_page') === '0') {
+              return res(
+                ctx.status(200),
+                ctx.set('Content-Type', 'application/json'),
+                ctx.json(commitStatusGithubResponse),
+              );
+            }
+
+            return res(ctx.status(500));
+          },
         ),
         rest.get(
           'https://api.github.com/repos/backstage/mock/tarball/etag123abc',
@@ -348,7 +356,7 @@ describe('GithubUrlReader', () => {
             ),
         ),
         rest.get(
-          'https://api.github.com/repos/backstage/mock/branches/branchDoesNotExist',
+          'https://api.github.com/repos/backstage/mock/commits/branchDoesNotExist/status',
           (_, res, ctx) => res(ctx.status(404)),
         ),
         rest.get(
@@ -374,13 +382,18 @@ describe('GithubUrlReader', () => {
             ),
         ),
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/branches/main',
-          (_, res, ctx) =>
-            res(
-              ctx.status(200),
-              ctx.set('Content-Type', 'application/json'),
-              ctx.json(branchesApiResponse),
-            ),
+          'https://ghe.github.com/api/v3/repos/backstage/mock/commits/main/status',
+          (req, res, ctx) => {
+            if (req.url.searchParams.get('per_page') === '0') {
+              return res(
+                ctx.status(200),
+                ctx.set('Content-Type', 'application/json'),
+                ctx.json(commitStatusGheResponse),
+              );
+            }
+
+            return res(ctx.status(500));
+          },
         ),
       );
     });
@@ -684,36 +697,69 @@ describe('GithubUrlReader', () => {
       );
     });
 
-    // Branch details
+    // commit status for branch details
     beforeEach(() => {
-      const response = {
-        name: 'main',
-        commit: {
-          sha: 'etag123abc',
+      const githubResponse = {
+        sha: 'etag123abc',
+        repository: {
+          id: 123,
+          full_name: 'backstage/mock',
+          default_branch: 'main',
+          branches_url:
+            'https://api.github.com/repos/backstage/mock/branches{/branch}',
+          archive_url:
+            'https://api.github.com/repos/backstage/mock/{archive_format}{/ref}',
+          trees_url:
+            'https://api.github.com/repos/backstage/mock/git/trees{/sha}',
         },
-      } as Partial<GhBranchResponse>;
+      } as Partial<GhCombinedCommitStatusResponse>;
+
+      const gheResponse = {
+        sha: 'etag123abc',
+        repository: {
+          id: 123,
+          full_name: 'backstage/mock',
+          default_branch: 'main',
+          branches_url:
+            'https://ghe.github.com/api/v3/repos/backstage/mock/branches{/branch}',
+          archive_url:
+            'https://ghe.github.com/api/v3/repos/backstage/mock/{archive_format}{/ref}',
+          trees_url:
+            'https://ghe.github.com/api/v3/repos/backstage/mock/git/trees{/sha}',
+        },
+      } as Partial<GhCombinedCommitStatusResponse>;
 
       worker.use(
         rest.get(
-          'https://api.github.com/repos/backstage/mock/branches/main',
-          (_, res, ctx) =>
-            res(
-              ctx.status(200),
-              ctx.set('Content-Type', 'application/json'),
-              ctx.json(response),
-            ),
+          'https://api.github.com/repos/backstage/mock/commits/main/status',
+          (req, res, ctx) => {
+            if (req.url.searchParams.get('per_page') === '0') {
+              return res(
+                ctx.status(200),
+                ctx.set('Content-Type', 'application/json'),
+                ctx.json(githubResponse),
+              );
+            }
+
+            return res(ctx.status(500));
+          },
         ),
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/branches/main',
-          (_, res, ctx) =>
-            res(
-              ctx.status(200),
-              ctx.set('Content-Type', 'application/json'),
-              ctx.json(response),
-            ),
+          'https://ghe.github.com/api/v3/repos/backstage/mock/commits/main/status',
+          (req, res, ctx) => {
+            if (req.url.searchParams.get('per_page') === '0') {
+              return res(
+                ctx.status(200),
+                ctx.set('Content-Type', 'application/json'),
+                ctx.json(gheResponse),
+              );
+            }
+
+            return res(ctx.status(500));
+          },
         ),
         rest.get(
-          'https://api.github.com/repos/backstage/mock/branches/branchDoesNotExist',
+          'https://api.github.com/repos/backstage/mock/commits/branchDoesNotExist/status',
           (_, res, ctx) => res(ctx.status(404)),
         ),
       );
diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts
index ee781daf0b..8300127c5b 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.ts
@@ -20,6 +20,7 @@ import {
   GithubCredentialsProvider,
   GithubIntegration,
   ScmIntegrations,
+  GithubCredentials,
 } from '@backstage/integration';
 import { RestEndpointMethodTypes } from '@octokit/rest';
 import fetch, { RequestInit, Response } from 'node-fetch';
@@ -44,8 +45,8 @@ import { parseLastModified } from './util';
 
 export type GhRepoResponse =
   RestEndpointMethodTypes['repos']['get']['response']['data'];
-export type GhBranchResponse =
-  RestEndpointMethodTypes['repos']['getBranch']['response']['data'];
+export type GhCombinedCommitStatusResponse =
+  RestEndpointMethodTypes['repos']['getCombinedStatusForRef']['response']['data'];
 export type GhTreeResponse =
   RestEndpointMethodTypes['git']['getTree']['response']['data'];
 export type GhBlobResponse =
@@ -163,7 +164,7 @@ export class GithubUrlReader implements UrlReader {
     options?: ReadTreeOptions,
   ): Promise<ReadTreeResponse> {
     const repoDetails = await this.getRepoDetails(url);
-    const commitSha = repoDetails.branch.commit.sha!;
+    const commitSha = repoDetails.commitSha;
 
     if (options?.etag && options.etag === commitSha) {
       throw new NotModifiedError();
@@ -191,7 +192,7 @@ export class GithubUrlReader implements UrlReader {
 
   async search(url: string, options?: SearchOptions): Promise<SearchResponse> {
     const repoDetails = await this.getRepoDetails(url);
-    const commitSha = repoDetails.branch.commit.sha!;
+    const commitSha = repoDetails.commitSha;
 
     if (options?.etag && options.etag === commitSha) {
       throw new NotModifiedError();
@@ -302,32 +303,43 @@ export class GithubUrlReader implements UrlReader {
   }
 
   private async getRepoDetails(url: string): Promise<{
-    repo: GhRepoResponse;
-    branch: GhBranchResponse;
+    commitSha: string;
+    repo: {
+      archive_url: string;
+      trees_url: string;
+    };
   }> {
     const parsed = parseGitUrl(url);
     const { ref, full_name } = parsed;
 
-    // Caveat: The ref will totally be incorrect if the branch name includes a
-    // slash. Thus, some operations can not work on URLs containing branch
-    // names that have a slash in them.
-
-    const { headers } = await this.deps.credentialsProvider.getCredentials({
+    const credentials = await this.deps.credentialsProvider.getCredentials({
       url,
     });
+    const { headers } = credentials;
 
+    const commitStatus: GhCombinedCommitStatusResponse = await this.fetchJson(
+      `${this.integration.config.apiBaseUrl}/repos/${full_name}/commits/${
+        ref || (await this.getDefaultBranch(full_name, credentials))
+      }/status?per_page=0`,
+      { headers },
+    );
+
+    return {
+      commitSha: commitStatus.sha,
+      repo: commitStatus.repository,
+    };
+  }
+
+  private async getDefaultBranch(
+    repoFullName: string,
+    credentials: GithubCredentials,
+  ): Promise<string> {
     const repo: GhRepoResponse = await this.fetchJson(
-      `${this.integration.config.apiBaseUrl}/repos/${full_name}`,
-      { headers },
+      `${this.integration.config.apiBaseUrl}/repos/${repoFullName}`,
+      { headers: credentials.headers },
     );
 
-    // branches_url looks like "https://api.github.com/repos/owner/repo/branches{/branch}"
-    const branch: GhBranchResponse = await this.fetchJson(
-      repo.branches_url.replace('{/branch}', `/${ref || repo.default_branch}`),
-      { headers },
-    );
-
-    return { repo, branch };
+    return repo.default_branch;
   }
 
   private async fetchResponse(
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index 889c09ada3..2b2fa0a062 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/backend-defaults
 
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+
 ## 0.1.9-next.1
 
 ### Patch Changes
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index e2d2e6f7e2..3fb8420ca6 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-defaults",
   "description": "Backend defaults used by Backstage backend apps",
-  "version": "0.1.9-next.1",
+  "version": "0.1.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-next/CHANGELOG.md b/packages/backend-next/CHANGELOG.md
index 783b3165e5..bb2599b189 100644
--- a/packages/backend-next/CHANGELOG.md
+++ b/packages/backend-next/CHANGELOG.md
@@ -1,5 +1,49 @@
 # example-backend-next
 
+## 0.0.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.3
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-defaults@0.1.9-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.2
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.3
+  - @backstage/plugin-todo-backend@0.1.41-next.3
+
+## 0.0.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/backend-defaults@0.1.9-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.1
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.2
+  - @backstage/plugin-todo-backend@0.1.41-next.2
+
 ## 0.0.10-next.1
 
 ### Patch Changes
diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json
index 2fccf12a85..f8b1e4138f 100644
--- a/packages/backend-next/package.json
+++ b/packages/backend-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-next",
-  "version": "0.0.10-next.1",
+  "version": "0.0.10-next.3",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,8 +27,12 @@
   "dependencies": {
     "@backstage/backend-defaults": "workspace:^",
     "@backstage/plugin-app-backend": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-catalog-backend": "workspace:^",
     "@backstage/plugin-kubernetes-backend": "workspace:^",
+    "@backstage/plugin-permission-backend": "workspace:^",
+    "@backstage/plugin-permission-common": "workspace:^",
+    "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-scaffolder-backend": "workspace:^",
     "@backstage/plugin-search-backend": "workspace:^",
     "@backstage/plugin-search-backend-module-catalog": "workspace:^",
diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts
index 1ce63a8d51..1c4380f4a0 100644
--- a/packages/backend-next/src/index.ts
+++ b/packages/backend-next/src/index.ts
@@ -16,15 +16,20 @@
 
 import { createBackend } from '@backstage/backend-defaults';
 import { appPlugin } from '@backstage/plugin-app-backend/alpha';
-import { todoPlugin } from '@backstage/plugin-todo-backend';
-import { techdocsPlugin } from '@backstage/plugin-techdocs-backend/alpha';
 import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
-import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend/alpha';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleCatalogCollator } from '@backstage/plugin-search-backend-module-catalog/alpha';
-import { searchModuleTechDocsCollator } from '@backstage/plugin-search-backend-module-techdocs/alpha';
-import { searchModuleExploreCollator } from '@backstage/plugin-search-backend-module-explore/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';
 
 const backend = createBackend();
 
@@ -40,6 +45,8 @@ backend.add(techdocsPlugin());
 backend.add(catalogPlugin());
 backend.add(catalogModuleTemplateKind());
 
+backend.add(scaffolderPlugin());
+
 // Search
 backend.add(searchPlugin());
 backend.add(searchModuleCatalogCollator());
@@ -48,4 +55,9 @@ backend.add(searchModuleExploreCollator());
 
 // Kubernetes
 backend.add(kubernetesPlugin());
+
+// Permissions
+backend.add(permissionPlugin());
+backend.add(permissionModuleAllowAllPolicy());
+
 backend.start();
diff --git a/packages/backend-openapi-utils/.eslintrc.js b/packages/backend-openapi-utils/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/backend-openapi-utils/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/backend-openapi-utils/CHANGELOG.md b/packages/backend-openapi-utils/CHANGELOG.md
new file mode 100644
index 0000000000..9887ddf8d5
--- /dev/null
+++ b/packages/backend-openapi-utils/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @backstage/backend-openapi-utils
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- 62fe726fdc5: New plugin! Primary focus is to support types on `Router`s in backend packages. Developers can use the `ApiRouter` from this package in their packages to support a typed experience based on their OpenAPI specs. The `ApiRouter` supports request bodies, response bodies, query parameters and path parameters, as well as full path-based context of the above. This means no more guessing on an endpoint like `req.post('/not-my-route', (req, res)=>{res.send(req.body.badparam)})`. Typescript would catch `/not-my-route`, `req.body.badparam`, `res.send(req.body.badparam)`.
diff --git a/packages/backend-openapi-utils/README.md b/packages/backend-openapi-utils/README.md
new file mode 100644
index 0000000000..51455ccccb
--- /dev/null
+++ b/packages/backend-openapi-utils/README.md
@@ -0,0 +1,45 @@
+# @backstage/openapi-utils
+
+## Summary
+
+This package is meant to provide a typed Express router for an OpenAPI spec. Based on the [`oatx`](https://github.com/varanauskas/oatx) library and adapted to override Express values.
+
+## Getting Started
+
+### Configuration
+
+1. Run `yarn --cwd <package-dir> backstage-cli package schema:openapi:generate` to translate your `src/schema/openapi.yaml` to a new Typescript file in `src/schema/openapi.ts`. In the case of projects that require linting + a license header, you will need to do this manually.
+
+2. In your plugin's `src/service/createRouter.ts`,
+
+```ts
+import {ApiRouter} from `@backstage/backend-openapi-utils`;
+import spec from '../schema/openapi'
+...
+
+export function createRouter(){
+    const router = Router() as ApiRouter<typeof spec>;
+    ...
+}
+```
+
+### Limitations
+
+1. `as const` makes all fields `readonly`
+   To ensure a good DX of using a simple imported JSON spec, we want to remove any type issues between `readonly` arrays and mutable arrays. Typescript does not allow them to be compared, so converting all imports from the `openapi3-ts` library to `readonly` is important. This is achieved through the `ImmutableObject` type in `types/immutable.ts`.
+
+```ts
+...
+// We want an interface like this,
+Router() as ApiRouter<typeof spec>
+
+// Not an interface like this,
+Router() as ApiRouter<DeepWriteable<typeof spec>>
+...
+```
+
+## Future Work
+
+### Runtime validation
+
+Using a package like [`express-openapi-validator`](https://www.npmjs.com/package/express-openapi-validator), would allow us to remove [validation of request bodies with `AJV`](https://github.com/backstage/backstage/blob/master/plugins/catalog-backend/src/service/util.ts#L58). However, `AJV` currently doesn't have support for OpenAPI 3.1 and `express-openapi-validator` enforces full URL matching for paths, meaning it cannot be mounted at the router level.
diff --git a/packages/backend-openapi-utils/api-report.md b/packages/backend-openapi-utils/api-report.md
new file mode 100644
index 0000000000..180a7846ed
--- /dev/null
+++ b/packages/backend-openapi-utils/api-report.md
@@ -0,0 +1,644 @@
+## API Report File for "@backstage/backend-openapi-utils"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import type { ContentObject } from 'openapi3-ts';
+import type core from 'express-serve-static-core';
+import { FromSchema } from 'json-schema-to-ts';
+import { JSONSchema7 } from 'json-schema-to-ts';
+import type { OpenAPIObject } from 'openapi3-ts';
+import type { ParameterObject } from 'openapi3-ts';
+import type { ReferenceObject } from 'openapi3-ts';
+import type { RequestBodyObject } from 'openapi3-ts';
+import type { ResponseObject } from 'openapi3-ts';
+import { Router } from 'express';
+import type { SchemaObject } from 'openapi3-ts';
+
+// @public
+export interface ApiRouter<Doc extends RequiredDoc> extends Router {
+  // (undocumented)
+  all: DocRequestMatcher<Doc, this, 'all'>;
+  // (undocumented)
+  delete: DocRequestMatcher<Doc, this, 'delete'>;
+  // (undocumented)
+  get: DocRequestMatcher<Doc, this, 'get'>;
+  // (undocumented)
+  head: DocRequestMatcher<Doc, this, 'head'>;
+  // (undocumented)
+  options: DocRequestMatcher<Doc, this, 'options'>;
+  // (undocumented)
+  patch: DocRequestMatcher<Doc, this, 'patch'>;
+  // (undocumented)
+  post: DocRequestMatcher<Doc, this, 'post'>;
+  // (undocumented)
+  put: DocRequestMatcher<Doc, this, 'put'>;
+}
+
+// @public (undocumented)
+type ComponentRef<
+  Doc extends RequiredDoc,
+  Type extends ComponentTypes<Doc>,
+  Ref extends ImmutableReferenceObject,
+> = Ref extends {
+  $ref: `#/components/${Type}/${infer Name}`;
+}
+  ? Name extends keyof Doc['components'][Type]
+    ? Doc['components'][Type][Name] extends ImmutableReferenceObject
+      ? ComponentRef<Doc, Type, Doc['components'][Type][Name]>
+      : Doc['components'][Type][Name]
+    : never
+  : never;
+
+// @public (undocumented)
+type ComponentTypes<Doc extends RequiredDoc> = Extract<
+  keyof Doc['components'],
+  string
+>;
+
+// @public (undocumented)
+type ConvertAll<T, R extends ReadonlyArray<unknown> = []> = T extends [
+  infer First extends JSONSchema7,
+  ...infer Rest,
+]
+  ? ConvertAll<Rest, [...R, FromSchema<First>]>
+  : R;
+
+// @public (undocumented)
+interface CookieObject extends ParameterObject {
+  // (undocumented)
+  in: 'cookie';
+  // (undocumented)
+  style?: 'form';
+}
+
+// @public (undocumented)
+type CookieSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableCookieObject>;
+
+// @public (undocumented)
+type DiscriminateUnion<T, K extends keyof T, V extends T[K]> = Extract<
+  T,
+  Record<K, V>
+>;
+
+// @public (undocumented)
+type DocOperation<
+  Doc extends RequiredDoc,
+  Path extends keyof Doc['paths'],
+  Method extends keyof Doc['paths'][Path],
+> = Doc['paths'][Path][Method];
+
+// @public (undocumented)
+type DocParameter<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+  Parameter extends keyof Doc['paths'][Path][Method]['parameters'],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['parameters'][Parameter] extends ImmutableReferenceObject
+  ? 'parameters' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'parameters',
+        DocOperation<Doc, Path, Method>['parameters'][Parameter]
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['parameters'][Parameter];
+
+// @public (undocumented)
+type DocParameters<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+> = DocOperation<Doc, Path, Method>['parameters'] extends ReadonlyArray<any>
+  ? {
+      [Index in keyof DocOperation<
+        Doc,
+        Path,
+        Method
+      >['parameters']]: DocParameter<Doc, Path, Method, Index>;
+    }
+  : never;
+
+// @public
+type DocPath<
+  Doc extends PathDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+> = ValueOf<{
+  [Template in Extract<
+    keyof Doc['paths'],
+    string
+  >]: Path extends PathTemplate<Template> ? Template : never;
+}>;
+
+// @public (undocumented)
+type DocPathMethod<
+  Doc extends Pick<RequiredDoc, 'paths'>,
+  Path extends DocPathTemplate<Doc>,
+> = keyof Doc['paths'][DocPath<Doc, Path>];
+
+// @public (undocumented)
+type DocPathTemplate<Doc extends PathDoc> = PathTemplate<
+  Extract<keyof Doc['paths'], string>
+>;
+
+// @public
+type DocRequestHandler<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends keyof Doc['paths'][Path],
+> = core.RequestHandler<
+  PathSchema<Doc, Path, Method>,
+  ResponseBodyToJsonSchema<Doc, Path, Method>,
+  RequestBodyToJsonSchema<Doc, Path, Method>,
+  QuerySchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+type DocRequestHandlerParams<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends keyof Doc['paths'][Path],
+> = core.RequestHandlerParams<
+  PathSchema<Doc, Path, Method>,
+  ResponseBodyToJsonSchema<Doc, Path, Method>,
+  RequestBodyToJsonSchema<Doc, Path, Method>,
+  QuerySchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+interface DocRequestMatcher<
+  Doc extends RequiredDoc,
+  T,
+  Method extends
+    | 'all'
+    | 'get'
+    | 'post'
+    | 'put'
+    | 'delete'
+    | 'patch'
+    | 'options'
+    | 'head',
+> {
+  // (undocumented)
+  <Path extends MethodAwareDocPath<Doc, DocPathTemplate<Doc>, Method>>(
+    path: Path,
+    ...handlers: Array<DocRequestHandler<Doc, Path, Method>>
+  ): T;
+  // (undocumented)
+  <Path extends MethodAwareDocPath<Doc, DocPathTemplate<Doc>, Method>>(
+    path: Path,
+    ...handlers: Array<DocRequestHandlerParams<Doc, Path, Method>>
+  ): T;
+}
+
+// @public (undocumented)
+type Filter<T, U> = T extends U ? T : never;
+
+// @public (undocumented)
+type FullMap<
+  T extends {
+    [key: string]: any;
+  },
+> = RequiredMap<T> & OptionalMap<T>;
+
+// @public (undocumented)
+interface HeaderObject extends ParameterObject {
+  // (undocumented)
+  in: 'header';
+  // (undocumented)
+  style: 'simple';
+}
+
+// @public (undocumented)
+type HeaderSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableHeaderObject>;
+
+// @public
+type Immutable<T> = T extends
+  | Function
+  | boolean
+  | number
+  | string
+  | null
+  | undefined
+  ? T
+  : T extends Map<infer K, infer V>
+  ? ReadonlyMap<Immutable<K>, Immutable<V>>
+  : T extends Set<infer S>
+  ? ReadonlySet<Immutable<S>>
+  : {
+      readonly [P in keyof T]: Immutable<T[P]>;
+    };
+
+// @public (undocumented)
+type ImmutableContentObject = ImmutableObject<ContentObject>;
+
+// @public (undocumented)
+type ImmutableCookieObject = ImmutableObject<CookieObject>;
+
+// @public (undocumented)
+type ImmutableHeaderObject = ImmutableObject<HeaderObject>;
+
+// @public (undocumented)
+type ImmutableObject<T> = {
+  readonly [K in keyof T]: Immutable<T[K]>;
+};
+
+// @public (undocumented)
+type ImmutableOpenAPIObject = ImmutableObject<OpenAPIObject>;
+
+// @public (undocumented)
+type ImmutableParameterObject = ImmutableObject<ParameterObject>;
+
+// @public (undocumented)
+type ImmutablePathObject = ImmutableObject<PathObject>;
+
+// @public (undocumented)
+type ImmutableQueryObject = ImmutableObject<QueryObject>;
+
+// @public (undocumented)
+type ImmutableReferenceObject = ImmutableObject<ReferenceObject>;
+
+// @public (undocumented)
+type ImmutableRequestBodyObject = ImmutableObject<RequestBodyObject>;
+
+// @public (undocumented)
+type ImmutableResponseObject = ImmutableObject<ResponseObject>;
+
+// @public (undocumented)
+type ImmutableSchemaObject = ImmutableObject<SchemaObject>;
+
+declare namespace internal {
+  export {
+    RequiredDoc,
+    PathDoc,
+    ValueOf,
+    PathTemplate,
+    DocPath,
+    DocPathTemplate,
+    DocPathMethod,
+    MethodAwareDocPath,
+    DocOperation,
+    ComponentTypes,
+    ComponentRef,
+    SchemaRef,
+    ObjectWithContentSchema,
+    UnionToIntersection,
+    LastOf,
+    Push,
+    TuplifyUnion,
+    ConvertAll,
+    UnknownIfNever,
+    ToTypeSafe,
+    DiscriminateUnion,
+    MapDiscriminatedUnion,
+    PickOptionalKeys,
+    PickRequiredKeys,
+    OptionalMap,
+    RequiredMap,
+    FullMap,
+    Filter,
+    DocRequestHandler,
+    DocRequestHandlerParams,
+    DocRequestMatcher,
+    Immutable,
+    ImmutableObject,
+    ImmutableReferenceObject,
+    ImmutableOpenAPIObject,
+    ImmutableContentObject,
+    ImmutableRequestBodyObject,
+    ImmutableResponseObject,
+    ImmutableParameterObject,
+    HeaderObject,
+    ImmutableHeaderObject,
+    CookieObject,
+    ImmutableCookieObject,
+    QueryObject,
+    ImmutableQueryObject,
+    PathObject,
+    ImmutablePathObject,
+    ImmutableSchemaObject,
+    DocParameter,
+    DocParameters,
+    ResolveDocParameterSchema,
+    ParameterSchema,
+    MapToSchema,
+    ParametersSchema,
+    HeaderSchema,
+    CookieSchema,
+    PathSchema,
+    QuerySchema,
+    RequestBody,
+    RequestBodySchema,
+    RequestBodyToJsonSchema,
+    Response_2 as Response,
+    ResponseSchemas,
+    ResponseBodyToJsonSchema,
+  };
+}
+export { internal };
+
+// @public (undocumented)
+type LastOf<T> = UnionToIntersection<
+  T extends any ? () => T : never
+> extends () => infer R
+  ? R
+  : never;
+
+// @public (undocumented)
+type MapDiscriminatedUnion<T extends Record<K, string>, K extends keyof T> = {
+  [V in T[K]]: DiscriminateUnion<T, K, V>;
+};
+
+// @public (undocumented)
+type MapToSchema<
+  Doc extends RequiredDoc,
+  T extends Record<string, ImmutableParameterObject>,
+> = {
+  [V in keyof T]: NonNullable<T[V]> extends ImmutableParameterObject
+    ? ParameterSchema<Doc, NonNullable<T[V]>['schema']>
+    : never;
+};
+
+// @public (undocumented)
+type MethodAwareDocPath<
+  Doc extends PathDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends keyof Doc['paths'][Path],
+> = ValueOf<{
+  [Template in Extract<
+    keyof Doc['paths'],
+    string
+  >]: Path extends PathTemplate<Template>
+    ? Method extends DocPathMethod<Doc, Path>
+      ? PathTemplate<Template>
+      : never
+    : never;
+}>;
+
+// @public (undocumented)
+type ObjectWithContentSchema<
+  Doc extends RequiredDoc,
+  Object extends {
+    content?: ImmutableContentObject;
+  },
+> = Object['content'] extends ImmutableContentObject
+  ? SchemaRef<Doc, Object['content']['application/json']['schema']>
+  : never;
+
+// @public (undocumented)
+type OptionalMap<
+  T extends {
+    [key: string]: any;
+  },
+> = {
+  [P in Exclude<PickOptionalKeys<T>, undefined>]?: NonNullable<T[P]>;
+};
+
+// @public (undocumented)
+type ParameterSchema<
+  Doc extends RequiredDoc,
+  Schema extends ImmutableParameterObject['schema'],
+> = ResolveDocParameterSchema<Doc, Schema> extends infer R
+  ? R extends ImmutableSchemaObject
+    ? R extends JSONSchema7
+      ? FromSchema<R>
+      : never
+    : never
+  : never;
+
+// @public (undocumented)
+type ParametersSchema<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+  FilterType extends ImmutableParameterObject,
+> = number extends keyof DocParameters<Doc, Path, Method>
+  ? MapToSchema<
+      Doc,
+      FullMap<
+        MapDiscriminatedUnion<
+          Filter<DocParameters<Doc, Path, Method>[number], FilterType>,
+          'name'
+        >
+      >
+    >
+  : never;
+
+// @public (undocumented)
+type PathDoc = Pick<ImmutableOpenAPIObject, 'paths'>;
+
+// @public (undocumented)
+interface PathObject extends ParameterObject {
+  // (undocumented)
+  in: 'path';
+  // (undocumented)
+  style?: 'simple' | 'label' | 'matrix';
+}
+
+// @public (undocumented)
+type PathSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutablePathObject>;
+
+// @public
+type PathTemplate<Path extends string> =
+  Path extends `${infer Prefix}{${infer PathName}}${infer Suffix}`
+    ? `${Prefix}:${PathName}${PathTemplate<Suffix>}`
+    : Path;
+
+// @public (undocumented)
+type PickOptionalKeys<
+  T extends {
+    [key: string]: any;
+  },
+> = {
+  [K in keyof T]: true extends T[K]['required'] ? never : K;
+}[keyof T];
+
+// @public (undocumented)
+type PickRequiredKeys<
+  T extends {
+    [key: string]: any;
+  },
+> = {
+  [K in keyof T]: true extends T[K]['required'] ? K : never;
+}[keyof T];
+
+// @public (undocumented)
+type Push<T extends any[], V> = [...T, V];
+
+// @public (undocumented)
+interface QueryObject extends ParameterObject {
+  // (undocumented)
+  in: 'query';
+  // (undocumented)
+  style?: 'form' | 'deepObject' | 'pipeDelimited' | 'spaceDelimited';
+}
+
+// @public (undocumented)
+type QuerySchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableQueryObject>;
+
+// @public (undocumented)
+type RequestBody<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['requestBody'] extends ImmutableReferenceObject
+  ? 'requestBodies' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'requestBodies',
+        DocOperation<Doc, Path, Method>['requestBody']
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['requestBody'];
+
+// @public (undocumented)
+type RequestBodySchema<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends DocPathMethod<Doc, Path>,
+> = RequestBody<
+  Doc,
+  DocPath<Doc, Path>,
+  Method
+> extends ImmutableRequestBodyObject
+  ? ObjectWithContentSchema<Doc, RequestBody<Doc, DocPath<Doc, Path>, Method>>
+  : never;
+
+// @public
+type RequestBodyToJsonSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ToTypeSafe<RequestBodySchema<Doc, Path, Method>>;
+
+// @public
+type RequiredDoc = Pick<ImmutableOpenAPIObject, 'paths' | 'components'>;
+
+// @public (undocumented)
+type RequiredMap<
+  T extends {
+    [key: string]: any;
+  },
+> = {
+  [P in Exclude<PickRequiredKeys<T>, undefined>]: NonNullable<T[P]>;
+};
+
+// @public (undocumented)
+type ResolveDocParameterSchema<
+  Doc extends RequiredDoc,
+  Schema extends ImmutableParameterObject['schema'],
+> = Schema extends ImmutableReferenceObject
+  ? 'parameters' extends ComponentTypes<Doc>
+    ? ComponentRef<Doc, 'parameters', Schema>
+    : never
+  : Schema;
+
+// @public (undocumented)
+type Response_2<
+  Doc extends RequiredDoc,
+  Path extends keyof Doc['paths'],
+  Method extends keyof Doc['paths'][Path],
+  StatusCode extends keyof DocOperation<Doc, Path, Method>['responses'],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['responses'][StatusCode] extends ImmutableReferenceObject
+  ? 'responses' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'responses',
+        DocOperation<Doc, Path, Method>['responses'][StatusCode]
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['responses'][StatusCode];
+
+// @public
+type ResponseBodyToJsonSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ToTypeSafe<ValueOf<ResponseSchemas<Doc, Path, Method>>>;
+
+// @public (undocumented)
+type ResponseSchemas<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends DocPathMethod<Doc, Path>,
+> = {
+  [StatusCode in keyof DocOperation<
+    Doc,
+    Path,
+    Method
+  >['responses']]: Response_2<
+    Doc,
+    Path,
+    Method,
+    StatusCode
+  > extends ImmutableResponseObject
+    ? ObjectWithContentSchema<Doc, Response_2<Doc, Path, Method, StatusCode>>
+    : never;
+};
+
+// @public (undocumented)
+type SchemaRef<Doc extends RequiredDoc, Schema> = Schema extends {
+  $ref: `#/components/schemas/${infer Name}`;
+}
+  ? 'schemas' extends keyof Doc['components']
+    ? Name extends keyof Doc['components']['schemas']
+      ? SchemaRef<Doc, Doc['components']['schemas'][Name]>
+      : never
+    : never
+  : {
+      [Key in keyof Schema]: SchemaRef<Doc, Schema[Key]>;
+    };
+
+// @public (undocumented)
+type ToTypeSafe<T> = UnknownIfNever<ConvertAll<TuplifyUnion<T>>[number]>;
+
+// @public (undocumented)
+type TuplifyUnion<
+  T,
+  L = LastOf<T>,
+  N = [T] extends [never] ? true : false,
+> = true extends N ? [] : Push<TuplifyUnion<Exclude<T, L>>, L>;
+
+// @public
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+  k: infer I,
+) => void
+  ? I
+  : never;
+
+// @public (undocumented)
+type UnknownIfNever<P> = [P] extends [never] ? unknown : P;
+
+// @public
+type ValueOf<T> = T[keyof T];
+```
diff --git a/packages/backend-openapi-utils/package.json b/packages/backend-openapi-utils/package.json
new file mode 100644
index 0000000000..0e2e707083
--- /dev/null
+++ b/packages/backend-openapi-utils/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@backstage/backend-openapi-utils",
+  "description": "OpenAPI typescript support.",
+  "version": "0.0.1-next.0",
+  "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"
+  },
+  "backstage": {
+    "role": "node-library"
+  },
+  "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:^"
+  },
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "@types/express": "^4.17.6",
+    "@types/express-serve-static-core": "^4.17.5",
+    "express": "^4.17.1",
+    "express-promise-router": "^4.1.0",
+    "json-schema-to-ts": "^2.6.2",
+    "openapi3-ts": "^3.1.2"
+  }
+}
diff --git a/packages/backend-openapi-utils/src/index.ts b/packages/backend-openapi-utils/src/index.ts
new file mode 100644
index 0000000000..f8fdcff16b
--- /dev/null
+++ b/packages/backend-openapi-utils/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.
+ */
+
+/**
+ * Common functionalities for the openapi-router plugin.
+ *
+ * @packageDocumentation
+ */
+import * as internal from './types';
+
+export { internal };
+export type { ApiRouter } from './router';
diff --git a/packages/backend-openapi-utils/src/router.ts b/packages/backend-openapi-utils/src/router.ts
new file mode 100644
index 0000000000..253fc1596e
--- /dev/null
+++ b/packages/backend-openapi-utils/src/router.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 { Router } from 'express';
+import { DocRequestMatcher, RequiredDoc } from './types';
+
+/**
+ * Typed Express router based on an OpenAPI 3.1 spec.
+ * @public
+ */
+export interface ApiRouter<Doc extends RequiredDoc> extends Router {
+  get: DocRequestMatcher<Doc, this, 'get'>;
+
+  post: DocRequestMatcher<Doc, this, 'post'>;
+
+  all: DocRequestMatcher<Doc, this, 'all'>;
+
+  put: DocRequestMatcher<Doc, this, 'put'>;
+
+  delete: DocRequestMatcher<Doc, this, 'delete'>;
+
+  patch: DocRequestMatcher<Doc, this, 'patch'>;
+
+  options: DocRequestMatcher<Doc, this, 'options'>;
+
+  head: DocRequestMatcher<Doc, this, 'head'>;
+}
diff --git a/packages/backend-openapi-utils/src/setupTests.ts b/packages/backend-openapi-utils/src/setupTests.ts
new file mode 100644
index 0000000000..4b9026cde5
--- /dev/null
+++ b/packages/backend-openapi-utils/src/setupTests.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 {};
diff --git a/packages/backend-openapi-utils/src/types/common.ts b/packages/backend-openapi-utils/src/types/common.ts
new file mode 100644
index 0000000000..5568ed795c
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/common.ts
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Pulled from https://github.com/varanauskas/oatx.
+ */
+
+import { FromSchema, JSONSchema7 } from 'json-schema-to-ts';
+import {
+  ImmutableContentObject,
+  ImmutableOpenAPIObject,
+  ImmutableReferenceObject,
+} from './immutable';
+
+/**
+ * Basic OpenAPI spec with paths and components properties enforced.
+ * @public
+ */
+export type RequiredDoc = Pick<ImmutableOpenAPIObject, 'paths' | 'components'>;
+
+/**
+ * @public
+ */
+export type PathDoc = Pick<ImmutableOpenAPIObject, 'paths'>;
+
+/**
+ * Get value types of `T`.
+ * @public
+ */
+export type ValueOf<T> = T[keyof T];
+
+/**
+ * Validate a string against OpenAPI path template, {@link https://spec.openapis.org/oas/v3.1.0#path-templating-matching}.
+ *
+ * @example
+ * ```ts
+ * const path: PathTemplate<"/posts/{postId}/comments/{commentId}"> = "/posts/:postId/comments/:commentId";
+ * const pathWithoutParams: PathTemplate<"/posts/comments"> = "/posts/comments";
+ * ```
+ *
+ * @public
+ */
+export type PathTemplate<Path extends string> =
+  Path extends `${infer Prefix}{${infer PathName}}${infer Suffix}`
+    ? `${Prefix}:${PathName}${PathTemplate<Suffix>}`
+    : Path;
+
+/**
+ * Extract path as specified in OpenAPI `Doc` based on request path
+ * @example
+ * ```ts
+ * const spec = {
+ *   paths: {
+ *       "/posts/{postId}/comments/{commentId}": {},
+ *       "/posts/comments": {},
+ *   }
+ * };
+ * const specPathWithParams: DocPath<typeof spec, "/posts/:postId/comments/:commentId"> = "/posts/{postId}/comments/{commentId}";
+ * const specPathWithoutParams: DocPath<typeof spec, "/posts/comments"> = "/posts/comments";
+ * ```
+ *
+ * @public
+ */
+export type DocPath<
+  Doc extends PathDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+> = ValueOf<{
+  [Template in Extract<
+    keyof Doc['paths'],
+    string
+  >]: Path extends PathTemplate<Template> ? Template : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocPathTemplate<Doc extends PathDoc> = PathTemplate<
+  Extract<keyof Doc['paths'], string>
+>;
+
+/**
+ * @public
+ */
+export type DocPathMethod<
+  Doc extends Pick<RequiredDoc, 'paths'>,
+  Path extends DocPathTemplate<Doc>,
+> = keyof Doc['paths'][DocPath<Doc, Path>];
+
+/**
+ * @public
+ */
+export type MethodAwareDocPath<
+  Doc extends PathDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends keyof Doc['paths'][Path],
+> = ValueOf<{
+  [Template in Extract<
+    keyof Doc['paths'],
+    string
+  >]: Path extends PathTemplate<Template>
+    ? Method extends DocPathMethod<Doc, Path>
+      ? PathTemplate<Template>
+      : never
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocOperation<
+  Doc extends RequiredDoc,
+  Path extends keyof Doc['paths'],
+  Method extends keyof Doc['paths'][Path],
+> = Doc['paths'][Path][Method];
+
+/**
+ * @public
+ */
+export type ComponentTypes<Doc extends RequiredDoc> = Extract<
+  keyof Doc['components'],
+  string
+>;
+
+/**
+ * @public
+ */
+export type ComponentRef<
+  Doc extends RequiredDoc,
+  Type extends ComponentTypes<Doc>,
+  Ref extends ImmutableReferenceObject,
+> = Ref extends { $ref: `#/components/${Type}/${infer Name}` }
+  ? Name extends keyof Doc['components'][Type]
+    ? Doc['components'][Type][Name] extends ImmutableReferenceObject
+      ? ComponentRef<Doc, Type, Doc['components'][Type][Name]>
+      : Doc['components'][Type][Name]
+    : never
+  : never;
+
+/**
+ * @public
+ */
+export type SchemaRef<Doc extends RequiredDoc, Schema> = Schema extends {
+  $ref: `#/components/schemas/${infer Name}`;
+}
+  ? 'schemas' extends keyof Doc['components']
+    ? Name extends keyof Doc['components']['schemas']
+      ? SchemaRef<Doc, Doc['components']['schemas'][Name]>
+      : never
+    : never
+  : { [Key in keyof Schema]: SchemaRef<Doc, Schema[Key]> };
+
+/**
+ * @public
+ */
+export type ObjectWithContentSchema<
+  Doc extends RequiredDoc,
+  Object extends { content?: ImmutableContentObject },
+> = Object['content'] extends ImmutableContentObject
+  ? SchemaRef<Doc, Object['content']['application/json']['schema']>
+  : never;
+
+/**
+ * From {@link https://stackoverflow.com/questions/71393738/typescript-intersection-not-union-type-from-json-schema}
+ *
+ * StackOverflow says not to do this, but union types aren't possible any other way.
+ *
+ * @public
+ */
+export type UnionToIntersection<U> = (
+  U extends any ? (k: U) => void : never
+) extends (k: infer I) => void
+  ? I
+  : never;
+
+/**
+ * @public
+ */
+export type LastOf<T> = UnionToIntersection<
+  T extends any ? () => T : never
+> extends () => infer R
+  ? R
+  : never;
+
+/**
+ * @public
+ */
+export type Push<T extends any[], V> = [...T, V];
+
+/**
+ * @public
+ */
+export type TuplifyUnion<
+  T,
+  L = LastOf<T>,
+  N = [T] extends [never] ? true : false,
+> = true extends N ? [] : Push<TuplifyUnion<Exclude<T, L>>, L>;
+
+/**
+ * @public
+ */
+export type ConvertAll<T, R extends ReadonlyArray<unknown> = []> = T extends [
+  infer First extends JSONSchema7,
+  ...infer Rest,
+]
+  ? ConvertAll<Rest, [...R, FromSchema<First>]>
+  : R;
+
+/**
+ * @public
+ */
+export type UnknownIfNever<P> = [P] extends [never] ? unknown : P;
+
+/**
+ * @public
+ */
+export type ToTypeSafe<T> = UnknownIfNever<ConvertAll<TuplifyUnion<T>>[number]>;
+
+/**
+ * @public
+ */
+export type DiscriminateUnion<T, K extends keyof T, V extends T[K]> = Extract<
+  T,
+  Record<K, V>
+>;
+
+/**
+ * @public
+ */
+export type MapDiscriminatedUnion<
+  T extends Record<K, string>,
+  K extends keyof T,
+> = {
+  [V in T[K]]: DiscriminateUnion<T, K, V>;
+};
+
+/**
+ * @public
+ */
+export type PickOptionalKeys<T extends { [key: string]: any }> = {
+  [K in keyof T]: true extends T[K]['required'] ? never : K;
+}[keyof T];
+
+/**
+ * @public
+ */
+export type PickRequiredKeys<T extends { [key: string]: any }> = {
+  [K in keyof T]: true extends T[K]['required'] ? K : never;
+}[keyof T];
+
+/**
+ * @public
+ */
+export type OptionalMap<T extends { [key: string]: any }> = {
+  [P in Exclude<PickOptionalKeys<T>, undefined>]?: NonNullable<T[P]>;
+};
+
+/**
+ * @public
+ */
+export type RequiredMap<T extends { [key: string]: any }> = {
+  [P in Exclude<PickRequiredKeys<T>, undefined>]: NonNullable<T[P]>;
+};
+
+/**
+ * @public
+ */
+export type FullMap<T extends { [key: string]: any }> = RequiredMap<T> &
+  OptionalMap<T>;
+
+/**
+ * @public
+ */
+export type Filter<T, U> = T extends U ? T : never;
diff --git a/packages/backend-openapi-utils/src/types/express.ts b/packages/backend-openapi-utils/src/types/express.ts
new file mode 100644
index 0000000000..b0020dab37
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/express.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 type core from 'express-serve-static-core';
+import { DocPathTemplate, MethodAwareDocPath, RequiredDoc } from './common';
+import { PathSchema, QuerySchema } from './params';
+import { RequestBodyToJsonSchema } from './requests';
+import { ResponseBodyToJsonSchema } from './responses';
+
+/**
+ * Typed express request handler.
+ * @public
+ */
+export type DocRequestHandler<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends keyof Doc['paths'][Path],
+> = core.RequestHandler<
+  PathSchema<Doc, Path, Method>,
+  ResponseBodyToJsonSchema<Doc, Path, Method>,
+  RequestBodyToJsonSchema<Doc, Path, Method>,
+  QuerySchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * Typed express error handler / request handler union type.
+ * @public
+ */
+export type DocRequestHandlerParams<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends keyof Doc['paths'][Path],
+> = core.RequestHandlerParams<
+  PathSchema<Doc, Path, Method>,
+  ResponseBodyToJsonSchema<Doc, Path, Method>,
+  RequestBodyToJsonSchema<Doc, Path, Method>,
+  QuerySchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * Superset of the express router path matcher that enforces typed request and response bodies.
+ * @public
+ */
+export interface DocRequestMatcher<
+  Doc extends RequiredDoc,
+  T,
+  Method extends
+    | 'all'
+    | 'get'
+    | 'post'
+    | 'put'
+    | 'delete'
+    | 'patch'
+    | 'options'
+    | 'head',
+> {
+  <Path extends MethodAwareDocPath<Doc, DocPathTemplate<Doc>, Method>>(
+    path: Path,
+    ...handlers: Array<DocRequestHandler<Doc, Path, Method>>
+  ): T;
+  <Path extends MethodAwareDocPath<Doc, DocPathTemplate<Doc>, Method>>(
+    path: Path,
+    ...handlers: Array<DocRequestHandlerParams<Doc, Path, Method>>
+  ): T;
+}
diff --git a/packages/backend-openapi-utils/src/types/immutable.ts b/packages/backend-openapi-utils/src/types/immutable.ts
new file mode 100644
index 0000000000..3b253133d8
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/immutable.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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 {
+  ContentObject,
+  OpenAPIObject,
+  ReferenceObject,
+  RequestBodyObject,
+  ParameterObject,
+  SchemaObject,
+  ResponseObject,
+} from 'openapi3-ts';
+
+/**
+ * This file is meant to hold Immutable overwrites of the values provided by the `openapi3-ts`
+ *  package due to issues with `as const` supporting only readonly values.
+ */
+
+/**
+ * From {@link https://github.com/microsoft/TypeScript/issues/13923#issuecomment-653675557}, allows
+ *  us to convert from `as const` to the various OpenAPI types documented in `openapi3-ts`.
+ *
+ * @public
+ */
+export type Immutable<T> = T extends
+  | Function
+  | boolean
+  | number
+  | string
+  | null
+  | undefined
+  ? T
+  : T extends Map<infer K, infer V>
+  ? ReadonlyMap<Immutable<K>, Immutable<V>>
+  : T extends Set<infer S>
+  ? ReadonlySet<Immutable<S>>
+  : { readonly [P in keyof T]: Immutable<T[P]> };
+
+/**
+ * @public
+ */
+export type ImmutableObject<T> = { readonly [K in keyof T]: Immutable<T[K]> };
+
+/**
+ * @public
+ */
+export type ImmutableReferenceObject = ImmutableObject<ReferenceObject>;
+
+/**
+ * @public
+ */
+export type ImmutableOpenAPIObject = ImmutableObject<OpenAPIObject>;
+
+/**
+ * @public
+ */
+export type ImmutableContentObject = ImmutableObject<ContentObject>;
+
+/**
+ * @public
+ */
+export type ImmutableRequestBodyObject = ImmutableObject<RequestBodyObject>;
+
+/**
+ * @public
+ */
+export type ImmutableResponseObject = ImmutableObject<ResponseObject>;
+
+/**
+ * @public
+ */
+export type ImmutableParameterObject = ImmutableObject<ParameterObject>;
+
+/**
+ * @public
+ */
+export interface HeaderObject extends ParameterObject {
+  in: 'header';
+  style: 'simple';
+}
+
+/**
+ * @public
+ */
+export type ImmutableHeaderObject = ImmutableObject<HeaderObject>;
+
+/**
+ * @public
+ */
+export interface CookieObject extends ParameterObject {
+  in: 'cookie';
+  style?: 'form';
+}
+
+/**
+ * @public
+ */
+export type ImmutableCookieObject = ImmutableObject<CookieObject>;
+
+/**
+ * @public
+ */
+export interface QueryObject extends ParameterObject {
+  in: 'query';
+  style?: 'form' | 'deepObject' | 'pipeDelimited' | 'spaceDelimited';
+}
+
+/**
+ * @public
+ */
+export type ImmutableQueryObject = ImmutableObject<QueryObject>;
+
+/**
+ * @public
+ */
+export interface PathObject extends ParameterObject {
+  in: 'path';
+  style?: 'simple' | 'label' | 'matrix';
+}
+/**
+ * @public
+ */
+export type ImmutablePathObject = ImmutableObject<PathObject>;
+
+/**
+ * @public
+ */
+export type ImmutableSchemaObject = ImmutableObject<SchemaObject>;
diff --git a/packages/backend-openapi-utils/src/types/index.ts b/packages/backend-openapi-utils/src/types/index.ts
new file mode 100644
index 0000000000..98e58f68ad
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/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 * from './common';
+export * from './express';
+export * from './immutable';
+export * from './params';
+export * from './requests';
+export * from './responses';
diff --git a/packages/backend-openapi-utils/src/types/params.ts b/packages/backend-openapi-utils/src/types/params.ts
new file mode 100644
index 0000000000..dce743e6e8
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/params.ts
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  ImmutableCookieObject,
+  ImmutableHeaderObject,
+  ImmutableParameterObject,
+  ImmutablePathObject,
+  ImmutableQueryObject,
+  ImmutableReferenceObject,
+  ImmutableSchemaObject,
+} from './immutable';
+import {
+  ComponentRef,
+  ComponentTypes,
+  DocOperation,
+  DocPath,
+  DocPathMethod,
+  Filter,
+  FullMap,
+  MapDiscriminatedUnion,
+  PathTemplate,
+  RequiredDoc,
+} from './common';
+import { FromSchema, JSONSchema7 } from 'json-schema-to-ts';
+
+/**
+ * @public
+ */
+export type DocParameter<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+  Parameter extends keyof Doc['paths'][Path][Method]['parameters'],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['parameters'][Parameter] extends ImmutableReferenceObject
+  ? 'parameters' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'parameters',
+        DocOperation<Doc, Path, Method>['parameters'][Parameter]
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['parameters'][Parameter];
+
+/**
+ * @public
+ */
+export type DocParameters<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+> = DocOperation<Doc, Path, Method>['parameters'] extends ReadonlyArray<any>
+  ? {
+      [Index in keyof DocOperation<
+        Doc,
+        Path,
+        Method
+      >['parameters']]: DocParameter<Doc, Path, Method, Index>;
+    }
+  : never;
+
+/**
+ * @public
+ */
+export type ResolveDocParameterSchema<
+  Doc extends RequiredDoc,
+  Schema extends ImmutableParameterObject['schema'],
+> = Schema extends ImmutableReferenceObject
+  ? 'parameters' extends ComponentTypes<Doc>
+    ? ComponentRef<Doc, 'parameters', Schema>
+    : never
+  : Schema;
+
+/**
+ * @public
+ */
+export type ParameterSchema<
+  Doc extends RequiredDoc,
+  Schema extends ImmutableParameterObject['schema'],
+> = ResolveDocParameterSchema<Doc, Schema> extends infer R
+  ? R extends ImmutableSchemaObject
+    ? R extends JSONSchema7
+      ? FromSchema<R>
+      : never
+    : never
+  : never;
+
+/**
+ * @public
+ */
+export type MapToSchema<
+  Doc extends RequiredDoc,
+  T extends Record<string, ImmutableParameterObject>,
+> = {
+  [V in keyof T]: NonNullable<T[V]> extends ImmutableParameterObject
+    ? ParameterSchema<Doc, NonNullable<T[V]>['schema']>
+    : never;
+};
+
+/**
+ * @public
+ */
+export type ParametersSchema<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+  FilterType extends ImmutableParameterObject,
+> = number extends keyof DocParameters<Doc, Path, Method>
+  ? MapToSchema<
+      Doc,
+      FullMap<
+        MapDiscriminatedUnion<
+          Filter<DocParameters<Doc, Path, Method>[number], FilterType>,
+          'name'
+        >
+      >
+    >
+  : never;
+
+/**
+ * @public
+ */
+export type HeaderSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableHeaderObject>;
+
+/**
+ * @public
+ */
+export type CookieSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableCookieObject>;
+
+/**
+ * @public
+ */
+export type PathSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutablePathObject>;
+
+/**
+ * @public
+ */
+export type QuerySchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ParametersSchema<Doc, DocPath<Doc, Path>, Method, ImmutableQueryObject>;
diff --git a/packages/backend-openapi-utils/src/types/requests.ts b/packages/backend-openapi-utils/src/types/requests.ts
new file mode 100644
index 0000000000..e6542e186d
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/requests.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.
+ */
+
+/**
+ * Pulled from https://github.com/varanauskas/oatx.
+ */
+
+import type {
+  ComponentRef,
+  ComponentTypes,
+  ObjectWithContentSchema,
+  RequiredDoc,
+  DocOperation,
+  DocPath,
+  DocPathMethod,
+  DocPathTemplate,
+  PathTemplate,
+  ToTypeSafe,
+} from './common';
+import {
+  ImmutableReferenceObject,
+  ImmutableRequestBodyObject,
+} from './immutable';
+
+/**
+ * @public
+ */
+export type RequestBody<
+  Doc extends RequiredDoc,
+  Path extends Extract<keyof Doc['paths'], string>,
+  Method extends keyof Doc['paths'][Path],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['requestBody'] extends ImmutableReferenceObject
+  ? 'requestBodies' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'requestBodies',
+        DocOperation<Doc, Path, Method>['requestBody']
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['requestBody'];
+
+/**
+ * @public
+ */
+export type RequestBodySchema<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends DocPathMethod<Doc, Path>,
+> = RequestBody<
+  Doc,
+  DocPath<Doc, Path>,
+  Method
+> extends ImmutableRequestBodyObject
+  ? ObjectWithContentSchema<Doc, RequestBody<Doc, DocPath<Doc, Path>, Method>>
+  : never;
+
+/**
+ * Transform the OpenAPI request body schema to a typesafe JSON schema.
+ * @public
+ */
+export type RequestBodyToJsonSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ToTypeSafe<RequestBodySchema<Doc, Path, Method>>;
diff --git a/packages/backend-openapi-utils/src/types/responses.ts b/packages/backend-openapi-utils/src/types/responses.ts
new file mode 100644
index 0000000000..01e4a12aba
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/responses.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.
+ */
+
+/**
+ * Pulled from https://github.com/varanauskas/oatx.
+ */
+
+import type {
+  ComponentRef,
+  ComponentTypes,
+  ObjectWithContentSchema,
+  RequiredDoc,
+  DocOperation,
+  DocPathMethod,
+  DocPathTemplate,
+  PathTemplate,
+  ToTypeSafe,
+  ValueOf,
+} from './common';
+import { ImmutableReferenceObject, ImmutableResponseObject } from './immutable';
+
+/**
+ * @public
+ */
+export type Response<
+  Doc extends RequiredDoc,
+  Path extends keyof Doc['paths'],
+  Method extends keyof Doc['paths'][Path],
+  StatusCode extends keyof DocOperation<Doc, Path, Method>['responses'],
+> = DocOperation<
+  Doc,
+  Path,
+  Method
+>['responses'][StatusCode] extends ImmutableReferenceObject
+  ? 'responses' extends ComponentTypes<Doc>
+    ? ComponentRef<
+        Doc,
+        'responses',
+        DocOperation<Doc, Path, Method>['responses'][StatusCode]
+      >
+    : never
+  : DocOperation<Doc, Path, Method>['responses'][StatusCode];
+
+/**
+ * @public
+ */
+export type ResponseSchemas<
+  Doc extends RequiredDoc,
+  Path extends DocPathTemplate<Doc>,
+  Method extends DocPathMethod<Doc, Path>,
+> = {
+  [StatusCode in keyof DocOperation<Doc, Path, Method>['responses']]: Response<
+    Doc,
+    Path,
+    Method,
+    StatusCode
+  > extends ImmutableResponseObject
+    ? ObjectWithContentSchema<Doc, Response<Doc, Path, Method, StatusCode>>
+    : never;
+};
+
+/**
+ * Transform the OpenAPI request body schema to a typesafe JSON schema.
+ * @public
+ */
+export type ResponseBodyToJsonSchema<
+  Doc extends RequiredDoc,
+  Path extends PathTemplate<Extract<keyof Doc['paths'], string>>,
+  Method extends DocPathMethod<Doc, Path>,
+> = ToTypeSafe<ValueOf<ResponseSchemas<Doc, Path, Method>>>;
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index edce2a0c07..3ded5d7fa4 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/backend-plugin-api
 
+## 0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index 75573fa503..a98cdd0b0f 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-plugin-api",
   "description": "Core API used by Backstage backend plugins",
-  "version": "0.5.1-next.1",
+  "version": "0.5.1-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-tasks/CHANGELOG.md b/packages/backend-tasks/CHANGELOG.md
index 0c905c51df..fa0e3fc00c 100644
--- a/packages/backend-tasks/CHANGELOG.md
+++ b/packages/backend-tasks/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/backend-tasks
 
+## 0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index 40c72fe895..04e4c75470 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.1-next.1",
+  "version": "0.5.1-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 95eb874114..a25d966eb5 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/backend-test-utils
 
+## 0.1.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.4.2-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 0.1.36-next.1
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 5d5d639c66..a9d8f33377 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-test-utils",
   "description": "Test helpers library for Backstage backends",
-  "version": "0.1.36-next.1",
+  "version": "0.1.36-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 4d44a4f7f1..14e517eb88 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,107 @@
 # example-backend
 
+## 0.2.82-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.3
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/plugin-code-coverage-backend@0.2.10-next.3
+  - @backstage/plugin-lighthouse-backend@0.2.0-next.3
+  - @backstage/plugin-auth-backend@0.18.2-next.3
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-events-backend@0.2.5-next.3
+  - example-app@0.2.82-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-backend@0.3.2-next.3
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.23-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.6-next.2
+  - @backstage/plugin-badges-backend@0.1.38-next.3
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-entity-feedback-backend@0.1.2-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-explore-backend@0.0.6-next.2
+  - @backstage/plugin-graphql-backend@0.1.34-next.3
+  - @backstage/plugin-jenkins-backend@0.1.34-next.3
+  - @backstage/plugin-kafka-backend@0.2.37-next.3
+  - @backstage/plugin-linguist-backend@0.2.1-next.3
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-playlist-backend@0.2.7-next.3
+  - @backstage/plugin-proxy-backend@0.2.38-next.2
+  - @backstage/plugin-rollbar-backend@0.1.41-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.3
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.5-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.10-next.3
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.28-next.2
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.3
+  - @backstage/plugin-todo-backend@0.1.41-next.3
+
+## 0.2.82-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-permission-backend@0.5.19-next.2
+  - @backstage/plugin-rollbar-backend@0.1.41-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.28-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - example-app@0.2.82-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-backend@0.3.2-next.2
+  - @backstage/plugin-app-backend@0.3.44-next.2
+  - @backstage/plugin-auth-backend@0.18.2-next.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.23-next.2
+  - @backstage/plugin-azure-sites-backend@0.1.6-next.2
+  - @backstage/plugin-badges-backend@0.1.38-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.10-next.2
+  - @backstage/plugin-entity-feedback-backend@0.1.2-next.2
+  - @backstage/plugin-events-backend@0.2.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-explore-backend@0.0.6-next.2
+  - @backstage/plugin-graphql-backend@0.1.34-next.2
+  - @backstage/plugin-jenkins-backend@0.1.34-next.2
+  - @backstage/plugin-kafka-backend@0.2.37-next.2
+  - @backstage/plugin-lighthouse-backend@0.1.2-next.2
+  - @backstage/plugin-linguist-backend@0.2.1-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-playlist-backend@0.2.7-next.2
+  - @backstage/plugin-proxy-backend@0.2.38-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.12-next.2
+  - @backstage/plugin-search-backend@1.3.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.2.0-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.5-next.2
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.10-next.2
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+  - @backstage/plugin-techdocs-backend@1.6.1-next.2
+  - @backstage/plugin-todo-backend@0.1.41-next.2
+
 ## 0.2.82-next.1
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index fd8ec82d91..72b9c59e28 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.82-next.1",
+  "version": "0.2.82-next.3",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 011be941cf..593d30bc3b 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -42,7 +42,6 @@ import { metricsInit, metricsHandler } from './metrics';
 import auth from './plugins/auth';
 import azureDevOps from './plugins/azure-devops';
 import catalog from './plugins/catalog';
-import catalogEventBasedProviders from './plugins/catalogEventBasedProviders';
 import codeCoverage from './plugins/codecoverage';
 import entityFeedback from './plugins/entityFeedback';
 import events from './plugins/events';
@@ -68,6 +67,7 @@ import linguist from './plugins/linguist';
 import { PluginEnvironment } from './types';
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
+import { DefaultEventBroker } from '@backstage/plugin-events-backend';
 
 function makeCreateEnv(config: Config) {
   const root = getRootLogger();
@@ -85,6 +85,8 @@ function makeCreateEnv(config: Config) {
     discovery,
   });
 
+  const eventBroker = new DefaultEventBroker(root.child({ type: 'plugin' }));
+
   root.info(`Created UrlReader ${reader}`);
 
   return (plugin: string): PluginEnvironment => {
@@ -99,6 +101,7 @@ function makeCreateEnv(config: Config) {
       database,
       config,
       reader,
+      eventBroker,
       discovery,
       tokenManager,
       permissions,
@@ -156,18 +159,12 @@ async function main() {
   const exploreEnv = useHotMemoize(module, () => createEnv('explore'));
   const lighthouseEnv = useHotMemoize(module, () => createEnv('lighthouse'));
 
-  const eventBasedEntityProviders = await catalogEventBasedProviders(
-    catalogEnv,
-  );
   const linguistEnv = useHotMemoize(module, () => createEnv('linguist'));
 
   const apiRouter = Router();
-  apiRouter.use(
-    '/catalog',
-    await catalog(catalogEnv, eventBasedEntityProviders),
-  );
+  apiRouter.use('/catalog', await catalog(catalogEnv));
   apiRouter.use('/code-coverage', await codeCoverage(codeCoverageEnv));
-  apiRouter.use('/events', await events(eventsEnv, eventBasedEntityProviders));
+  apiRouter.use('/events', await events(eventsEnv));
   apiRouter.use('/rollbar', await rollbar(rollbarEnv));
   apiRouter.use('/scaffolder', await scaffolder(scaffolderEnv));
   apiRouter.use('/tech-insights', await techInsights(techInsightsEnv));
diff --git a/packages/backend/src/plugins/catalogEventBasedProviders.ts b/packages/backend/src/plugins/DemoEventBasedEntityProvider.ts
similarity index 63%
rename from packages/backend/src/plugins/catalogEventBasedProviders.ts
rename to packages/backend/src/plugins/DemoEventBasedEntityProvider.ts
index 346ed40fa6..7a032198a3 100644
--- a/packages/backend/src/plugins/catalogEventBasedProviders.ts
+++ b/packages/backend/src/plugins/DemoEventBasedEntityProvider.ts
@@ -18,15 +18,29 @@ import {
   EntityProvider,
   EntityProviderConnection,
 } from '@backstage/plugin-catalog-node';
-import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
+import {
+  EventBroker,
+  EventParams,
+  EventSubscriber,
+} from '@backstage/plugin-events-node';
 import { Logger } from 'winston';
-import { PluginEnvironment } from '../types';
 
-class DemoEventBasedEntityProvider implements EntityProvider, EventSubscriber {
-  constructor(
-    private readonly logger: Logger,
-    private readonly topics: string[],
-  ) {}
+export class DemoEventBasedEntityProvider
+  implements EntityProvider, EventSubscriber
+{
+  private readonly logger: Logger;
+  private readonly topics: string[];
+
+  constructor(opts: {
+    eventBroker: EventBroker;
+    logger: Logger;
+    topics: string[];
+  }) {
+    const { eventBroker, logger, topics } = opts;
+    this.logger = logger;
+    this.topics = topics;
+    eventBroker.subscribe(this);
+  }
 
   async onEvent(params: EventParams): Promise<void> {
     this.logger.info(
@@ -48,14 +62,3 @@ class DemoEventBasedEntityProvider implements EntityProvider, EventSubscriber {
     return DemoEventBasedEntityProvider.name;
   }
 }
-
-export default async function createCatalogEventBasedProviders(
-  env: PluginEnvironment,
-): Promise<Array<EntityProvider & EventSubscriber>> {
-  const providers: Array<
-    (EntityProvider & EventSubscriber) | Array<EntityProvider & EventSubscriber>
-  > = [];
-  providers.push(new DemoEventBasedEntityProvider(env.logger, ['example']));
-  // add your event-based entity providers here
-  return providers.flat();
-}
diff --git a/packages/backend/src/plugins/catalog.ts b/packages/backend/src/plugins/catalog.ts
index f6fe25f86a..ae00d5a7ec 100644
--- a/packages/backend/src/plugins/catalog.ts
+++ b/packages/backend/src/plugins/catalog.ts
@@ -15,18 +15,24 @@
  */
 
 import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
-import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
+import { DemoEventBasedEntityProvider } from './DemoEventBasedEntityProvider';
 
 export default async function createPlugin(
   env: PluginEnvironment,
-  providers?: Array<EntityProvider>,
 ): Promise<Router> {
   const builder = await CatalogBuilder.create(env);
   builder.addProcessor(new ScaffolderEntitiesProcessor());
-  builder.addEntityProvider(providers ?? []);
+
+  const demoProvider = new DemoEventBasedEntityProvider({
+    logger: env.logger,
+    topics: ['example'],
+    eventBroker: env.eventBroker,
+  });
+  builder.addEntityProvider(demoProvider);
+
   const { processingEngine, router } = await builder.build();
   await processingEngine.start();
   return router;
diff --git a/packages/backend/src/plugins/events.ts b/packages/backend/src/plugins/events.ts
index 7427d34217..f3ff354240 100644
--- a/packages/backend/src/plugins/events.ts
+++ b/packages/backend/src/plugins/events.ts
@@ -18,13 +18,11 @@ import {
   EventsBackend,
   HttpPostIngressEventPublisher,
 } from '@backstage/plugin-events-backend';
-import { EventSubscriber } from '@backstage/plugin-events-node';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
 export default async function createPlugin(
   env: PluginEnvironment,
-  subscribers: EventSubscriber[],
 ): Promise<Router> {
   const eventsRouter = Router();
 
@@ -35,8 +33,8 @@ export default async function createPlugin(
   http.bind(eventsRouter);
 
   await new EventsBackend(env.logger)
+    .setEventBroker(env.eventBroker)
     .addPublishers(http)
-    .addSubscribers(subscribers)
     .start();
 
   return eventsRouter;
diff --git a/packages/backend/src/plugins/lighthouse.ts b/packages/backend/src/plugins/lighthouse.ts
index 5e805b7b80..00a67409e3 100644
--- a/packages/backend/src/plugins/lighthouse.ts
+++ b/packages/backend/src/plugins/lighthouse.ts
@@ -19,11 +19,17 @@ import { PluginEnvironment } from '../types';
 import { CatalogClient } from '@backstage/catalog-client';
 
 export default async function createPlugin(env: PluginEnvironment) {
-  const { logger, scheduler, config } = env;
+  const { logger, scheduler, config, tokenManager } = env;
 
   const catalogClient = new CatalogClient({
     discoveryApi: env.discovery,
   });
 
-  await createScheduler({ logger, scheduler, config, catalogClient });
+  await createScheduler({
+    logger,
+    scheduler,
+    config,
+    catalogClient,
+    tokenManager,
+  });
 }
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 895581c702..ab1baf0c95 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -26,6 +26,7 @@ import {
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { IdentityApi } from '@backstage/plugin-auth-node';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
+import { EventBroker } from '@backstage/plugin-events-node';
 
 export type PluginEnvironment = {
   logger: Logger;
@@ -38,4 +39,5 @@ export type PluginEnvironment = {
   permissions: PermissionEvaluator;
   scheduler: PluginTaskScheduler;
   identity: IdentityApi;
+  eventBroker: EventBroker;
 };
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index edd3811ef8..5415ccd9e2 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/catalog-client
 
+## 1.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/errors@1.1.5
+
+## 1.4.1-next.0
+
+### Patch Changes
+
+- c1c4e080b79: Fixed bug in `queryEntities` of `CatalogClient` where the `sortField` is supposed to be changed to `orderField`.
+- Updated dependencies
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+
 ## 1.4.0
 
 ### Minor Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 07709d8c65..85543cdd03 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.0",
+  "version": "1.4.1-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts
index 53bb55b95f..f5c221569d 100644
--- a/packages/catalog-client/src/CatalogClient.test.ts
+++ b/packages/catalog-client/src/CatalogClient.test.ts
@@ -352,7 +352,7 @@ describe('CatalogClient', () => {
         ],
       });
       expect(mockedEndpoint.mock.calls[0][0].url.search).toBe(
-        '?limit=100&sortField=metadata.name,asc&sortField=metadata.uid,desc&fields=a,b&fullTextFilterTerm=query',
+        '?limit=100&orderField=metadata.name,asc&orderField=metadata.uid,desc&fields=a,b&fullTextFilterTerm=query',
       );
     });
 
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index be4ae6289d..c388519e05 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -230,7 +230,7 @@ export class CatalogClient implements CatalogApi {
       }
       if (orderFields !== undefined) {
         (Array.isArray(orderFields) ? orderFields : [orderFields]).forEach(
-          ({ field, order }) => params.push(`sortField=${field},${order}`),
+          ({ field, order }) => params.push(`orderField=${field},${order}`),
         );
       }
       if (fields.length) {
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index fa20368b86..bcfb24e2c7 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/catalog-model
 
+## 1.3.0-next.0
+
+### Minor Changes
+
+- be9c4228073: Modified the regex for DNS label validation to support IDN domains
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+
 ## 1.2.1
 
 ### Patch Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index e23d399a37..e2893dbb58 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.2.1",
+  "version": "1.3.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts
index a887a9aa2e..88b6e54113 100644
--- a/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts
+++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts
@@ -125,7 +125,7 @@ describe('CommonValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
     ['a_b', false],
     ['adam.bertil.caesar', true],
     ['adam.ber-til.caesar', true],
@@ -154,7 +154,8 @@ describe('CommonValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
+    ['xn--c6h', true],
     ['a_b', false],
     [`${'a'.repeat(63)}`, true],
     [`${'a'.repeat(64)}`, false],
diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
index 40a85c5331..295c5b8895 100644
--- a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
+++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
@@ -91,7 +91,7 @@ export class CommonValidatorFunctions {
       typeof value === 'string' &&
       value.length >= 1 &&
       value.length <= 63 &&
-      /^[a-z0-9]+(\-[a-z0-9]+)*$/.test(value)
+      /^[a-z0-9]+(?:\-+[a-z0-9]+)*$/.test(value)
     );
   }
 
diff --git a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.test.ts b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.test.ts
index c194774906..dad0631b47 100644
--- a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.test.ts
+++ b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.test.ts
@@ -31,7 +31,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a/a', true],
     ['a/aAb5C', true],
     ['a-b.c/v1', true],
-    ['a--b.c/v1', false],
+    ['a--b.c/v1', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,
@@ -96,7 +96,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
     ['a_b', false],
     ['a.b', false],
   ])(`isValidNamespace %p ? %p`, (value, matches) => {
@@ -121,7 +121,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a..b', true],
     ['a/a', true],
     ['a-b.c/a', true],
-    ['a--b.c/a', false],
+    ['a--b.c/a', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,
@@ -178,7 +178,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a..b', true],
     ['a/a', true],
     ['a-b.c/a', true],
-    ['a--b.c/a', false],
+    ['a--b.c/a', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,
diff --git a/packages/cli-node/.eslintrc.js b/packages/cli-node/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/packages/cli-node/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/packages/cli-node/CHANGELOG.md b/packages/cli-node/CHANGELOG.md
new file mode 100644
index 0000000000..7126021d4c
--- /dev/null
+++ b/packages/cli-node/CHANGELOG.md
@@ -0,0 +1,14 @@
+# @backstage/cli-node
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- 3156b0d85dc: Introduced the new `@backstage/cli-node` package, which provides utilities for use across Backstage CLIs.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
diff --git a/packages/cli-node/README.md b/packages/cli-node/README.md
new file mode 100644
index 0000000000..7988ac1e52
--- /dev/null
+++ b/packages/cli-node/README.md
@@ -0,0 +1,10 @@
+# @backstage/cli-node
+
+This library provides utilities for building CLI tools for Backstage.
+
+The difference between this library and `@backstage/cli-common` is that this library is more feature rich with a larger dependency tree, with less concern for bundle size and installation speed. The `@backstage/cli-common` package on the other hand is intended to be extremely slim and only provide minimal features for use in tools like `@backstage/create-app`.
+
+## Documentation
+
+- [Backstage Readme](https://github.com/backstage/backstage/blob/master/README.md)
+- [Backstage Documentation](https://backstage.io/docs)
diff --git a/packages/cli-node/api-report.md b/packages/cli-node/api-report.md
new file mode 100644
index 0000000000..91148596b3
--- /dev/null
+++ b/packages/cli-node/api-report.md
@@ -0,0 +1,167 @@
+## API Report File for "@backstage/cli-node"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { JsonValue } from '@backstage/types';
+import { Package } from '@manypkg/get-packages';
+
+// @public
+export type BackstagePackage = {
+  dir: string;
+  packageJson: BackstagePackageJson;
+};
+
+// @public
+export interface BackstagePackageJson {
+  // (undocumented)
+  backstage?: {
+    role?: PackageRole;
+  };
+  // (undocumented)
+  bundled?: boolean;
+  // (undocumented)
+  dependencies?: {
+    [key: string]: string;
+  };
+  // (undocumented)
+  devDependencies?: {
+    [key: string]: string;
+  };
+  // (undocumented)
+  exports?: JsonValue;
+  // (undocumented)
+  files?: string[];
+  // (undocumented)
+  main?: string;
+  // (undocumented)
+  module?: string;
+  // (undocumented)
+  name: string;
+  // (undocumented)
+  optionalDependencies?: {
+    [key: string]: string;
+  };
+  // (undocumented)
+  peerDependencies?: {
+    [key: string]: string;
+  };
+  // (undocumented)
+  private?: boolean;
+  // (undocumented)
+  publishConfig?: {
+    access?: 'public' | 'restricted';
+    directory?: string;
+    registry?: string;
+    alphaTypes?: string;
+    betaTypes?: string;
+  };
+  // (undocumented)
+  scripts?: {
+    [key: string]: string;
+  };
+  // (undocumented)
+  types?: string;
+  // (undocumented)
+  typesVersions?: Record<string, Record<string, string[]>>;
+  // (undocumented)
+  version: string;
+}
+
+// @public
+export class GitUtils {
+  static listChangedFiles(ref: string): Promise<string[]>;
+  static readFileAtRef(path: string, ref: string): Promise<string>;
+}
+
+// @public
+export function isMonoRepo(): Promise<boolean>;
+
+// @public
+export class Lockfile {
+  createSimplifiedDependencyGraph(): Map<string, Set<string>>;
+  diff(otherLockfile: Lockfile): LockfileDiff;
+  static load(path: string): Promise<Lockfile>;
+  static parse(content: string): Lockfile;
+}
+
+// @public
+export type LockfileDiff = {
+  added: LockfileDiffEntry[];
+  changed: LockfileDiffEntry[];
+  removed: LockfileDiffEntry[];
+};
+
+// @public
+export type LockfileDiffEntry = {
+  name: string;
+  range: string;
+};
+
+// @public
+export class PackageGraph extends Map<string, PackageGraphNode> {
+  collectPackageNames(
+    startingPackageNames: string[],
+    collectFn: (pkg: PackageGraphNode) => Iterable<string> | undefined,
+  ): Set<string>;
+  static fromPackages(packages: Package[]): PackageGraph;
+  listChangedPackages(options: {
+    ref: string;
+    analyzeLockfile?: boolean;
+  }): Promise<PackageGraphNode[]>;
+  static listTargetPackages(): Promise<BackstagePackage[]>;
+}
+
+// @public
+export type PackageGraphNode = {
+  name: string;
+  dir: string;
+  packageJson: BackstagePackageJson;
+  allLocalDependencies: Map<string, PackageGraphNode>;
+  publishedLocalDependencies: Map<string, PackageGraphNode>;
+  localDependencies: Map<string, PackageGraphNode>;
+  localDevDependencies: Map<string, PackageGraphNode>;
+  localOptionalDependencies: Map<string, PackageGraphNode>;
+  allLocalDependents: Map<string, PackageGraphNode>;
+  publishedLocalDependents: Map<string, PackageGraphNode>;
+  localDependents: Map<string, PackageGraphNode>;
+  localDevDependents: Map<string, PackageGraphNode>;
+  localOptionalDependents: Map<string, PackageGraphNode>;
+};
+
+// @public
+export type PackageOutputType = 'bundle' | 'types' | 'esm' | 'cjs';
+
+// @public
+export type PackagePlatform = 'node' | 'web' | 'common';
+
+// @public
+export type PackageRole =
+  | 'frontend'
+  | 'backend'
+  | 'cli'
+  | 'web-library'
+  | 'node-library'
+  | 'common-library'
+  | 'frontend-plugin'
+  | 'frontend-plugin-module'
+  | 'backend-plugin'
+  | 'backend-plugin-module';
+
+// @public
+export interface PackageRoleInfo {
+  // (undocumented)
+  output: PackageOutputType[];
+  // (undocumented)
+  platform: PackagePlatform;
+  // (undocumented)
+  role: PackageRole;
+}
+
+// @public
+export class PackageRoles {
+  static detectRoleFromPackage(pkgJson: unknown): PackageRole | undefined;
+  static getRoleFromPackage(pkgJson: unknown): PackageRole | undefined;
+  static getRoleInfo(role: string): PackageRoleInfo;
+}
+```
diff --git a/packages/cli-node/package.json b/packages/cli-node/package.json
new file mode 100644
index 0000000000..feccaba0b2
--- /dev/null
+++ b/packages/cli-node/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@backstage/cli-node",
+  "description": "Node.js library for Backstage CLIs",
+  "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": "node-library"
+  },
+  "scripts": {
+    "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/cli-common": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@manypkg/get-packages": "^1.1.3",
+    "@yarnpkg/parsers": "^3.0.0-rc.4",
+    "fs-extra": "10.1.0",
+    "semver": "^7.3.2",
+    "zod": "^3.21.4"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "mock-fs": "^5.2.0"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/packages/cli/src/lib/git.test.ts b/packages/cli-node/src/git/GitUtils.test.ts
similarity index 85%
rename from packages/cli/src/lib/git.test.ts
rename to packages/cli-node/src/git/GitUtils.test.ts
index 2e5d464796..e1ebe5513c 100644
--- a/packages/cli/src/lib/git.test.ts
+++ b/packages/cli-node/src/git/GitUtils.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { runGit, listChangedFiles } from './git';
+import { runGit, GitUtils } from './GitUtils';
 
 describe('runGit', () => {
   it('runs a git command', async () => {
@@ -43,10 +43,14 @@ describe('runGit', () => {
 
 describe('listChangedFiles', () => {
   it('requires a ref', async () => {
-    await expect(listChangedFiles('')).rejects.toThrow('ref is required');
+    await expect(GitUtils.listChangedFiles('')).rejects.toThrow(
+      'ref is required',
+    );
   });
 
   it('should return something', async () => {
-    await expect(listChangedFiles('HEAD')).resolves.toEqual(expect.any(Array));
+    await expect(GitUtils.listChangedFiles('HEAD')).resolves.toEqual(
+      expect.any(Array),
+    );
   });
 });
diff --git a/packages/cli-node/src/git/GitUtils.ts b/packages/cli-node/src/git/GitUtils.ts
new file mode 100644
index 0000000000..df04b1c6a2
--- /dev/null
+++ b/packages/cli-node/src/git/GitUtils.ts
@@ -0,0 +1,94 @@
+/*
+ * 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 { assertError, ForwardedError } from '@backstage/errors';
+import { paths } from '../paths';
+import { execFile } from '../run';
+
+/**
+ * Run a git command, trimming the output splitting it into lines.
+ */
+export async function runGit(...args: string[]) {
+  try {
+    const { stdout } = await execFile('git', args, {
+      shell: true,
+      cwd: paths.targetRoot,
+    });
+    return stdout.trim().split(/\r\n|\r|\n/);
+  } catch (error) {
+    assertError(error);
+    if (error.stderr || typeof error.code === 'number') {
+      const stderr = (error.stderr as undefined | Buffer)?.toString('utf8');
+      const msg = stderr?.trim() ?? `with exit code ${error.code}`;
+      throw new Error(`git ${args[0]} failed, ${msg}`);
+    }
+    throw new ForwardedError('Unknown execution error', error);
+  }
+}
+
+/**
+ * Utilities for working with git.
+ *
+ * @public
+ */
+export class GitUtils {
+  /**
+   * Returns a sorted list of all files that have changed since the merge base
+   * of the provided `ref` and HEAD, as well as all files that are not tracked by git.
+   */
+  static async listChangedFiles(ref: string) {
+    if (!ref) {
+      throw new Error('ref is required');
+    }
+
+    let diffRef = ref;
+    try {
+      const [base] = await runGit('merge-base', 'HEAD', ref);
+      diffRef = base;
+    } catch {
+      // silently fall back to using the ref directly if merge base is not available
+    }
+
+    const tracked = await runGit('diff', '--name-only', diffRef);
+    const untracked = await runGit(
+      'ls-files',
+      '--others',
+      '--exclude-standard',
+    );
+
+    return Array.from(new Set([...tracked, ...untracked]));
+  }
+
+  /**
+   * Returns the contents of a file at a specific ref.
+   */
+  static async readFileAtRef(path: string, ref: string) {
+    let showRef = ref;
+    try {
+      const [base] = await runGit('merge-base', 'HEAD', ref);
+      showRef = base;
+    } catch {
+      // silently fall back to using the ref directly if merge base is not available
+    }
+
+    const { stdout } = await execFile('git', ['show', `${showRef}:${path}`], {
+      shell: true,
+      cwd: paths.targetRoot,
+      maxBuffer: 1024 * 1024 * 50,
+    });
+    return stdout;
+  }
+}
diff --git a/packages/cli-node/src/git/index.ts b/packages/cli-node/src/git/index.ts
new file mode 100644
index 0000000000..b4dd156ed2
--- /dev/null
+++ b/packages/cli-node/src/git/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 { GitUtils } from './GitUtils';
diff --git a/packages/cli-node/src/index.ts b/packages/cli-node/src/index.ts
new file mode 100644
index 0000000000..1d3f3ec2ed
--- /dev/null
+++ b/packages/cli-node/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.
+ */
+
+/**
+ * Node.js library for Backstage CLIs
+ *
+ * @packageDocumentation
+ */
+
+export * from './git';
+export * from './monorepo';
+export * from './roles';
diff --git a/packages/cli-node/src/monorepo/Lockfile.test.ts b/packages/cli-node/src/monorepo/Lockfile.test.ts
new file mode 100644
index 0000000000..01574779b2
--- /dev/null
+++ b/packages/cli-node/src/monorepo/Lockfile.test.ts
@@ -0,0 +1,501 @@
+/*
+ * 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 mockFs from 'mock-fs';
+import { Lockfile } from './Lockfile';
+
+const LEGACY_HEADER = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+`;
+
+const MODERN_HEADER = `# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 6
+  cacheKey: 8
+`;
+
+describe('New Lockfile', () => {
+  afterEach(() => {
+    mockFs.restore();
+  });
+
+  describe('diff', () => {
+    const lockfileLegacyA = Lockfile.parse(`${LEGACY_HEADER}
+a@^1:
+  version "1.0.1"
+  resolved "https://my-registry/a-1.0.01.tgz#abc123"
+  integrity sha512-xyz
+  dependencies:
+    b "^2"
+
+b@3:
+  version "3.0.1"
+  integrity sha512-abc1
+
+b@2.0.x:
+  version "2.0.1"
+  integrity sha512-abc2
+
+b@^2:
+  version "2.0.0"
+  integrity sha512-abc3
+
+c@^1:
+  version "1.0.1"
+  integrity x
+`);
+
+    const lockfileLegacyB = Lockfile.parse(`${LEGACY_HEADER}
+a@^1:
+  version "1.0.1"
+  resolved "https://my-registry/a-1.0.01.tgz#abc123"
+  integrity sha512-xyz-other
+  dependencies:
+    b "^2"
+
+b@2.0.x, b@^2:
+  version "2.0.0"
+  integrity sha512-abc3
+
+b@4:
+  version "4.0.0"
+  integrity sha512-abc
+
+d@^1:
+  version "1.0.1"
+  integrity x
+`);
+
+    const lockfileModernA = Lockfile.parse(`${MODERN_HEADER}
+"a@npm:^1":
+  version: "1.0.1"
+  resolved: "https://my-registry/a-1.0.01.tgz#abc123"
+  checksum: sha512-xyz
+  dependencies:
+    b: "^2"
+
+"b@npm:3":
+  version: "3.0.1"
+  checksum: sha512-abc1
+
+"b@npm:2.0.x":
+  version: "2.0.1"
+  checksum: sha512-abc2
+
+"b@npm:^2":
+  version: "2.0.0"
+  checksum: sha512-abc3
+
+"c@npm:^1":
+  version: "1.0.1"
+  checksum: x
+`);
+
+    const lockfileModernB = Lockfile.parse(`${MODERN_HEADER}
+"a@npm:^1":
+  version: "1.0.1"
+  resolution: "a@npm:1.0.1"
+  checksum: sha512-xyz-other
+  dependencies:
+    b: "^2"
+
+"b@npm:2.0.x, b@npm:^2":
+  version: "2.0.0"
+  checksum: sha512-abc3
+
+"b@npm:4":
+  version: "4.0.0"
+  checksum: sha512-abc
+
+"d@npm:^1":
+  version: "1.0.1"
+  checksum: x
+`);
+
+    it('should diff two legacy lockfiles', async () => {
+      expect(lockfileLegacyA.diff(lockfileLegacyB)).toEqual({
+        added: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+      });
+      expect(lockfileLegacyB.diff(lockfileLegacyA)).toEqual({
+        added: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+      });
+    });
+
+    it('should diff two modern lockfiles', async () => {
+      expect(lockfileModernA.diff(lockfileModernB)).toEqual({
+        added: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+      });
+      expect(lockfileModernB.diff(lockfileModernA)).toEqual({
+        added: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+      });
+    });
+
+    it('should diff legacy and modern lockfiles', async () => {
+      expect(lockfileLegacyA.diff(lockfileModernB)).toEqual({
+        added: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+      });
+      expect(lockfileLegacyB.diff(lockfileModernA)).toEqual({
+        added: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+      });
+    });
+
+    it('should diff modern and legacy lockfiles', async () => {
+      expect(lockfileModernA.diff(lockfileLegacyB)).toEqual({
+        added: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+      });
+      expect(lockfileModernB.diff(lockfileLegacyA)).toEqual({
+        added: [
+          { name: 'b', range: '4' },
+          { name: 'd', range: '^1' },
+        ],
+        changed: [
+          { name: 'a', range: '^1' },
+          { name: 'b', range: '2.0.x' },
+        ],
+        removed: [
+          { name: 'b', range: '3' },
+          { name: 'c', range: '^1' },
+        ],
+      });
+    });
+
+    it('should handle workspace ranges', async () => {
+      const lockfile = `${MODERN_HEADER}
+"@backstage/app-defaults@workspace:^, @backstage/app-defaults@workspace:packages/app-defaults":
+  version: 0.0.0-use.local
+  resolution: "@backstage/app-defaults@workspace:packages/app-defaults"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/plugin-permission-react": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@material-ui/core": ^4.12.2
+    "@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
+    react-dom: ^16.13.1 || ^17.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/backend-app-api@workspace:^, @backstage/backend-app-api@workspace:packages/backend-app-api":
+  version: 0.0.0-use.local
+  resolution: "@backstage/backend-app-api@workspace:packages/backend-app-api"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-tasks": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-permission-node": "workspace:^"
+    express: ^4.17.1
+    express-promise-router: ^4.1.0
+    winston: ^3.2.1
+  languageName: unknown
+  linkType: soft
+`;
+      expect(Lockfile.parse(lockfile).diff(Lockfile.parse(lockfile))).toEqual({
+        added: [],
+        changed: [],
+        removed: [],
+      });
+    });
+  });
+
+  describe('createSimplifiedDependencyGraph', () => {
+    it('for modern lockfile', () => {
+      expect(
+        Lockfile.parse(
+          `${MODERN_HEADER}
+"@backstage/app-defaults@workspace:^, @backstage/app-defaults@workspace:packages/app-defaults":
+  version: 0.0.0-use.local
+  resolution: "@backstage/app-defaults@workspace:packages/app-defaults"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/plugin-permission-react": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@material-ui/core": ^4.12.2
+    "@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
+    react-dom: ^16.13.1 || ^17.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/backend-app-api@workspace:^, @backstage/backend-app-api@workspace:packages/backend-app-api":
+  version: 0.0.0-use.local
+  resolution: "@backstage/backend-app-api@workspace:packages/backend-app-api"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-tasks": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-permission-node": "workspace:^"
+    express: ^4.17.1
+    express-promise-router: ^4.1.0
+    winston: ^3.2.1
+  languageName: unknown
+  linkType: soft
+`,
+        ).createSimplifiedDependencyGraph(),
+      ).toEqual(
+        new Map([
+          [
+            '@backstage/app-defaults',
+            new Set([
+              '@backstage/cli',
+              '@backstage/core-app-api',
+              '@backstage/core-components',
+              '@backstage/core-plugin-api',
+              '@backstage/plugin-permission-react',
+              '@backstage/test-utils',
+              '@backstage/theme',
+              '@material-ui/core',
+              '@material-ui/icons',
+              '@testing-library/jest-dom',
+              '@testing-library/react',
+              '@types/node',
+              '@types/react',
+              'react',
+              'react-dom',
+              'react-router-dom',
+            ]),
+          ],
+          [
+            '@backstage/backend-app-api',
+            new Set([
+              '@backstage/backend-common',
+              '@backstage/backend-plugin-api',
+              '@backstage/backend-tasks',
+              '@backstage/cli',
+              '@backstage/errors',
+              '@backstage/plugin-permission-node',
+              'express',
+              'express-promise-router',
+              'winston',
+            ]),
+          ],
+        ]),
+      );
+    });
+
+    it('for simple lockfile without dependencies', () => {
+      expect(
+        Lockfile.parse(
+          `${MODERN_HEADER}
+"a@npm:^1":
+  version: "1.0.1"
+
+"b@npm:3":
+  version: "3.0.1"
+
+"b@npm:2.0.x":
+  version: "2.0.1"
+  checksum: sha512-abc2
+`,
+        ).createSimplifiedDependencyGraph(),
+      ).toEqual(
+        new Map([
+          ['a', new Set()],
+          ['b', new Set()],
+        ]),
+      );
+    });
+
+    it('for lockfile with dependencies', () => {
+      expect(
+        Lockfile.parse(
+          `${MODERN_HEADER}
+"a@npm:^1":
+  version: "1.0.1"
+  dependencies:
+    b: "^2"
+
+"b@npm:3":
+  version: "3.0.1"
+  checksum: sha512-abc1
+
+"b@npm:2.0.x":
+  version: "2.0.1"
+  checksum: sha512-abc2
+  dependencies:
+    c: "^1"
+
+"b@npm:^2":
+  version: "2.0.0"
+  checksum: sha512-abc3
+  peerDependencies:
+    d: "^1"
+
+"c@npm:^1":
+  version: "1.0.1"
+
+"d@npm:^1":
+  version: "1.0.2"
+`,
+        ).createSimplifiedDependencyGraph(),
+      ).toEqual(
+        new Map([
+          ['a', new Set(['b'])],
+          ['b', new Set(['c', 'd'])],
+          ['c', new Set()],
+          ['d', new Set()],
+        ]),
+      );
+    });
+
+    it('for legacy lockfile', () => {
+      expect(
+        Lockfile.parse(
+          `${LEGACY_HEADER}
+a@^1:
+  version "1.0.1"
+  dependencies:
+    b "^2"
+
+b@3:
+  version "3.0.1"
+  integrity sha512-abc1
+
+b@2.0.x:
+  version "2.0.1"
+  integrity sha512-abc2
+  dependencies:
+    c "^1"
+
+b@^2:
+  version "2.0.0"
+  integrity sha512-abc3
+  dependencies:
+    d "^1"
+
+c@^1:
+  version "1.0.1"
+  integrity x
+
+d@^1:
+  version "1.0.1"
+  integrity x
+`,
+        ).createSimplifiedDependencyGraph(),
+      ).toEqual(
+        new Map([
+          ['a', new Set(['b'])],
+          ['b', new Set(['c', 'd'])],
+          ['c', new Set()],
+          ['d', new Set()],
+        ]),
+      );
+    });
+  });
+});
diff --git a/packages/cli-node/src/monorepo/Lockfile.ts b/packages/cli-node/src/monorepo/Lockfile.ts
new file mode 100644
index 0000000000..8a481c77ad
--- /dev/null
+++ b/packages/cli-node/src/monorepo/Lockfile.ts
@@ -0,0 +1,218 @@
+/*
+ * 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 { parseSyml } from '@yarnpkg/parsers';
+import fs from 'fs-extra';
+
+const ENTRY_PATTERN = /^((?:@[^/]+\/)?[^@/]+)@(.+)$/;
+
+/** @internal */
+type LockfileData = {
+  [entry: string]: {
+    version: string;
+    resolved?: string;
+    integrity?: string /* old */;
+    checksum?: string /* new */;
+    dependencies?: { [name: string]: string };
+    peerDependencies?: { [name: string]: string };
+  };
+};
+
+/** @internal */
+type LockfileQueryEntry = {
+  range: string;
+  version: string;
+  dataKey: string;
+};
+
+/**
+ * An entry for a single difference between two {@link Lockfile}s.
+ *
+ * @public
+ */
+export type LockfileDiffEntry = {
+  name: string;
+  range: string;
+};
+
+/**
+ * Represents the difference between two {@link Lockfile}s.
+ *
+ * @public
+ */
+export type LockfileDiff = {
+  added: LockfileDiffEntry[];
+  changed: LockfileDiffEntry[];
+  removed: LockfileDiffEntry[];
+};
+
+// these are special top level yarn keys.
+// https://github.com/yarnpkg/berry/blob/9bd61fbffb83d0b8166a9cc26bec3a58743aa453/packages/yarnpkg-parsers/sources/syml.ts#L9
+const SPECIAL_OBJECT_KEYS = [
+  `__metadata`,
+  `version`,
+  `resolution`,
+  `dependencies`,
+  `peerDependencies`,
+  `dependenciesMeta`,
+  `peerDependenciesMeta`,
+  `binaries`,
+];
+
+/**
+ * Represents a package manager lockfile.
+ *
+ * @public
+ */
+export class Lockfile {
+  /**
+   * Load a {@link Lockfile} from a file path.
+   */
+  static async load(path: string): Promise<Lockfile> {
+    const lockfileContents = await fs.readFile(path, 'utf8');
+    return Lockfile.parse(lockfileContents);
+  }
+
+  /**
+   * Parse lockfile contents into a {@link Lockfile}.
+   *
+   * @public
+   */
+  static parse(content: string): Lockfile {
+    let data: LockfileData;
+    try {
+      data = parseSyml(content);
+    } catch (err) {
+      throw new Error(`Failed yarn.lock parse, ${err}`);
+    }
+
+    const packages = new Map<string, LockfileQueryEntry[]>();
+
+    for (const [key, value] of Object.entries(data)) {
+      if (SPECIAL_OBJECT_KEYS.includes(key)) continue;
+
+      const [, name, ranges] = ENTRY_PATTERN.exec(key) ?? [];
+      if (!name) {
+        throw new Error(`Failed to parse yarn.lock entry '${key}'`);
+      }
+
+      let queries = packages.get(name);
+      if (!queries) {
+        queries = [];
+        packages.set(name, queries);
+      }
+      for (let range of ranges.split(/\s*,\s*/)) {
+        if (range.startsWith(`${name}@`)) {
+          range = range.slice(`${name}@`.length);
+        }
+        if (range.startsWith('npm:')) {
+          range = range.slice('npm:'.length);
+        }
+        queries.push({ range, version: value.version, dataKey: key });
+      }
+    }
+
+    return new Lockfile(packages, data);
+  }
+
+  private constructor(
+    private readonly packages: Map<string, LockfileQueryEntry[]>,
+    private readonly data: LockfileData,
+  ) {}
+
+  /**
+   * Creates a simplified dependency graph from the lockfile data, where each
+   * key is a package, and the value is a set of all packages that it depends on
+   * across all versions.
+   */
+  createSimplifiedDependencyGraph(): Map<string, Set<string>> {
+    const graph = new Map<string, Set<string>>();
+
+    for (const [name, entries] of this.packages) {
+      const dependencies = new Set(
+        entries.flatMap(e => {
+          const data = this.data[e.dataKey];
+          return [
+            ...Object.keys(data?.dependencies ?? {}),
+            ...Object.keys(data?.peerDependencies ?? {}),
+          ];
+        }),
+      );
+      graph.set(name, dependencies);
+    }
+
+    return graph;
+  }
+
+  /**
+   * Diff with another lockfile, returning entries that have been
+   * added, changed, and removed compared to the other lockfile.
+   */
+  diff(otherLockfile: Lockfile): LockfileDiff {
+    const diff = {
+      added: new Array<{ name: string; range: string }>(),
+      changed: new Array<{ name: string; range: string }>(),
+      removed: new Array<{ name: string; range: string }>(),
+    };
+
+    // Keeps track of packages that only exist in this lockfile
+    const remainingOldNames = new Set(this.packages.keys());
+
+    for (const [name, otherQueries] of otherLockfile.packages) {
+      remainingOldNames.delete(name);
+
+      const thisQueries = this.packages.get(name);
+      // If the packages doesn't exist in this lockfile, add all entries
+      if (!thisQueries) {
+        diff.removed.push(...otherQueries.map(q => ({ name, range: q.range })));
+        continue;
+      }
+
+      const remainingOldRanges = new Set(thisQueries.map(q => q.range));
+
+      for (const otherQuery of otherQueries) {
+        remainingOldRanges.delete(otherQuery.range);
+
+        const thisQuery = thisQueries.find(q => q.range === otherQuery.range);
+        if (!thisQuery) {
+          diff.removed.push({ name, range: otherQuery.range });
+          continue;
+        }
+
+        const otherPkg = otherLockfile.data[otherQuery.dataKey];
+        const thisPkg = this.data[thisQuery.dataKey];
+        if (otherPkg && thisPkg) {
+          const thisCheck = thisPkg.integrity || thisPkg.checksum;
+          const otherCheck = otherPkg.integrity || otherPkg.checksum;
+          if (thisCheck !== otherCheck) {
+            diff.changed.push({ name, range: otherQuery.range });
+          }
+        }
+      }
+
+      for (const thisRange of remainingOldRanges) {
+        diff.added.push({ name, range: thisRange });
+      }
+    }
+
+    for (const name of remainingOldNames) {
+      const queries = this.packages.get(name) ?? [];
+      diff.added.push(...queries.map(q => ({ name, range: q.range })));
+    }
+
+    return diff;
+  }
+}
diff --git a/packages/cli/src/lib/monorepo/PackageGraph.test.ts b/packages/cli-node/src/monorepo/PackageGraph.test.ts
similarity index 94%
rename from packages/cli/src/lib/monorepo/PackageGraph.test.ts
rename to packages/cli-node/src/monorepo/PackageGraph.test.ts
index d8edff9c81..9bc9cbf72b 100644
--- a/packages/cli/src/lib/monorepo/PackageGraph.test.ts
+++ b/packages/cli-node/src/monorepo/PackageGraph.test.ts
@@ -17,17 +17,11 @@
 import { resolve as resolvePath } from 'path';
 import { getPackages } from '@manypkg/get-packages';
 import { PackageGraph } from './PackageGraph';
-import { Lockfile } from '../versioning/Lockfile';
-import { listChangedFiles, readFileAtRef } from '../git';
+import { Lockfile } from './Lockfile';
+import { GitUtils } from '../git';
 
-jest.mock('../git');
-
-const mockListChangedFiles = listChangedFiles as jest.MockedFunction<
-  typeof listChangedFiles
->;
-const mockReadFileAtRef = readFileAtRef as jest.MockedFunction<
-  typeof readFileAtRef
->;
+const mockListChangedFiles = jest.spyOn(GitUtils, 'listChangedFiles');
+const mockReadFileAtRef = jest.spyOn(GitUtils, 'readFileAtRef');
 
 jest.mock('../paths', () => ({
   paths: {
diff --git a/packages/cli/src/lib/monorepo/PackageGraph.ts b/packages/cli-node/src/monorepo/PackageGraph.ts
similarity index 86%
rename from packages/cli/src/lib/monorepo/PackageGraph.ts
rename to packages/cli-node/src/monorepo/PackageGraph.ts
index bb203c01a5..421c49f9b9 100644
--- a/packages/cli/src/lib/monorepo/PackageGraph.ts
+++ b/packages/cli-node/src/monorepo/PackageGraph.ts
@@ -17,14 +17,21 @@
 import path from 'path';
 import { getPackages, Package } from '@manypkg/get-packages';
 import { paths } from '../paths';
-import { PackageRole } from '../role';
-import { listChangedFiles, readFileAtRef } from '../git';
-import { Lockfile } from '../versioning';
+import { PackageRole } from '../roles';
+import { GitUtils } from '../git';
+import { Lockfile } from './Lockfile';
 import { JsonValue } from '@backstage/types';
 
-type PackageJSON = Package['packageJson'];
+/**
+ * Known fields in Backstage package.json files.
+ *
+ * @public
+ */
+export interface BackstagePackageJson {
+  name: string;
+  version: string;
+  private?: boolean;
 
-export interface ExtendedPackageJSON extends PackageJSON {
   main?: string;
   module?: string;
   types?: string;
@@ -52,20 +59,43 @@ export interface ExtendedPackageJSON extends PackageJSON {
     alphaTypes?: string;
     betaTypes?: string;
   };
+
+  dependencies?: {
+    [key: string]: string;
+  };
+  peerDependencies?: {
+    [key: string]: string;
+  };
+  devDependencies?: {
+    [key: string]: string;
+  };
+  optionalDependencies?: {
+    [key: string]: string;
+  };
 }
 
-export type ExtendedPackage = {
+/**
+ * A local Backstage monorepo package
+ *
+ * @public
+ */
+export type BackstagePackage = {
   dir: string;
-  packageJson: ExtendedPackageJSON;
+  packageJson: BackstagePackageJson;
 };
 
+/**
+ * A local package in the monorepo package graph.
+ *
+ * @public
+ */
 export type PackageGraphNode = {
   /** The name of the package */
   name: string;
   /** The directory of the package */
   dir: string;
   /** The package data of the package itself */
-  packageJson: ExtendedPackageJSON;
+  packageJson: BackstagePackageJson;
 
   /** All direct local dependencies of the package */
   allLocalDependencies: Map<string, PackageGraphNode>;
@@ -90,12 +120,23 @@ export type PackageGraphNode = {
   localOptionalDependents: Map<string, PackageGraphNode>;
 };
 
+/**
+ * Represents a local Backstage monorepo package graph.
+ *
+ * @public
+ */
 export class PackageGraph extends Map<string, PackageGraphNode> {
-  static async listTargetPackages(): Promise<ExtendedPackage[]> {
+  /**
+   * Lists all local packages in a monorepo.
+   */
+  static async listTargetPackages(): Promise<BackstagePackage[]> {
     const { packages } = await getPackages(paths.targetDir);
-    return packages as ExtendedPackage[];
+    return packages as BackstagePackage[];
   }
 
+  /**
+   * Creates a package graph from a list of local packages.
+   */
   static fromPackages(packages: Package[]): PackageGraph {
     const graph = new PackageGraph();
 
@@ -112,7 +153,7 @@ export class PackageGraph extends Map<string, PackageGraphNode> {
       graph.set(name, {
         name,
         dir: pkg.dir,
-        packageJson: pkg.packageJson as ExtendedPackageJSON,
+        packageJson: pkg.packageJson as BackstagePackageJson,
 
         allLocalDependencies: new Map(),
         publishedLocalDependencies: new Map(),
@@ -210,11 +251,19 @@ export class PackageGraph extends Map<string, PackageGraphNode> {
     return targets;
   }
 
+  /**
+   * Lists all packages that have changed since a given git ref.
+   *
+   * @remarks
+   *
+   * If the `analyzeLockfile` option is set to true, the change detection will
+   * also consider changes to the dependency management lockfile.
+   */
   async listChangedPackages(options: {
     ref: string;
     analyzeLockfile?: boolean;
   }) {
-    const changedFiles = await listChangedFiles(options.ref);
+    const changedFiles = await GitUtils.listChangedFiles(options.ref);
 
     const dirMap = new Map(
       Array.from(this.values()).map(pkg => [
@@ -265,7 +314,7 @@ export class PackageGraph extends Map<string, PackageGraphNode> {
           paths.resolveTargetRoot('yarn.lock'),
         );
         otherLockfile = Lockfile.parse(
-          await readFileAtRef('yarn.lock', options.ref),
+          await GitUtils.readFileAtRef('yarn.lock', options.ref),
         );
       } catch (error) {
         console.warn(
diff --git a/packages/cli-node/src/monorepo/index.ts b/packages/cli-node/src/monorepo/index.ts
new file mode 100644
index 0000000000..fdb8395c16
--- /dev/null
+++ b/packages/cli-node/src/monorepo/index.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { isMonoRepo } from './isMonoRepo';
+export {
+  PackageGraph,
+  type PackageGraphNode,
+  type BackstagePackage,
+  type BackstagePackageJson,
+} from './PackageGraph';
+export {
+  Lockfile,
+  type LockfileDiff,
+  type LockfileDiffEntry,
+} from './Lockfile';
diff --git a/packages/cli/src/lib/monorepo/isMonoRepo.ts b/packages/cli-node/src/monorepo/isMonoRepo.ts
similarity index 92%
rename from packages/cli/src/lib/monorepo/isMonoRepo.ts
rename to packages/cli-node/src/monorepo/isMonoRepo.ts
index 9b1ab93762..da78c8dd53 100644
--- a/packages/cli/src/lib/monorepo/isMonoRepo.ts
+++ b/packages/cli-node/src/monorepo/isMonoRepo.ts
@@ -17,6 +17,11 @@
 import { paths } from '../paths';
 import fs from 'fs-extra';
 
+/**
+ * Returns try if the current project is a monorepo.
+ *
+ * @public
+ */
 export async function isMonoRepo(): Promise<boolean> {
   const rootPackageJsonPath = paths.resolveTargetRoot('package.json');
   try {
diff --git a/packages/cli/src/lib/monorepo/isMonorepo.test.ts b/packages/cli-node/src/monorepo/isMonorepo.test.ts
similarity index 100%
rename from packages/cli/src/lib/monorepo/isMonorepo.test.ts
rename to packages/cli-node/src/monorepo/isMonorepo.test.ts
diff --git a/packages/core-components/src/components/Tabs/index.ts b/packages/cli-node/src/paths.ts
similarity index 73%
rename from packages/core-components/src/components/Tabs/index.ts
rename to packages/cli-node/src/paths.ts
index 9702c39a48..2c658c27b3 100644
--- a/packages/core-components/src/components/Tabs/index.ts
+++ b/packages/cli-node/src/paths.ts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-export { Tabs } from './Tabs';
-export type { TabsClassKey } from './Tabs';
-export type { TabClassKey } from './Tab';
+import { findPaths } from '@backstage/cli-common';
 
-export type { TabBarClassKey } from './TabBar';
-export type { TabIconClassKey } from './TabIcon';
+/* eslint-disable-next-line no-restricted-syntax */
+export const paths = findPaths(__dirname);
diff --git a/packages/cli/src/lib/role/packageRoles.test.ts b/packages/cli-node/src/roles/PackageRoles.test.ts
similarity index 82%
rename from packages/cli/src/lib/role/packageRoles.test.ts
rename to packages/cli-node/src/roles/PackageRoles.test.ts
index 2cd1e29368..80e320f1f4 100644
--- a/packages/cli/src/lib/role/packageRoles.test.ts
+++ b/packages/cli-node/src/roles/PackageRoles.test.ts
@@ -14,30 +14,23 @@
  * limitations under the License.
  */
 
-import mockFs from 'mock-fs';
-import { Command } from 'commander';
-import {
-  getRoleInfo,
-  getRoleFromPackage,
-  findRoleFromCommand,
-  detectRoleFromPackage,
-} from './packageRoles';
+import { PackageRoles } from './PackageRoles';
 
 describe('getRoleInfo', () => {
   it('provides role info by role', () => {
-    expect(getRoleInfo('web-library')).toEqual({
+    expect(PackageRoles.getRoleInfo('web-library')).toEqual({
       role: 'web-library',
       platform: 'web',
       output: ['types', 'esm'],
     });
 
-    expect(getRoleInfo('frontend')).toEqual({
+    expect(PackageRoles.getRoleInfo('frontend')).toEqual({
       role: 'frontend',
       platform: 'web',
       output: ['bundle'],
     });
 
-    expect(() => getRoleInfo('invalid')).toThrow(
+    expect(() => PackageRoles.getRoleInfo('invalid')).toThrow(
       `Unknown package role 'invalid'`,
     );
   });
@@ -46,7 +39,7 @@ describe('getRoleInfo', () => {
 describe('getRoleFromPackage', () => {
   it('reads explicit package roles', () => {
     expect(
-      getRoleFromPackage({
+      PackageRoles.getRoleFromPackage({
         backstage: {
           role: 'web-library',
         },
@@ -54,7 +47,7 @@ describe('getRoleFromPackage', () => {
     ).toEqual('web-library');
 
     expect(
-      getRoleFromPackage({
+      PackageRoles.getRoleFromPackage({
         backstage: {
           role: 'frontend',
         },
@@ -62,14 +55,14 @@ describe('getRoleFromPackage', () => {
     ).toEqual('frontend');
 
     expect(() =>
-      getRoleFromPackage({
+      PackageRoles.getRoleFromPackage({
         name: 'test',
         backstage: {},
       }),
     ).toThrow('Package test must specify a role in the "backstage" field');
 
     expect(() =>
-      getRoleFromPackage({
+      PackageRoles.getRoleFromPackage({
         name: 'test',
         backstage: { role: 'invalid' },
       }),
@@ -77,48 +70,10 @@ describe('getRoleFromPackage', () => {
   });
 });
 
-describe('findRoleFromCommand', () => {
-  function mkCommand(args: string) {
-    const parsed = new Command()
-      .option('--role <role>', 'test role')
-      .parse(['node', 'entry.js', ...args.split(' ')]) as Command;
-    return parsed.opts();
-  }
-
-  beforeEach(() => {
-    mockFs({
-      'package.json': JSON.stringify({
-        name: 'test',
-        backstage: {
-          role: 'web-library',
-        },
-      }),
-    });
-  });
-
-  afterEach(() => {
-    mockFs.restore();
-  });
-
-  it('provides role info by role', async () => {
-    await expect(findRoleFromCommand(mkCommand(''))).resolves.toEqual(
-      'web-library',
-    );
-
-    await expect(
-      findRoleFromCommand(mkCommand('--role node-library')),
-    ).resolves.toEqual('node-library');
-
-    await expect(
-      findRoleFromCommand(mkCommand('--role invalid')),
-    ).rejects.toThrow(`Unknown package role 'invalid'`);
-  });
-});
-
 describe('detectRoleFromPackage', () => {
   it('detects the role of example-app', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: 'example-app',
         private: true,
         bundled: true,
@@ -141,7 +96,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of example-backend', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: 'example-backend',
         main: 'dist/index.cjs.js',
         types: 'src/index.ts',
@@ -160,7 +115,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-catalog', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-catalog',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -185,7 +140,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-catalog-backend', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-catalog-backend',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -209,7 +164,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-catalog-react', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-catalog-react',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -232,7 +187,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-catalog-common', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-catalog-common',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -256,7 +211,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-catalog-backend-module-ldap', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-catalog-backend-module-ldap',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -279,7 +234,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-permission-node', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-permission-node',
         main: 'src/index.ts',
         types: 'src/index.ts',
@@ -303,7 +258,7 @@ describe('detectRoleFromPackage', () => {
 
   it('detects the role of @backstage/plugin-analytics-module-ga', () => {
     expect(
-      detectRoleFromPackage({
+      PackageRoles.detectRoleFromPackage({
         name: '@backstage/plugin-analytics-module-ga',
         main: 'src/index.ts',
         types: 'src/index.ts',
diff --git a/packages/cli-node/src/roles/PackageRoles.ts b/packages/cli-node/src/roles/PackageRoles.ts
new file mode 100644
index 0000000000..401568ad6d
--- /dev/null
+++ b/packages/cli-node/src/roles/PackageRoles.ts
@@ -0,0 +1,186 @@
+/*
+ * 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 { z } from 'zod';
+import { PackageRole, PackageRoleInfo } from './types';
+
+const packageRoleInfos: PackageRoleInfo[] = [
+  {
+    role: 'frontend',
+    platform: 'web',
+    output: ['bundle'],
+  },
+  {
+    role: 'backend',
+    platform: 'node',
+    output: ['bundle'],
+  },
+  {
+    role: 'cli',
+    platform: 'node',
+    output: ['cjs'],
+  },
+  {
+    role: 'web-library',
+    platform: 'web',
+    output: ['types', 'esm'],
+  },
+  {
+    role: 'node-library',
+    platform: 'node',
+    output: ['types', 'cjs'],
+  },
+  {
+    role: 'common-library',
+    platform: 'common',
+    output: ['types', 'esm', 'cjs'],
+  },
+  {
+    role: 'frontend-plugin',
+    platform: 'web',
+    output: ['types', 'esm'],
+  },
+  {
+    role: 'frontend-plugin-module',
+    platform: 'web',
+    output: ['types', 'esm'],
+  },
+  {
+    role: 'backend-plugin',
+    platform: 'node',
+    output: ['types', 'cjs'],
+  },
+  {
+    role: 'backend-plugin-module',
+    platform: 'node',
+    output: ['types', 'cjs'],
+  },
+];
+
+const readSchema = z.object({
+  name: z.string().optional(),
+  backstage: z
+    .object({
+      role: z.string().optional(),
+    })
+    .optional(),
+});
+
+const detectionSchema = z.object({
+  name: z.string().optional(),
+  scripts: z
+    .object({
+      start: z.string().optional(),
+      build: z.string().optional(),
+    })
+    .optional(),
+  publishConfig: z
+    .object({
+      main: z.string().optional(),
+      types: z.string().optional(),
+      module: z.string().optional(),
+    })
+    .optional(),
+  main: z.string().optional(),
+  types: z.string().optional(),
+  module: z.string().optional(),
+});
+
+/**
+ * Utilities for working with Backstage package roles.
+ *
+ * @public
+ */
+export class PackageRoles {
+  /**
+   * Get the associated info for a package role.
+   */
+  static getRoleInfo(role: string): PackageRoleInfo {
+    const roleInfo = packageRoleInfos.find(r => r.role === role);
+    if (!roleInfo) {
+      throw new Error(`Unknown package role '${role}'`);
+    }
+    return roleInfo;
+  }
+
+  /**
+   * Given package JSON data, get the package role.
+   */
+  static getRoleFromPackage(pkgJson: unknown): PackageRole | undefined {
+    const pkg = readSchema.parse(pkgJson);
+
+    if (pkg.backstage) {
+      const { role } = pkg.backstage;
+      if (!role) {
+        throw new Error(
+          `Package ${pkg.name} must specify a role in the "backstage" field`,
+        );
+      }
+
+      return this.getRoleInfo(role).role;
+    }
+
+    return undefined;
+  }
+
+  /**
+   * Attempt to detect the role of a package from its package.json.
+   */
+  static detectRoleFromPackage(pkgJson: unknown): PackageRole | undefined {
+    const pkg = detectionSchema.parse(pkgJson);
+
+    if (pkg.scripts?.start?.includes('app:serve')) {
+      return 'frontend';
+    }
+    if (pkg.scripts?.build?.includes('backend:bundle')) {
+      return 'backend';
+    }
+    if (
+      pkg.name?.includes('plugin-') &&
+      pkg.name?.includes('-backend-module-')
+    ) {
+      return 'backend-plugin-module';
+    }
+    if (pkg.name?.includes('plugin-') && pkg.name?.includes('-module-')) {
+      return 'frontend-plugin-module';
+    }
+    if (pkg.scripts?.start?.includes('plugin:serve')) {
+      return 'frontend-plugin';
+    }
+    if (pkg.scripts?.start?.includes('backend:dev')) {
+      return 'backend-plugin';
+    }
+
+    const mainEntry = pkg.publishConfig?.main || pkg.main;
+    const moduleEntry = pkg.publishConfig?.module || pkg.module;
+    const typesEntry = pkg.publishConfig?.types || pkg.types;
+    if (typesEntry) {
+      if (mainEntry && moduleEntry) {
+        return 'common-library';
+      }
+      if (moduleEntry || mainEntry?.endsWith('.esm.js')) {
+        return 'web-library';
+      }
+      if (mainEntry) {
+        return 'node-library';
+      }
+    } else if (mainEntry) {
+      return 'cli';
+    }
+
+    return undefined;
+  }
+}
diff --git a/packages/cli/src/lib/role/index.ts b/packages/cli-node/src/roles/index.ts
similarity index 85%
rename from packages/cli/src/lib/role/index.ts
rename to packages/cli-node/src/roles/index.ts
index 4e1047a628..93022ba986 100644
--- a/packages/cli/src/lib/role/index.ts
+++ b/packages/cli-node/src/roles/index.ts
@@ -20,9 +20,4 @@ export type {
   PackageOutputType,
   PackageRole,
 } from './types';
-export {
-  getRoleInfo,
-  getRoleFromPackage,
-  findRoleFromCommand,
-  detectRoleFromPackage,
-} from './packageRoles';
+export { PackageRoles } from './PackageRoles';
diff --git a/packages/cli/src/lib/role/types.ts b/packages/cli-node/src/roles/types.ts
similarity index 75%
rename from packages/cli/src/lib/role/types.ts
rename to packages/cli-node/src/roles/types.ts
index a3961544f4..a913ff29b6 100644
--- a/packages/cli/src/lib/role/types.ts
+++ b/packages/cli-node/src/roles/types.ts
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/**
+ * Backstage package role, see {@link https://backstage.io/docs/local-dev/cli-build-system#package-roles | docs}.
+ *
+ * @public
+ */
 export type PackageRole =
   | 'frontend'
   | 'backend'
@@ -26,9 +31,25 @@ export type PackageRole =
   | 'backend-plugin'
   | 'backend-plugin-module';
 
+/**
+ * A type of platform that a package can be built for.
+ *
+ * @public
+ */
 export type PackagePlatform = 'node' | 'web' | 'common';
+
+/**
+ * The type of output that a package can produce.
+ *
+ * @public
+ */
 export type PackageOutputType = 'bundle' | 'types' | 'esm' | 'cjs';
 
+/**
+ * Information about a package role.
+ *
+ * @public
+ */
 export interface PackageRoleInfo {
   role: PackageRole;
   platform: PackagePlatform;
diff --git a/packages/core-components/src/components/Tabs/utils.ts b/packages/cli-node/src/run.ts
similarity index 69%
rename from packages/core-components/src/components/Tabs/utils.ts
rename to packages/cli-node/src/run.ts
index 80705fdfc0..e924b5c5b8 100644
--- a/packages/core-components/src/components/Tabs/utils.ts
+++ b/packages/cli-node/src/run.ts
@@ -14,15 +14,7 @@
  * limitations under the License.
  */
 
-export function chunkArray<T>(array: T[], chunkSize: number): T[][] {
-  if (chunkSize <= 0) {
-    return [array];
-  }
+import { execFile as execFileCb } from 'child_process';
+import { promisify } from 'util';
 
-  const result: T[][] = [];
-  for (let i = 0; i < array.length; i += chunkSize) {
-    result.push(array.slice(i, i + chunkSize));
-  }
-
-  return result;
-}
+export const execFile = promisify(execFileCb);
diff --git a/packages/cli-node/src/setupTests.ts b/packages/cli-node/src/setupTests.ts
new file mode 100644
index 0000000000..4b9026cde5
--- /dev/null
+++ b/packages/cli-node/src/setupTests.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 {};
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index aeb2a3d48d..b971dbe111 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/cli
 
+## 0.22.6-next.3
+
+### Patch Changes
+
+- 3156b0d85dc: Internal refactor to move many internal utilities to the new `@backstage/cli-node` package.
+- 9bbb00d5b49: Updated dependency `@swc/helpers` to `^0.5.0`.
+- Updated dependencies
+  - @backstage/cli-node@0.1.0-next.0
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/eslint-plugin@0.1.3-next.0
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.0.2
+
+## 0.22.6-next.2
+
+### Patch Changes
+
+- 8075b67e64c: When building a backend package with dependencies any `--config <path>` options will now be forwarded to any dependent app package builds, unless the build script in the app package already contains a `--config` option.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/errors@1.1.5
+  - @backstage/eslint-plugin@0.1.3-next.0
+  - @backstage/release-manifests@0.0.9
+  - @backstage/types@1.0.2
+
 ## 0.22.6-next.1
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 354321b934..8b830a4353 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.6-next.1",
+  "version": "0.22.6-next.3",
   "publishConfig": {
     "access": "public"
   },
@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@backstage/cli-common": "workspace:^",
+    "@backstage/cli-node": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/config-loader": "workspace:^",
     "@backstage/errors": "workspace:^",
@@ -55,8 +56,8 @@
     "@svgr/plugin-svgo": "6.5.x",
     "@svgr/rollup": "6.5.x",
     "@svgr/webpack": "6.5.x",
-    "@swc/core": "^1.3.9",
-    "@swc/helpers": "^0.4.7",
+    "@swc/core": "^1.3.46",
+    "@swc/helpers": "^0.5.0",
     "@swc/jest": "^0.2.22",
     "@types/jest": "^29.0.0",
     "@types/webpack-env": "^1.15.2",
diff --git a/packages/cli/src/commands/build/buildBackend.ts b/packages/cli/src/commands/build/buildBackend.ts
index 7e61f9ae85..5d42aa18d4 100644
--- a/packages/cli/src/commands/build/buildBackend.ts
+++ b/packages/cli/src/commands/build/buildBackend.ts
@@ -28,10 +28,11 @@ const SKELETON_FILE = 'skeleton.tar.gz';
 interface BuildBackendOptions {
   targetDir: string;
   skipBuildDependencies: boolean;
+  configPaths?: string[];
 }
 
 export async function buildBackend(options: BuildBackendOptions) {
-  const { targetDir, skipBuildDependencies } = options;
+  const { targetDir, skipBuildDependencies, configPaths } = options;
   const pkg = await fs.readJson(resolvePath(targetDir, 'package.json'));
 
   // We build the target package without generating type declarations.
@@ -45,6 +46,7 @@ export async function buildBackend(options: BuildBackendOptions) {
   try {
     await createDistWorkspace([pkg.name], {
       targetDir: tmpDir,
+      configPaths,
       buildDependencies: !skipBuildDependencies,
       buildExcludes: [pkg.name],
       parallelism: getEnvironmentParallelism(),
diff --git a/packages/cli/src/commands/build/command.ts b/packages/cli/src/commands/build/command.ts
index fcaf58e1ee..507085e0a0 100644
--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -16,29 +16,39 @@
 
 import { OptionValues } from 'commander';
 import { buildPackage, Output } from '../../lib/builder';
-import { findRoleFromCommand, getRoleInfo } from '../../lib/role';
+import { findRoleFromCommand } from '../../lib/role';
+import { PackageRoles } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
 import { buildFrontend } from './buildFrontend';
 import { buildBackend } from './buildBackend';
+import { isValidUrl } from '../../lib/urls';
 
 export async function command(opts: OptionValues): Promise<void> {
   const role = await findRoleFromCommand(opts);
 
-  if (role === 'frontend') {
-    return buildFrontend({
-      targetDir: paths.targetDir,
-      configPaths: opts.config as string[],
-      writeStats: Boolean(opts.stats),
+  if (role === 'frontend' || role === 'backend') {
+    const configPaths = (opts.config as string[]).map(arg => {
+      if (isValidUrl(arg)) {
+        return arg;
+      }
+      return paths.resolveTarget(arg);
     });
-  }
-  if (role === 'backend') {
+
+    if (role === 'frontend') {
+      return buildFrontend({
+        targetDir: paths.targetDir,
+        configPaths,
+        writeStats: Boolean(opts.stats),
+      });
+    }
     return buildBackend({
       targetDir: paths.targetDir,
+      configPaths,
       skipBuildDependencies: Boolean(opts.skipBuildDependencies),
     });
   }
 
-  const roleInfo = getRoleInfo(role);
+  const roleInfo = PackageRoles.getRoleInfo(role);
 
   const outputs = new Set<Output>();
 
diff --git a/packages/cli/src/commands/fix.ts b/packages/cli/src/commands/fix.ts
index e4cdc4dc84..263d171fd6 100644
--- a/packages/cli/src/commands/fix.ts
+++ b/packages/cli/src/commands/fix.ts
@@ -19,7 +19,7 @@ import { ESLint } from 'eslint';
 import { join as joinPath, basename } from 'path';
 import fs from 'fs-extra';
 import { isChildPath } from '@backstage/cli-common';
-import { PackageGraph } from '../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 
 function isTestPath(filePath: string) {
   if (!isChildPath(joinPath(paths.targetDir, 'src'), filePath)) {
diff --git a/packages/cli/src/commands/migrate/packageExports.ts b/packages/cli/src/commands/migrate/packageExports.ts
index ff01f939f9..82d0b73ac2 100644
--- a/packages/cli/src/commands/migrate/packageExports.ts
+++ b/packages/cli/src/commands/migrate/packageExports.ts
@@ -16,7 +16,7 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
-import { ExtendedPackageJSON, PackageGraph } from '../../lib/monorepo';
+import { BackstagePackageJson, PackageGraph } from '@backstage/cli-node';
 
 function trimRelative(path: string): string {
   if (path.startsWith('./')) {
@@ -94,7 +94,7 @@ export async function command() {
 
         newPackageJson = Object.fromEntries(
           newPkgEntries,
-        ) as ExtendedPackageJSON;
+        ) as BackstagePackageJson;
         changed = true;
       }
 
diff --git a/packages/cli/src/commands/migrate/packageLintConfigs.ts b/packages/cli/src/commands/migrate/packageLintConfigs.ts
index c0007ef59d..03d42846e8 100644
--- a/packages/cli/src/commands/migrate/packageLintConfigs.ts
+++ b/packages/cli/src/commands/migrate/packageLintConfigs.ts
@@ -16,7 +16,7 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
-import { PackageGraph } from '../../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 import { runPlain } from '../../lib/run';
 
 const PREFIX = `module.exports = require('@backstage/cli/config/eslint-factory')`;
diff --git a/packages/cli/src/commands/migrate/packageRole.ts b/packages/cli/src/commands/migrate/packageRole.ts
index e8bfb8e7c8..e7abbd3dcd 100644
--- a/packages/cli/src/commands/migrate/packageRole.ts
+++ b/packages/cli/src/commands/migrate/packageRole.ts
@@ -17,8 +17,8 @@
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
 import { getPackages } from '@manypkg/get-packages';
+import { PackageRoles } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
-import { getRoleFromPackage, detectRoleFromPackage } from '../../lib/role';
 
 export default async () => {
   const { packages } = await getPackages(paths.targetDir);
@@ -26,12 +26,12 @@ export default async () => {
   await Promise.all(
     packages.map(async ({ dir, packageJson: pkg }) => {
       const { name } = pkg;
-      const existingRole = getRoleFromPackage(pkg);
+      const existingRole = PackageRoles.getRoleFromPackage(pkg);
       if (existingRole) {
         return;
       }
 
-      const detectedRole = detectRoleFromPackage(pkg);
+      const detectedRole = PackageRoles.detectRoleFromPackage(pkg);
       if (!detectedRole) {
         console.error(`No role detected for package ${name}`);
         return;
diff --git a/packages/cli/src/commands/migrate/packageScripts.ts b/packages/cli/src/commands/migrate/packageScripts.ts
index c7dab9466b..1552208a5f 100644
--- a/packages/cli/src/commands/migrate/packageScripts.ts
+++ b/packages/cli/src/commands/migrate/packageScripts.ts
@@ -16,8 +16,7 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
-import { PackageGraph } from '../../lib/monorepo';
-import { getRoleFromPackage, getRoleInfo, PackageRole } from '../../lib/role';
+import { PackageGraph, PackageRoles, PackageRole } from '@backstage/cli-node';
 
 const configArgPattern = /--config[=\s][^\s$]+/;
 
@@ -28,12 +27,12 @@ export async function command() {
 
   await Promise.all(
     packages.map(async ({ dir, packageJson }) => {
-      const role = getRoleFromPackage(packageJson);
+      const role = PackageRoles.getRoleFromPackage(packageJson);
       if (!role) {
         return;
       }
 
-      const roleInfo = getRoleInfo(role);
+      const roleInfo = PackageRoles.getRoleInfo(role);
       const hasStart = !noStartRoles.includes(role);
       const needsPack = !(roleInfo.output.includes('bundle') || role === 'cli');
       const scripts = packageJson.scripts ?? {};
diff --git a/packages/cli/src/commands/migrate/reactRouterDeps.ts b/packages/cli/src/commands/migrate/reactRouterDeps.ts
index 3c1ddd293d..1617c855ee 100644
--- a/packages/cli/src/commands/migrate/reactRouterDeps.ts
+++ b/packages/cli/src/commands/migrate/reactRouterDeps.ts
@@ -16,8 +16,7 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
-import { PackageGraph } from '../../lib/monorepo';
-import { getRoleFromPackage } from '../../lib/role';
+import { PackageGraph, PackageRoles } from '@backstage/cli-node';
 
 const REACT_ROUTER_DEPS = ['react-router', 'react-router-dom'];
 const REACT_ROUTER_RANGE = '6.0.0-beta.0 || ^6.3.0';
@@ -27,7 +26,7 @@ export async function command() {
 
   await Promise.all(
     packages.map(async ({ dir, packageJson }) => {
-      const role = getRoleFromPackage(packageJson);
+      const role = PackageRoles.getRoleFromPackage(packageJson);
       if (role === 'frontend') {
         console.log(`Skipping ${packageJson.name}`);
         return;
diff --git a/packages/cli/src/commands/new/new.ts b/packages/cli/src/commands/new/new.ts
index 8aaa671614..61e27af3c5 100644
--- a/packages/cli/src/commands/new/new.ts
+++ b/packages/cli/src/commands/new/new.ts
@@ -19,10 +19,10 @@ import fs from 'fs-extra';
 import { join as joinPath } from 'path';
 import { OptionValues } from 'commander';
 import { FactoryRegistry } from '../../lib/new/FactoryRegistry';
+import { isMonoRepo } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
 import { assertError } from '@backstage/errors';
 import { Task } from '../../lib/tasks';
-import { isMonoRepo } from '../../lib/monorepo/isMonoRepo';
 
 function parseOptions(optionStrings: string[]): Record<string, string> {
   const options: Record<string, string> = {};
diff --git a/packages/cli/src/commands/repo/build.ts b/packages/cli/src/commands/repo/build.ts
index d5602a4008..71e58c6201 100644
--- a/packages/cli/src/commands/repo/build.ts
+++ b/packages/cli/src/commands/repo/build.ts
@@ -18,11 +18,13 @@ import chalk from 'chalk';
 import { Command, OptionValues } from 'commander';
 import { relative as relativePath } from 'path';
 import { buildPackages, getOutputsForRole } from '../../lib/builder';
-import { PackageGraph } from '../../lib/monorepo';
-import { ExtendedPackage } from '../../lib/monorepo/PackageGraph';
-import { runParallelWorkers } from '../../lib/parallel';
 import { paths } from '../../lib/paths';
-import { detectRoleFromPackage } from '../../lib/role';
+import {
+  PackageGraph,
+  BackstagePackage,
+  PackageRoles,
+} from '@backstage/cli-node';
+import { runParallelWorkers } from '../../lib/parallel';
 import { buildFrontend } from '../build/buildFrontend';
 import { buildBackend } from '../build/buildBackend';
 
@@ -93,14 +95,15 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     packages = Array.from(withDevDependents).map(name => graph.get(name)!);
   }
 
-  const apps = new Array<ExtendedPackage>();
-  const backends = new Array<ExtendedPackage>();
+  const apps = new Array<BackstagePackage>();
+  const backends = new Array<BackstagePackage>();
 
   const parseBuildScript = createScriptOptionsParser(cmd, ['package', 'build']);
 
   const options = packages.flatMap(pkg => {
     const role =
-      pkg.packageJson.backstage?.role ?? detectRoleFromPackage(pkg.packageJson);
+      pkg.packageJson.backstage?.role ??
+      PackageRoles.detectRoleFromPackage(pkg.packageJson);
     if (!role) {
       console.warn(`Ignored ${pkg.packageJson.name} because it has no role`);
       return [];
diff --git a/packages/cli/src/commands/repo/clean.ts b/packages/cli/src/commands/repo/clean.ts
index 323746e089..13ff061423 100644
--- a/packages/cli/src/commands/repo/clean.ts
+++ b/packages/cli/src/commands/repo/clean.ts
@@ -18,7 +18,7 @@ import { execFile as execFileCb } from 'child_process';
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
 import { promisify } from 'util';
-import { PackageGraph } from '../../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
 
 const execFile = promisify(execFileCb);
diff --git a/packages/cli/src/commands/repo/lint.ts b/packages/cli/src/commands/repo/lint.ts
index 8e8ec20ff8..05fbf7b87e 100644
--- a/packages/cli/src/commands/repo/lint.ts
+++ b/packages/cli/src/commands/repo/lint.ts
@@ -17,11 +17,11 @@
 import chalk from 'chalk';
 import { OptionValues } from 'commander';
 import { relative as relativePath } from 'path';
-import { PackageGraph, ExtendedPackageJSON } from '../../lib/monorepo';
-import { runWorkerQueueThreads } from '../../lib/parallel';
+import { PackageGraph, BackstagePackageJson } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
+import { runWorkerQueueThreads } from '../../lib/parallel';
 
-function depCount(pkg: ExtendedPackageJSON) {
+function depCount(pkg: BackstagePackageJson) {
   const deps = pkg.dependencies ? Object.keys(pkg.dependencies).length : 0;
   const devDeps = pkg.devDependencies
     ? Object.keys(pkg.devDependencies).length
diff --git a/packages/cli/src/commands/repo/list-deprecations.ts b/packages/cli/src/commands/repo/list-deprecations.ts
index 97fa384561..69fe51f78e 100644
--- a/packages/cli/src/commands/repo/list-deprecations.ts
+++ b/packages/cli/src/commands/repo/list-deprecations.ts
@@ -18,8 +18,8 @@ import chalk from 'chalk';
 import { ESLint } from 'eslint';
 import { OptionValues } from 'commander';
 import { join as joinPath, relative as relativePath } from 'path';
+import { PackageGraph } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
-import { PackageGraph } from '../../lib/monorepo';
 
 export async function command(opts: OptionValues) {
   const packages = await PackageGraph.listTargetPackages();
diff --git a/packages/cli/src/commands/repo/test.ts b/packages/cli/src/commands/repo/test.ts
index 2dd778677a..1ca0da5495 100644
--- a/packages/cli/src/commands/repo/test.ts
+++ b/packages/cli/src/commands/repo/test.ts
@@ -16,7 +16,7 @@
 
 import os from 'os';
 import { Command, OptionValues } from 'commander';
-import { PackageGraph } from '../../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
 import { runCheck } from '../../lib/run';
 
diff --git a/packages/cli/src/commands/start/startFrontend.ts b/packages/cli/src/commands/start/startFrontend.ts
index 991439c010..e066a40e7a 100644
--- a/packages/cli/src/commands/start/startFrontend.ts
+++ b/packages/cli/src/commands/start/startFrontend.ts
@@ -19,10 +19,10 @@ import chalk from 'chalk';
 import uniq from 'lodash/uniq';
 import { serveBundle } from '../../lib/bundler';
 import { loadCliConfig } from '../../lib/config';
-import { paths } from '../../lib/paths';
+import { PackageGraph } from '@backstage/cli-node';
 import { Lockfile } from '../../lib/versioning';
 import { forbiddenDuplicatesFilter, includedFilter } from '../versions/lint';
-import { PackageGraph } from '../../lib/monorepo';
+import { paths } from '../../lib/paths';
 
 interface StartAppOptions {
   verifyVersions?: boolean;
diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts
index 45b966a52d..997e5f8e60 100644
--- a/packages/cli/src/commands/versions/bump.ts
+++ b/packages/cli/src/commands/versions/bump.ts
@@ -39,7 +39,7 @@ import {
   ReleaseManifest,
 } from '@backstage/release-manifests';
 import 'global-agent/bootstrap';
-import { PackageGraph } from '../../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 
 const DEP_TYPES = [
   'dependencies',
diff --git a/packages/cli/src/commands/versions/lint.ts b/packages/cli/src/commands/versions/lint.ts
index 8de38548a9..9466fd0ab7 100644
--- a/packages/cli/src/commands/versions/lint.ts
+++ b/packages/cli/src/commands/versions/lint.ts
@@ -18,7 +18,7 @@ import { OptionValues } from 'commander';
 import { Lockfile } from '../../lib/versioning';
 import { paths } from '../../lib/paths';
 import partition from 'lodash/partition';
-import { PackageGraph } from '../../lib/monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 
 // Packages that we try to avoid duplicates for
 const INCLUDED = [/^@backstage\//];
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 7bd10cfcc3..8035796cba 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -30,9 +30,9 @@ import { RollupOptions, OutputOptions, RollupWarning } from 'rollup';
 import { forwardFileImports } from './plugins';
 import { BuildOptions, Output } from './types';
 import { paths } from '../paths';
+import { BackstagePackageJson } from '@backstage/cli-node';
 import { svgrTemplate } from '../svgrTemplate';
-import { ExtendedPackageJSON } from '../monorepo';
-import { readEntryPoints } from '../monorepo/entryPoints';
+import { readEntryPoints } from '../entryPoints';
 
 const SCRIPT_EXTS = ['.js', '.jsx', '.ts', '.tsx'];
 
@@ -58,7 +58,7 @@ export async function makeRollupConfigs(
   let targetPkg = options.packageJson;
   if (!targetPkg) {
     const packagePath = resolvePath(targetDir, 'package.json');
-    targetPkg = (await fs.readJson(packagePath)) as ExtendedPackageJSON;
+    targetPkg = (await fs.readJson(packagePath)) as BackstagePackageJson;
   }
 
   const onwarn = ({ code, message }: RollupWarning) => {
diff --git a/packages/cli/src/lib/builder/packager.ts b/packages/cli/src/lib/builder/packager.ts
index c2256c8417..780f9c2cfe 100644
--- a/packages/cli/src/lib/builder/packager.ts
+++ b/packages/cli/src/lib/builder/packager.ts
@@ -22,7 +22,7 @@ import { paths } from '../paths';
 import { makeRollupConfigs } from './config';
 import { BuildOptions, Output } from './types';
 import { buildTypeDefinitions } from './buildTypeDefinitions';
-import { getRoleInfo } from '../role';
+import { PackageRoles } from '@backstage/cli-node';
 import { runParallelWorkers } from '../parallel';
 
 export function formatErrorMessage(error: any) {
@@ -152,7 +152,7 @@ export const buildPackages = async (options: BuildOptions[]) => {
 export function getOutputsForRole(role: string): Set<Output> {
   const outputs = new Set<Output>();
 
-  for (const output of getRoleInfo(role).output) {
+  for (const output of PackageRoles.getRoleInfo(role).output) {
     if (output === 'cjs') {
       outputs.add(Output.cjs);
     }
diff --git a/packages/cli/src/lib/builder/types.ts b/packages/cli/src/lib/builder/types.ts
index de7e9b10eb..330419235f 100644
--- a/packages/cli/src/lib/builder/types.ts
+++ b/packages/cli/src/lib/builder/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ExtendedPackageJSON } from '../monorepo';
+import { BackstagePackageJson } from '@backstage/cli-node';
 
 export enum Output {
   esm,
@@ -25,7 +25,7 @@ export enum Output {
 export type BuildOptions = {
   logPrefix?: string;
   targetDir?: string;
-  packageJson?: ExtendedPackageJSON;
+  packageJson?: BackstagePackageJson;
   outputs: Set<Output>;
   minify?: boolean;
   useApiExtractor?: boolean;
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 6fc7482dce..94b2a1c561 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -32,12 +32,12 @@ import { LinkedPackageResolvePlugin } from './LinkedPackageResolvePlugin';
 import { BundlingOptions, BackendBundlingOptions } from './types';
 import { version } from '../../lib/version';
 import { paths as cliPaths } from '../../lib/paths';
+import { BackstagePackage } from '@backstage/cli-node';
 import { runPlain } from '../run';
 import ESLintPlugin from 'eslint-webpack-plugin';
 import pickBy from 'lodash/pickBy';
 import yn from 'yn';
-import { readEntryPoints } from '../monorepo/entryPoints';
-import { ExtendedPackage } from '../monorepo';
+import { readEntryPoints } from '../entryPoints';
 
 const BUILD_CACHE_ENV_VAR = 'BACKSTAGE_CLI_EXPERIMENTAL_BUILD_CACHE';
 
@@ -235,7 +235,7 @@ export async function createBackendConfig(
   // Find all local monorepo packages and their node_modules, and mark them as external.
   const { packages } = await getPackages(cliPaths.targetDir);
   const localPackageEntryPoints = packages.flatMap(p => {
-    const entryPoints = readEntryPoints((p as ExtendedPackage).packageJson);
+    const entryPoints = readEntryPoints((p as BackstagePackage).packageJson);
     return entryPoints.map(e => posixPath.join(p.packageJson.name, e.mount));
   });
   const moduleDirs = packages.map(p => resolvePath(p.dir, 'node_modules'));
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
index a76571c3f6..b34e1280c0 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/lib/config.ts
@@ -23,7 +23,7 @@ import { ConfigReader } from '@backstage/config';
 import { paths } from './paths';
 import { isValidUrl } from './urls';
 import { getPackages } from '@manypkg/get-packages';
-import { PackageGraph } from './monorepo';
+import { PackageGraph } from '@backstage/cli-node';
 
 type Options = {
   args: string[];
diff --git a/packages/cli/src/lib/monorepo/entryPoints.ts b/packages/cli/src/lib/entryPoints.ts
similarity index 93%
rename from packages/cli/src/lib/monorepo/entryPoints.ts
rename to packages/cli/src/lib/entryPoints.ts
index 1e1fd7ed27..1f6e2feec2 100644
--- a/packages/cli/src/lib/monorepo/entryPoints.ts
+++ b/packages/cli/src/lib/entryPoints.ts
@@ -15,7 +15,7 @@
  */
 
 import { extname } from 'path';
-import { ExtendedPackageJSON } from './PackageGraph';
+import { BackstagePackageJson } from '@backstage/cli-node';
 
 export interface EntryPoint {
   mount: string;
@@ -47,7 +47,7 @@ function parseEntryPoint(mount: string, path: string): EntryPoint {
   return { mount, path, name, ext: extname(path) };
 }
 
-export function readEntryPoints(pkg: ExtendedPackageJSON): Array<EntryPoint> {
+export function readEntryPoints(pkg: BackstagePackageJson): Array<EntryPoint> {
   const exp = pkg.exports;
   if (typeof exp === 'string') {
     return [defaultIndex];
diff --git a/packages/cli/src/lib/git.ts b/packages/cli/src/lib/git.ts
deleted file mode 100644
index c0b50f5140..0000000000
--- a/packages/cli/src/lib/git.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2022 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { assertError, ForwardedError } from '@backstage/errors';
-import { execFile as execFileCb } from 'child_process';
-import { promisify } from 'util';
-import { paths } from './paths';
-
-const execFile = promisify(execFileCb);
-
-/**
- * Run a git command, trimming the output splitting it into lines.
- */
-export async function runGit(...args: string[]) {
-  try {
-    const { stdout } = await execFile('git', args, {
-      shell: true,
-      cwd: paths.targetRoot,
-    });
-    return stdout.trim().split(/\r\n|\r|\n/);
-  } catch (error) {
-    assertError(error);
-    if (error.stderr || typeof error.code === 'number') {
-      const stderr = (error.stderr as undefined | Buffer)?.toString('utf8');
-      const msg = stderr?.trim() ?? `with exit code ${error.code}`;
-      throw new Error(`git ${args[0]} failed, ${msg}`);
-    }
-    throw new ForwardedError('Unknown execution error', error);
-  }
-}
-
-/**
- * Returns a sorted list of all files that have changed since the merge base
- * of the provided `ref` and HEAD, as well as all files that are not tracked by git.
- */
-export async function listChangedFiles(ref: string) {
-  if (!ref) {
-    throw new Error('ref is required');
-  }
-
-  let diffRef = ref;
-  try {
-    const [base] = await runGit('merge-base', 'HEAD', ref);
-    diffRef = base;
-  } catch {
-    // silently fall back to using the ref directly if merge base is not available
-  }
-
-  const tracked = await runGit('diff', '--name-only', diffRef);
-  const untracked = await runGit('ls-files', '--others', '--exclude-standard');
-
-  return Array.from(new Set([...tracked, ...untracked]));
-}
-
-/**
- * Returns the contents of a file at a specific ref.
- */
-export async function readFileAtRef(path: string, ref: string) {
-  let showRef = ref;
-  try {
-    const [base] = await runGit('merge-base', 'HEAD', ref);
-    showRef = base;
-  } catch {
-    // silently fall back to using the ref directly if merge base is not available
-  }
-
-  const { stdout } = await execFile('git', ['show', `${showRef}:${path}`], {
-    shell: true,
-    cwd: paths.targetRoot,
-    maxBuffer: 1024 * 1024 * 50,
-  });
-  return stdout;
-}
diff --git a/packages/cli/src/lib/packager/createDistWorkspace.ts b/packages/cli/src/lib/packager/createDistWorkspace.ts
index 2d2967fc44..ab8b20919f 100644
--- a/packages/cli/src/lib/packager/createDistWorkspace.ts
+++ b/packages/cli/src/lib/packager/createDistWorkspace.ts
@@ -30,7 +30,6 @@ import {
   dependencies as cliDependencies,
   devDependencies as cliDevDependencies,
 } from '../../../package.json';
-import { PackageGraph, PackageGraphNode } from '../monorepo';
 import {
   BuildOptions,
   buildPackages,
@@ -38,7 +37,11 @@ import {
   Output,
 } from '../builder';
 import { productionPack } from './productionPack';
-import { getRoleInfo } from '../role';
+import {
+  PackageRoles,
+  PackageGraph,
+  PackageGraphNode,
+} from '@backstage/cli-node';
 import { runParallelWorkers } from '../parallel';
 
 // These packages aren't safe to pack in parallel since the CLI depends on them
@@ -60,6 +63,11 @@ type Options = {
    */
   targetDir?: string;
 
+  /**
+   * Configuration files to load during packaging.
+   */
+  configPaths?: string[];
+
   /**
    * Files to copy into the target workspace.
    *
@@ -127,13 +135,18 @@ export async function createDistWorkspace(
 
   if (options.buildDependencies) {
     const exclude = options.buildExcludes ?? [];
+    const configPaths = options.configPaths ?? [];
 
     const toBuild = new Set(
       targets.map(_ => _.name).filter(name => !exclude.includes(name)),
     );
 
     const standardBuilds = new Array<BuildOptions>();
-    const customBuild = new Array<{ dir: string; name: string }>();
+    const customBuild = new Array<{
+      dir: string;
+      name: string;
+      args?: string[];
+    }>();
 
     for (const pkg of packages) {
       if (!toBuild.has(pkg.packageJson.name)) {
@@ -162,11 +175,14 @@ export async function createDistWorkspace(
         continue;
       }
 
-      if (getRoleInfo(role).output.includes('bundle')) {
+      if (PackageRoles.getRoleInfo(role).output.includes('bundle')) {
         console.warn(
           `Building ${pkg.packageJson.name} separately because it is a bundled package`,
         );
-        customBuild.push({ dir: pkg.dir, name: pkg.packageJson.name });
+        const args = buildScript.includes('--config')
+          ? []
+          : configPaths.map(p => ['--config', p]).flat();
+        customBuild.push({ dir: pkg.dir, name: pkg.packageJson.name, args });
         continue;
       }
 
@@ -193,8 +209,8 @@ export async function createDistWorkspace(
     if (customBuild.length > 0) {
       await runParallelWorkers({
         items: customBuild,
-        worker: async ({ name, dir }) => {
-          await run('yarn', ['run', 'build'], {
+        worker: async ({ name, dir, args }) => {
+          await run('yarn', ['run', 'build', ...(args || [])], {
             cwd: dir,
             stdoutLogFunc: prefixLogFunc(`${name}: `, 'stdout'),
             stderrLogFunc: prefixLogFunc(`${name}: `, 'stderr'),
diff --git a/packages/cli/src/lib/packager/productionPack.ts b/packages/cli/src/lib/packager/productionPack.ts
index 30f4545b24..aea5df649a 100644
--- a/packages/cli/src/lib/packager/productionPack.ts
+++ b/packages/cli/src/lib/packager/productionPack.ts
@@ -17,8 +17,8 @@
 import fs from 'fs-extra';
 import npmPackList from 'npm-packlist';
 import { resolve as resolvePath, posix as posixPath } from 'path';
-import { ExtendedPackageJSON } from '../monorepo';
-import { readEntryPoints } from '../monorepo/entryPoints';
+import { BackstagePackageJson } from '@backstage/cli-node';
+import { readEntryPoints } from '../entryPoints';
 
 const PKG_PATH = 'package.json';
 const PKG_BACKUP_PATH = 'package.json-prepack';
@@ -35,7 +35,7 @@ export async function productionPack(options: ProductionPackOptions) {
   const { packageDir, targetDir } = options;
   const pkgPath = resolvePath(packageDir, PKG_PATH);
   const pkgContent = await fs.readFile(pkgPath, 'utf8');
-  const pkg = JSON.parse(pkgContent) as ExtendedPackageJSON;
+  const pkg = JSON.parse(pkgContent) as BackstagePackageJson;
 
   // If we're making the update in-line, back up the package.json
   if (!targetDir) {
@@ -147,7 +147,7 @@ function resolveEntrypoint(pkg: any, name: string) {
 
 // Writes e.g. alpha/package.json
 async function writeReleaseStageEntrypoint(
-  pkg: ExtendedPackageJSON,
+  pkg: BackstagePackageJson,
   stage: 'alpha' | 'beta',
   targetDir: string,
 ) {
@@ -178,7 +178,7 @@ const EXPORT_MAP = {
  * entry points for importers that don't support exports.
  */
 async function prepareExportsEntryPoints(
-  pkg: ExtendedPackageJSON,
+  pkg: BackstagePackageJson,
   packageDir: string,
 ) {
   const distPath = resolvePath(packageDir, 'dist');
diff --git a/packages/cli/src/lib/role.test.ts b/packages/cli/src/lib/role.test.ts
new file mode 100644
index 0000000000..adca2d70b8
--- /dev/null
+++ b/packages/cli/src/lib/role.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import mockFs from 'mock-fs';
+import { Command } from 'commander';
+import { findRoleFromCommand } from './role';
+
+describe('findRoleFromCommand', () => {
+  function mkCommand(args: string) {
+    const parsed = new Command()
+      .option('--role <role>', 'test role')
+      .parse(['node', 'entry.js', ...args.split(' ')]) as Command;
+    return parsed.opts();
+  }
+
+  beforeEach(() => {
+    mockFs({
+      'package.json': JSON.stringify({
+        name: 'test',
+        backstage: {
+          role: 'web-library',
+        },
+      }),
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+  });
+
+  it('provides role info by role', async () => {
+    await expect(findRoleFromCommand(mkCommand(''))).resolves.toEqual(
+      'web-library',
+    );
+
+    await expect(
+      findRoleFromCommand(mkCommand('--role node-library')),
+    ).resolves.toEqual('node-library');
+
+    await expect(
+      findRoleFromCommand(mkCommand('--role invalid')),
+    ).rejects.toThrow(`Unknown package role 'invalid'`);
+  });
+});
diff --git a/packages/cli/src/lib/role.ts b/packages/cli/src/lib/role.ts
new file mode 100644
index 0000000000..49f39f789c
--- /dev/null
+++ b/packages/cli/src/lib/role.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 fs from 'fs-extra';
+import { OptionValues } from 'commander';
+import { paths } from './paths';
+import { PackageRoles, PackageRole } from '@backstage/cli-node';
+
+export async function findRoleFromCommand(
+  opts: OptionValues,
+): Promise<PackageRole> {
+  if (opts.role) {
+    return PackageRoles.getRoleInfo(opts.role)?.role;
+  }
+
+  const pkg = await fs.readJson(paths.resolveTarget('package.json'));
+  const info = PackageRoles.getRoleFromPackage(pkg);
+  if (!info) {
+    throw new Error(`Target package must have 'backstage.role' set`);
+  }
+  return info;
+}
diff --git a/packages/cli/src/lib/role/packageRoles.ts b/packages/cli/src/lib/role/packageRoles.ts
deleted file mode 100644
index 685848fd26..0000000000
--- a/packages/cli/src/lib/role/packageRoles.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2022 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { z } from 'zod';
-import fs from 'fs-extra';
-import { OptionValues } from 'commander';
-import { paths } from '../paths';
-import { PackageRole, PackageRoleInfo } from './types';
-
-const packageRoleInfos: PackageRoleInfo[] = [
-  {
-    role: 'frontend',
-    platform: 'web',
-    output: ['bundle'],
-  },
-  {
-    role: 'backend',
-    platform: 'node',
-    output: ['bundle'],
-  },
-  {
-    role: 'cli',
-    platform: 'node',
-    output: ['cjs'],
-  },
-  {
-    role: 'web-library',
-    platform: 'web',
-    output: ['types', 'esm'],
-  },
-  {
-    role: 'node-library',
-    platform: 'node',
-    output: ['types', 'cjs'],
-  },
-  {
-    role: 'common-library',
-    platform: 'common',
-    output: ['types', 'esm', 'cjs'],
-  },
-  {
-    role: 'frontend-plugin',
-    platform: 'web',
-    output: ['types', 'esm'],
-  },
-  {
-    role: 'frontend-plugin-module',
-    platform: 'web',
-    output: ['types', 'esm'],
-  },
-  {
-    role: 'backend-plugin',
-    platform: 'node',
-    output: ['types', 'cjs'],
-  },
-  {
-    role: 'backend-plugin-module',
-    platform: 'node',
-    output: ['types', 'cjs'],
-  },
-];
-
-export function getRoleInfo(role: string): PackageRoleInfo {
-  const roleInfo = packageRoleInfos.find(r => r.role === role);
-  if (!roleInfo) {
-    throw new Error(`Unknown package role '${role}'`);
-  }
-  return roleInfo;
-}
-
-const readSchema = z.object({
-  name: z.string().optional(),
-  backstage: z
-    .object({
-      role: z.string().optional(),
-    })
-    .optional(),
-});
-
-export function getRoleFromPackage(pkgJson: unknown): PackageRole | undefined {
-  const pkg = readSchema.parse(pkgJson);
-
-  // If there's an explicit role, use that.
-  if (pkg.backstage) {
-    const { role } = pkg.backstage;
-    if (!role) {
-      throw new Error(
-        `Package ${pkg.name} must specify a role in the "backstage" field`,
-      );
-    }
-
-    return getRoleInfo(role).role;
-  }
-
-  return undefined;
-}
-
-export async function findRoleFromCommand(
-  opts: OptionValues,
-): Promise<PackageRole> {
-  if (opts.role) {
-    return getRoleInfo(opts.role)?.role;
-  }
-
-  const pkg = await fs.readJson(paths.resolveTarget('package.json'));
-  const info = getRoleFromPackage(pkg);
-  if (!info) {
-    throw new Error(`Target package must have 'backstage.role' set`);
-  }
-  return info;
-}
-
-const detectionSchema = z.object({
-  name: z.string().optional(),
-  scripts: z
-    .object({
-      start: z.string().optional(),
-      build: z.string().optional(),
-    })
-    .optional(),
-  publishConfig: z
-    .object({
-      main: z.string().optional(),
-      types: z.string().optional(),
-      module: z.string().optional(),
-    })
-    .optional(),
-  main: z.string().optional(),
-  types: z.string().optional(),
-  module: z.string().optional(),
-});
-
-export function detectRoleFromPackage(
-  pkgJson: unknown,
-): PackageRole | undefined {
-  const pkg = detectionSchema.parse(pkgJson);
-
-  if (pkg.scripts?.start?.includes('app:serve')) {
-    return 'frontend';
-  }
-  if (pkg.scripts?.build?.includes('backend:bundle')) {
-    return 'backend';
-  }
-  if (pkg.name?.includes('plugin-') && pkg.name?.includes('-backend-module-')) {
-    return 'backend-plugin-module';
-  }
-  if (pkg.name?.includes('plugin-') && pkg.name?.includes('-module-')) {
-    return 'frontend-plugin-module';
-  }
-  if (pkg.scripts?.start?.includes('plugin:serve')) {
-    return 'frontend-plugin';
-  }
-  if (pkg.scripts?.start?.includes('backend:dev')) {
-    return 'backend-plugin';
-  }
-
-  const mainEntry = pkg.publishConfig?.main || pkg.main;
-  const moduleEntry = pkg.publishConfig?.module || pkg.module;
-  const typesEntry = pkg.publishConfig?.types || pkg.types;
-  if (typesEntry) {
-    if (mainEntry && moduleEntry) {
-      return 'common-library';
-    }
-    if (moduleEntry || mainEntry?.endsWith('.esm.js')) {
-      return 'web-library';
-    }
-    if (mainEntry) {
-      return 'node-library';
-    }
-  } else if (mainEntry) {
-    return 'cli';
-  }
-
-  return undefined;
-}
diff --git a/packages/cli/src/lib/versioning/Lockfile.test.ts b/packages/cli/src/lib/versioning/Lockfile.test.ts
index 0275c5ee50..909f8be9aa 100644
--- a/packages/cli/src/lib/versioning/Lockfile.test.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.test.ts
@@ -16,7 +16,7 @@
 
 import fs from 'fs-extra';
 import mockFs from 'mock-fs';
-import { ExtendedPackage } from '../monorepo';
+import { BackstagePackage } from '@backstage/cli-node';
 import { Lockfile } from './Lockfile';
 
 const LEGACY_HEADER = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
@@ -290,7 +290,7 @@ describe('New Lockfile', () => {
           'b',
           {
             packageJson: { version: '2.0.1' },
-          } as ExtendedPackage,
+          } as BackstagePackage,
         ],
       ]),
     });
@@ -319,468 +319,4 @@ describe('New Lockfile', () => {
       mockANewLocalDedup,
     );
   });
-
-  describe('diff', () => {
-    const lockfileLegacyA = Lockfile.parse(`${LEGACY_HEADER}
-a@^1:
-  version "1.0.1"
-  resolved "https://my-registry/a-1.0.01.tgz#abc123"
-  integrity sha512-xyz
-  dependencies:
-    b "^2"
-
-b@3:
-  version "3.0.1"
-  integrity sha512-abc1
-
-b@2.0.x:
-  version "2.0.1"
-  integrity sha512-abc2
-
-b@^2:
-  version "2.0.0"
-  integrity sha512-abc3
-
-c@^1:
-  version "1.0.1"
-  integrity x
-`);
-
-    const lockfileLegacyB = Lockfile.parse(`${LEGACY_HEADER}
-a@^1:
-  version "1.0.1"
-  resolved "https://my-registry/a-1.0.01.tgz#abc123"
-  integrity sha512-xyz-other
-  dependencies:
-    b "^2"
-
-b@2.0.x, b@^2:
-  version "2.0.0"
-  integrity sha512-abc3
-
-b@4:
-  version "4.0.0"
-  integrity sha512-abc
-
-d@^1:
-  version "1.0.1"
-  integrity x
-`);
-
-    const lockfileModernA = Lockfile.parse(`${MODERN_HEADER}
-"a@npm:^1":
-  version: "1.0.1"
-  resolved: "https://my-registry/a-1.0.01.tgz#abc123"
-  checksum: sha512-xyz
-  dependencies:
-    b: "^2"
-
-"b@npm:3":
-  version: "3.0.1"
-  checksum: sha512-abc1
-
-"b@npm:2.0.x":
-  version: "2.0.1"
-  checksum: sha512-abc2
-
-"b@npm:^2":
-  version: "2.0.0"
-  checksum: sha512-abc3
-
-"c@npm:^1":
-  version: "1.0.1"
-  checksum: x
-`);
-
-    const lockfileModernB = Lockfile.parse(`${MODERN_HEADER}
-"a@npm:^1":
-  version: "1.0.1"
-  resolution: "a@npm:1.0.1"
-  checksum: sha512-xyz-other
-  dependencies:
-    b: "^2"
-
-"b@npm:2.0.x, b@npm:^2":
-  version: "2.0.0"
-  checksum: sha512-abc3
-
-"b@npm:4":
-  version: "4.0.0"
-  checksum: sha512-abc
-
-"d@npm:^1":
-  version: "1.0.1"
-  checksum: x
-`);
-
-    it('should diff two legacy lockfiles', async () => {
-      expect(lockfileLegacyA.diff(lockfileLegacyB)).toEqual({
-        added: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-      });
-      expect(lockfileLegacyB.diff(lockfileLegacyA)).toEqual({
-        added: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-      });
-    });
-
-    it('should diff two modern lockfiles', async () => {
-      expect(lockfileModernA.diff(lockfileModernB)).toEqual({
-        added: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-      });
-      expect(lockfileModernB.diff(lockfileModernA)).toEqual({
-        added: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-      });
-    });
-
-    it('should diff legacy and modern lockfiles', async () => {
-      expect(lockfileLegacyA.diff(lockfileModernB)).toEqual({
-        added: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-      });
-      expect(lockfileLegacyB.diff(lockfileModernA)).toEqual({
-        added: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-      });
-    });
-
-    it('should diff modern and legacy lockfiles', async () => {
-      expect(lockfileModernA.diff(lockfileLegacyB)).toEqual({
-        added: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-      });
-      expect(lockfileModernB.diff(lockfileLegacyA)).toEqual({
-        added: [
-          { name: 'b', range: '4' },
-          { name: 'd', range: '^1' },
-        ],
-        changed: [
-          { name: 'a', range: '^1' },
-          { name: 'b', range: '2.0.x' },
-        ],
-        removed: [
-          { name: 'b', range: '3' },
-          { name: 'c', range: '^1' },
-        ],
-      });
-    });
-
-    it('should handle workspace ranges', async () => {
-      const lockfile = `${MODERN_HEADER}
-"@backstage/app-defaults@workspace:^, @backstage/app-defaults@workspace:packages/app-defaults":
-  version: 0.0.0-use.local
-  resolution: "@backstage/app-defaults@workspace:packages/app-defaults"
-  dependencies:
-    "@backstage/cli": "workspace:^"
-    "@backstage/core-app-api": "workspace:^"
-    "@backstage/core-components": "workspace:^"
-    "@backstage/core-plugin-api": "workspace:^"
-    "@backstage/plugin-permission-react": "workspace:^"
-    "@backstage/test-utils": "workspace:^"
-    "@backstage/theme": "workspace:^"
-    "@material-ui/core": ^4.12.2
-    "@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
-    react-dom: ^16.13.1 || ^17.0.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  languageName: unknown
-  linkType: soft
-
-"@backstage/backend-app-api@workspace:^, @backstage/backend-app-api@workspace:packages/backend-app-api":
-  version: 0.0.0-use.local
-  resolution: "@backstage/backend-app-api@workspace:packages/backend-app-api"
-  dependencies:
-    "@backstage/backend-common": "workspace:^"
-    "@backstage/backend-plugin-api": "workspace:^"
-    "@backstage/backend-tasks": "workspace:^"
-    "@backstage/cli": "workspace:^"
-    "@backstage/errors": "workspace:^"
-    "@backstage/plugin-permission-node": "workspace:^"
-    express: ^4.17.1
-    express-promise-router: ^4.1.0
-    winston: ^3.2.1
-  languageName: unknown
-  linkType: soft
-`;
-      expect(Lockfile.parse(lockfile).diff(Lockfile.parse(lockfile))).toEqual({
-        added: [],
-        changed: [],
-        removed: [],
-      });
-    });
-  });
-
-  describe('createSimplifiedDependencyGraph', () => {
-    it('for modern lockfile', () => {
-      expect(
-        Lockfile.parse(
-          `${MODERN_HEADER}
-"@backstage/app-defaults@workspace:^, @backstage/app-defaults@workspace:packages/app-defaults":
-  version: 0.0.0-use.local
-  resolution: "@backstage/app-defaults@workspace:packages/app-defaults"
-  dependencies:
-    "@backstage/cli": "workspace:^"
-    "@backstage/core-app-api": "workspace:^"
-    "@backstage/core-components": "workspace:^"
-    "@backstage/core-plugin-api": "workspace:^"
-    "@backstage/plugin-permission-react": "workspace:^"
-    "@backstage/test-utils": "workspace:^"
-    "@backstage/theme": "workspace:^"
-    "@material-ui/core": ^4.12.2
-    "@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
-    react-dom: ^16.13.1 || ^17.0.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  languageName: unknown
-  linkType: soft
-
-"@backstage/backend-app-api@workspace:^, @backstage/backend-app-api@workspace:packages/backend-app-api":
-  version: 0.0.0-use.local
-  resolution: "@backstage/backend-app-api@workspace:packages/backend-app-api"
-  dependencies:
-    "@backstage/backend-common": "workspace:^"
-    "@backstage/backend-plugin-api": "workspace:^"
-    "@backstage/backend-tasks": "workspace:^"
-    "@backstage/cli": "workspace:^"
-    "@backstage/errors": "workspace:^"
-    "@backstage/plugin-permission-node": "workspace:^"
-    express: ^4.17.1
-    express-promise-router: ^4.1.0
-    winston: ^3.2.1
-  languageName: unknown
-  linkType: soft
-`,
-        ).createSimplifiedDependencyGraph(),
-      ).toEqual(
-        new Map([
-          [
-            '@backstage/app-defaults',
-            new Set([
-              '@backstage/cli',
-              '@backstage/core-app-api',
-              '@backstage/core-components',
-              '@backstage/core-plugin-api',
-              '@backstage/plugin-permission-react',
-              '@backstage/test-utils',
-              '@backstage/theme',
-              '@material-ui/core',
-              '@material-ui/icons',
-              '@testing-library/jest-dom',
-              '@testing-library/react',
-              '@types/node',
-              '@types/react',
-              'react',
-              'react-dom',
-              'react-router-dom',
-            ]),
-          ],
-          [
-            '@backstage/backend-app-api',
-            new Set([
-              '@backstage/backend-common',
-              '@backstage/backend-plugin-api',
-              '@backstage/backend-tasks',
-              '@backstage/cli',
-              '@backstage/errors',
-              '@backstage/plugin-permission-node',
-              'express',
-              'express-promise-router',
-              'winston',
-            ]),
-          ],
-        ]),
-      );
-    });
-
-    it('for simple lockfile without dependencies', () => {
-      expect(
-        Lockfile.parse(
-          `${MODERN_HEADER}
-"a@npm:^1":
-  version: "1.0.1"
-
-"b@npm:3":
-  version: "3.0.1"
-
-"b@npm:2.0.x":
-  version: "2.0.1"
-  checksum: sha512-abc2
-`,
-        ).createSimplifiedDependencyGraph(),
-      ).toEqual(
-        new Map([
-          ['a', new Set()],
-          ['b', new Set()],
-        ]),
-      );
-    });
-
-    it('for lockfile with dependencies', () => {
-      expect(
-        Lockfile.parse(
-          `${MODERN_HEADER}
-"a@npm:^1":
-  version: "1.0.1"
-  dependencies:
-    b: "^2"
-
-"b@npm:3":
-  version: "3.0.1"
-  checksum: sha512-abc1
-
-"b@npm:2.0.x":
-  version: "2.0.1"
-  checksum: sha512-abc2
-  dependencies:
-    c: "^1"
-
-"b@npm:^2":
-  version: "2.0.0"
-  checksum: sha512-abc3
-  peerDependencies:
-    d: "^1"
-
-"c@npm:^1":
-  version: "1.0.1"
-
-"d@npm:^1":
-  version: "1.0.2"
-`,
-        ).createSimplifiedDependencyGraph(),
-      ).toEqual(
-        new Map([
-          ['a', new Set(['b'])],
-          ['b', new Set(['c', 'd'])],
-          ['c', new Set()],
-          ['d', new Set()],
-        ]),
-      );
-    });
-
-    it('for legacy lockfile', () => {
-      expect(
-        Lockfile.parse(
-          `${LEGACY_HEADER}
-a@^1:
-  version "1.0.1"
-  dependencies:
-    b "^2"
-
-b@3:
-  version "3.0.1"
-  integrity sha512-abc1
-
-b@2.0.x:
-  version "2.0.1"
-  integrity sha512-abc2
-  dependencies:
-    c "^1"
-
-b@^2:
-  version "2.0.0"
-  integrity sha512-abc3
-  dependencies:
-    d "^1"
-
-c@^1:
-  version "1.0.1"
-  integrity x
-
-d@^1:
-  version "1.0.1"
-  integrity x
-`,
-        ).createSimplifiedDependencyGraph(),
-      ).toEqual(
-        new Map([
-          ['a', new Set(['b'])],
-          ['b', new Set(['c', 'd'])],
-          ['c', new Set()],
-          ['d', new Set()],
-        ]),
-      );
-    });
-  });
 });
diff --git a/packages/cli/src/lib/versioning/Lockfile.ts b/packages/cli/src/lib/versioning/Lockfile.ts
index 4eadaf55f9..50d0a77cfd 100644
--- a/packages/cli/src/lib/versioning/Lockfile.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.ts
@@ -18,7 +18,7 @@ import fs from 'fs-extra';
 import semver from 'semver';
 import { parseSyml, stringifySyml } from '@yarnpkg/parsers';
 import { stringify as legacyStringifyLockfile } from '@yarnpkg/lockfile';
-import { ExtendedPackage } from '../monorepo';
+import { BackstagePackage } from '@backstage/cli-node';
 
 const ENTRY_PATTERN = /^((?:@[^/]+\/)?[^@/]+)@(.+)$/;
 
@@ -39,17 +39,6 @@ type LockfileQueryEntry = {
   dataKey: string;
 };
 
-type LockfileDiffEntry = {
-  name: string;
-  range: string;
-};
-
-type LockfileDiff = {
-  added: LockfileDiffEntry[];
-  changed: LockfileDiffEntry[];
-  removed: LockfileDiffEntry[];
-};
-
 /** Entries that have an invalid version range, for example an npm tag */
 type AnalyzeResultInvalidRange = {
   name: string;
@@ -167,7 +156,7 @@ export class Lockfile {
   /** Analyzes the lockfile to identify possible actions and warnings for the entries */
   analyze(options: {
     filter?: (name: string) => boolean;
-    localPackages: Map<string, ExtendedPackage>;
+    localPackages: Map<string, BackstagePackage>;
   }): AnalyzeResult {
     const { filter, localPackages } = options;
     const result: AnalyzeResult = {
@@ -340,84 +329,6 @@ export class Lockfile {
     }
   }
 
-  createSimplifiedDependencyGraph(): Map<string, Set<string>> {
-    const graph = new Map<string, Set<string>>();
-
-    for (const [name, entries] of this.packages) {
-      const dependencies = new Set(
-        entries.flatMap(e => {
-          const data = this.data[e.dataKey];
-          return [
-            ...Object.keys(data?.dependencies ?? {}),
-            ...Object.keys(data?.peerDependencies ?? {}),
-          ];
-        }),
-      );
-      graph.set(name, dependencies);
-    }
-
-    return graph;
-  }
-
-  /**
-   * Diff with another lockfile, returning entries that have been
-   * added, changed, and removed compared to the other lockfile.
-   */
-  diff(otherLockfile: Lockfile): LockfileDiff {
-    const diff = {
-      added: new Array<{ name: string; range: string }>(),
-      changed: new Array<{ name: string; range: string }>(),
-      removed: new Array<{ name: string; range: string }>(),
-    };
-
-    // Keeps track of packages that only exist in this lockfile
-    const remainingOldNames = new Set(this.packages.keys());
-
-    for (const [name, otherQueries] of otherLockfile.packages) {
-      remainingOldNames.delete(name);
-
-      const thisQueries = this.packages.get(name);
-      // If the packages doesn't exist in this lockfile, add all entries
-      if (!thisQueries) {
-        diff.removed.push(...otherQueries.map(q => ({ name, range: q.range })));
-        continue;
-      }
-
-      const remainingOldRanges = new Set(thisQueries.map(q => q.range));
-
-      for (const otherQuery of otherQueries) {
-        remainingOldRanges.delete(otherQuery.range);
-
-        const thisQuery = thisQueries.find(q => q.range === otherQuery.range);
-        if (!thisQuery) {
-          diff.removed.push({ name, range: otherQuery.range });
-          continue;
-        }
-
-        const otherPkg = otherLockfile.data[otherQuery.dataKey];
-        const thisPkg = this.data[thisQuery.dataKey];
-        if (otherPkg && thisPkg) {
-          const thisCheck = thisPkg.integrity || thisPkg.checksum;
-          const otherCheck = otherPkg.integrity || otherPkg.checksum;
-          if (thisCheck !== otherCheck) {
-            diff.changed.push({ name, range: otherQuery.range });
-          }
-        }
-      }
-
-      for (const thisRange of remainingOldRanges) {
-        diff.added.push({ name, range: thisRange });
-      }
-    }
-
-    for (const name of remainingOldNames) {
-      const queries = this.packages.get(name) ?? [];
-      diff.added.push(...queries.map(q => ({ name, range: q.range })));
-    }
-
-    return diff;
-  }
-
   async save(path: string) {
     await fs.writeFile(path, this.toString(), 'utf8');
   }
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 35eeb8147b..b681a92beb 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/core-app-api
 
+## 1.7.0-next.3
+
+### Minor Changes
+
+- c15e0cedbe1: The `AuthConnector` interface now supports specifying a set of scopes when
+  refreshing a session. The `DefaultAuthConnector` implementation passes the
+  `scope` query parameter to the auth-backend plugin appropriately. The
+  `RefreshingAuthSessionManager` passes any scopes in its `GetSessionRequest`
+  appropriately.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
+## 1.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
 ## 1.7.0-next.1
 
 ### Patch Changes
diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md
index 5b6282eddd..b6d3722822 100644
--- a/packages/core-app-api/api-report.md
+++ b/packages/core-app-api/api-report.md
@@ -443,7 +443,26 @@ export class LocalStorageFeatureFlags implements FeatureFlagsApi {
 // @public
 export class MicrosoftAuth {
   // (undocumented)
-  static create(options: OAuthApiCreateOptions): typeof microsoftAuthApiRef.T;
+  static create(options: OAuth2CreateOptions): typeof microsoftAuthApiRef.T;
+  // (undocumented)
+  getAccessToken(
+    scope?: string | string[],
+    options?: AuthRequestOptions,
+  ): Promise<string>;
+  // (undocumented)
+  getBackstageIdentity(
+    options?: AuthRequestOptions,
+  ): Promise<BackstageIdentityResponse | undefined>;
+  // (undocumented)
+  getIdToken(options?: AuthRequestOptions): Promise<string>;
+  // (undocumented)
+  getProfile(options?: AuthRequestOptions): Promise<ProfileInfo | undefined>;
+  // (undocumented)
+  sessionState$(): Observable<SessionState>;
+  // (undocumented)
+  signIn(): Promise<void>;
+  // (undocumented)
+  signOut(): Promise<void>;
 }
 
 // @public
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index b0f3bb2808..e1bb2cebe8 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "1.7.0-next.1",
+  "version": "1.7.0-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.test.ts
new file mode 100644
index 0000000000..c71799ed98
--- /dev/null
+++ b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.test.ts
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MicrosoftAuth from './MicrosoftAuth';
+import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
+import { UrlPatternDiscovery } from '../../DiscoveryApi';
+import { ConfigReader } from '@backstage/config';
+import { microsoftAuthApiRef } from '@backstage/core-plugin-api';
+import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+
+describe('MicrosoftAuth', () => {
+  const server = setupServer();
+  setupRequestMockHandlers(server);
+  const microsoftAuth = MicrosoftAuth.create({
+    configApi: new ConfigReader(undefined),
+    oauthRequestApi: new MockOAuthApi(),
+    discoveryApi: UrlPatternDiscovery.compile(
+      'http://backstage.test/api/{{ pluginId }}',
+    ),
+  });
+
+  describe('with a refresh token', () => {
+    beforeEach(() => {
+      server.use(
+        rest.get(
+          'http://backstage.test/api/auth/microsoft/refresh',
+          async (req, res, ctx) => {
+            const scopeParam = req.url.searchParams.get('scope');
+            return res(
+              ctx.json({
+                providerInfo: {
+                  accessToken: scopeParam
+                    ? 'tokenForOtherResource'
+                    : 'tokenForGrantScopes',
+                  scope: scopeParam || 'grant-resource/scope',
+                },
+              }),
+            );
+          },
+        ),
+      );
+    });
+
+    it('gets access token with requested scopes for grant', async () => {
+      const accessToken = await microsoftAuth.getAccessToken();
+
+      expect(accessToken).toEqual('tokenForGrantScopes');
+    });
+
+    it('gets access token for other consented scopes besides those directly granted', async () => {
+      const accessToken = await microsoftAuth.getAccessToken(
+        'azure-resource/scope',
+      );
+
+      expect(accessToken).toEqual('tokenForOtherResource');
+    });
+
+    it('fails when requesting scopes for multiple resources at once', async () => {
+      const accessTokenPromise = microsoftAuth.getAccessToken(
+        'one-resource/scope other-resource/scope',
+      );
+
+      await expect(accessTokenPromise).rejects.toThrow(
+        'Requested access token with scopes from multiple Azure resources: one-resource, other-resource. Access tokens can only have a single audience.',
+      );
+    });
+  });
+
+  describe('without a refresh token', () => {
+    let mockRequester: jest.Mock;
+    let sut: typeof microsoftAuthApiRef.T;
+
+    beforeEach(() => {
+      mockRequester = jest.fn();
+      sut = MicrosoftAuth.create({
+        configApi: new ConfigReader(undefined),
+        oauthRequestApi: {
+          createAuthRequester: jest.fn().mockReturnValue(mockRequester),
+          authRequest$: jest.fn(),
+        },
+        discoveryApi: UrlPatternDiscovery.compile(
+          'http://backstage.test/api/{{ pluginId }}',
+        ),
+      });
+      server.use(
+        rest.get(
+          'http://backstage.test/api/auth/microsoft/refresh',
+          (_, res, ctx) => {
+            return res(
+              ctx.status(401),
+              ctx.json({
+                error: {
+                  name: 'AuthenticationError',
+                  message:
+                    'Refresh failed; caused by InputError: Missing session cookie',
+                  cause: {
+                    name: 'InputError',
+                    message: 'Missing session cookie',
+                  },
+                },
+                request: {
+                  method: 'GET',
+                  url: '/api/auth/microsoft/refresh?env=development',
+                },
+                response: {
+                  statusCode: 401,
+                },
+              }),
+            );
+          },
+        ),
+      );
+    });
+
+    it('gets access token for Microsoft Graph via popup', async () => {
+      await sut.getAccessToken();
+
+      expect(mockRequester).toHaveBeenCalledWith(
+        new Set(['User.Read', 'email', 'offline_access', 'openid', 'profile']),
+      );
+    });
+
+    it('gets access + refresh token for other azure resources via popup', async () => {
+      await sut.getAccessToken('azure-resource/scope');
+
+      expect(mockRequester).toHaveBeenCalledWith(
+        new Set(['azure-resource/scope', 'offline_access']),
+      );
+    });
+
+    it('requests scopes for resource ID when scope contains a resource URI', async () => {
+      await sut.getAccessToken('api://customApiClientId/some.scope');
+
+      expect(mockRequester).toHaveBeenCalledWith(
+        new Set(['api://customApiClientId/some.scope', 'offline_access']),
+      );
+    });
+  });
+});
diff --git a/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
index 30cfde7c6e..fdffb3fc45 100644
--- a/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-import { microsoftAuthApiRef } from '@backstage/core-plugin-api';
-import { OAuth2 } from '../oauth2';
-import { OAuthApiCreateOptions } from '../types';
+import {
+  microsoftAuthApiRef,
+  AuthRequestOptions,
+  AuthProviderInfo,
+  ConfigApi,
+  DiscoveryApi,
+  OAuthRequestApi,
+} from '@backstage/core-plugin-api';
+import { OAuth2, OAuth2CreateOptions } from '../oauth2';
 
 const DEFAULT_PROVIDER = {
   id: 'microsoft',
@@ -30,7 +36,20 @@ const DEFAULT_PROVIDER = {
  * @public
  */
 export default class MicrosoftAuth {
-  static create(options: OAuthApiCreateOptions): typeof microsoftAuthApiRef.T {
+  private oauth2: { [aud: string]: OAuth2 };
+  private configApi: ConfigApi | undefined;
+  private environment: string;
+  private provider: AuthProviderInfo;
+  private oauthRequestApi: OAuthRequestApi;
+  private discoveryApi: DiscoveryApi;
+  private scopeTransform: (scopes: string[]) => string[];
+
+  private static MicrosoftGraphID = '00000003-0000-0000-c000-000000000000';
+
+  static create(options: OAuth2CreateOptions): typeof microsoftAuthApiRef.T {
+    return new MicrosoftAuth(options);
+  }
+  private constructor(options: OAuth2CreateOptions) {
     const {
       configApi,
       environment = 'development',
@@ -44,15 +63,114 @@ export default class MicrosoftAuth {
         'email',
         'User.Read',
       ],
+      scopeTransform = scopes => scopes.concat('offline_access'),
     } = options;
 
-    return OAuth2.create({
-      configApi,
-      discoveryApi,
-      oauthRequestApi,
-      provider,
-      environment,
-      defaultScopes,
-    });
+    this.configApi = configApi;
+    this.environment = environment;
+    this.provider = provider;
+    this.oauthRequestApi = oauthRequestApi;
+    this.discoveryApi = discoveryApi;
+    this.scopeTransform = scopeTransform;
+
+    this.oauth2 = {
+      [MicrosoftAuth.MicrosoftGraphID]: OAuth2.create({
+        configApi: this.configApi,
+        discoveryApi: this.discoveryApi,
+        oauthRequestApi: this.oauthRequestApi,
+        provider: this.provider,
+        environment: this.environment,
+        scopeTransform: this.scopeTransform,
+        defaultScopes,
+      }),
+    };
+  }
+
+  private microsoftGraph(): OAuth2 {
+    return this.oauth2[MicrosoftAuth.MicrosoftGraphID];
+  }
+
+  private static resourceForScopes(scope: string): Promise<string> {
+    const audiences = scope
+      .split(' ')
+      .map(MicrosoftAuth.resourceForScope)
+      .filter(aud => aud !== 'openid');
+    if (audiences.length > 1) {
+      return Promise.reject(
+        new Error(
+          `Requested access token with scopes from multiple Azure resources: ${audiences.join(
+            ', ',
+          )}. Access tokens can only have a single audience.`,
+        ),
+      );
+    }
+    const audience = audiences[0] ?? MicrosoftAuth.MicrosoftGraphID;
+    return Promise.resolve(audience);
+  }
+
+  private static resourceForScope(scope: string): string {
+    const groups = scope.match(/^(?<resourceURI>.*)\/(?<scp>[^\/]*)$/)?.groups;
+    if (groups) {
+      const { resourceURI } = groups;
+      const aud = resourceURI.replace(/^api:\/\//, '');
+      return aud;
+    }
+    switch (scope) {
+      case 'email':
+      case 'openid':
+      case 'offline_access':
+      case 'profile': {
+        return 'openid';
+      }
+      default:
+        return MicrosoftAuth.MicrosoftGraphID;
+    }
+  }
+
+  async getAccessToken(
+    scope?: string | string[],
+    options?: AuthRequestOptions,
+  ): Promise<string> {
+    const aud =
+      scope === undefined
+        ? MicrosoftAuth.MicrosoftGraphID
+        : await MicrosoftAuth.resourceForScopes(
+            Array.isArray(scope) ? scope.join(' ') : scope,
+          );
+    if (!(aud in this.oauth2)) {
+      this.oauth2[aud] = OAuth2.create({
+        configApi: this.configApi,
+        discoveryApi: this.discoveryApi,
+        oauthRequestApi: this.oauthRequestApi,
+        provider: this.provider,
+        environment: this.environment,
+        scopeTransform: this.scopeTransform,
+      });
+    }
+    return this.oauth2[aud].getAccessToken(scope, options);
+  }
+
+  getIdToken(options?: AuthRequestOptions) {
+    return this.microsoftGraph().getIdToken(options);
+  }
+
+  getProfile(options?: AuthRequestOptions) {
+    return this.microsoftGraph().getProfile(options);
+  }
+
+  getBackstageIdentity(options?: AuthRequestOptions) {
+    return this.microsoftGraph().getBackstageIdentity(options);
+  }
+
+  signIn() {
+    return this.microsoftGraph().signIn();
+  }
+
+  signOut() {
+    return this.microsoftGraph().signOut();
+  }
+
+  sessionState$() {
+    return this.microsoftGraph().sessionState$();
   }
 }
diff --git a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
index 51da9cbfb5..c46e87581f 100644
--- a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
+++ b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
@@ -59,22 +59,22 @@ describe('DefaultAuthConnector', () => {
     jest.resetAllMocks();
   });
 
-  it('should refresh a session', async () => {
+  it('should refresh a session with scope', async () => {
     server.use(
-      rest.get('*', (_req, res, ctx) =>
+      rest.get('*', (req, res, ctx) =>
         res(
           ctx.json({
             idToken: 'mock-id-token',
             accessToken: 'mock-access-token',
-            scopes: 'a b c',
+            scopes: req.url.searchParams.get('scope') || 'default-scope',
             expiresInSeconds: '60',
           }),
         ),
       ),
     );
 
-    const helper = new DefaultAuthConnector<any>(defaultOptions);
-    const session = await helper.refreshSession();
+    const connector = new DefaultAuthConnector<any>(defaultOptions);
+    const session = await connector.refreshSession(new Set(['a', 'b', 'c']));
     expect(session.idToken).toBe('mock-id-token');
     expect(session.accessToken).toBe('mock-access-token');
     expect(session.scopes).toEqual(new Set(['a', 'b', 'c']));
@@ -89,8 +89,8 @@ describe('DefaultAuthConnector', () => {
       ),
     );
 
-    const helper = new DefaultAuthConnector(defaultOptions);
-    await expect(helper.refreshSession()).rejects.toThrow(
+    const connector = new DefaultAuthConnector(defaultOptions);
+    await expect(connector.refreshSession()).rejects.toThrow(
       'Auth refresh request failed, Error: Network NOPE',
     );
   });
@@ -98,19 +98,19 @@ describe('DefaultAuthConnector', () => {
   it('should handle failure response when refreshing session', async () => {
     server.use(rest.get('*', (_req, res, ctx) => res(ctx.status(401, 'NOPE'))));
 
-    const helper = new DefaultAuthConnector(defaultOptions);
-    await expect(helper.refreshSession()).rejects.toThrow(
+    const connector = new DefaultAuthConnector(defaultOptions);
+    await expect(connector.refreshSession()).rejects.toThrow(
       'Auth refresh request failed, NOPE',
     );
   });
 
   it('should fail if popup was rejected', async () => {
     const mockOauth = new MockOAuthApi();
-    const helper = new DefaultAuthConnector({
+    const connector = new DefaultAuthConnector({
       ...defaultOptions,
       oauthRequestApi: mockOauth,
     });
-    const promise = helper.createSession({ scopes: new Set(['a', 'b']) });
+    const promise = connector.createSession({ scopes: new Set(['a', 'b']) });
     await mockOauth.rejectAll();
     await expect(promise).rejects.toMatchObject({ name: 'RejectedError' });
   });
@@ -125,12 +125,12 @@ describe('DefaultAuthConnector', () => {
         scopes: 'a b',
         expiresInSeconds: 3600,
       });
-    const helper = new DefaultAuthConnector({
+    const connector = new DefaultAuthConnector({
       ...defaultOptions,
       oauthRequestApi: mockOauth,
     });
 
-    const sessionPromise = helper.createSession({
+    const sessionPromise = connector.createSession({
       scopes: new Set(['a', 'b']),
     });
 
@@ -153,13 +153,13 @@ describe('DefaultAuthConnector', () => {
     const popupSpy = jest
       .spyOn(loginPopup, 'showLoginPopup')
       .mockResolvedValue('my-session');
-    const helper = new DefaultAuthConnector({
+    const connector = new DefaultAuthConnector({
       ...defaultOptions,
       oauthRequestApi: new MockOAuthApi(),
       sessionTransform: str => str,
     });
 
-    const sessionPromise = helper.createSession({
+    const sessionPromise = connector.createSession({
       scopes: new Set(),
       instantPopup: true,
     });
@@ -174,13 +174,13 @@ describe('DefaultAuthConnector', () => {
     const popupSpy = jest
       .spyOn(loginPopup, 'showLoginPopup')
       .mockResolvedValue({ scopes: '' });
-    const helper = new DefaultAuthConnector({
+    const connector = new DefaultAuthConnector({
       ...defaultOptions,
       joinScopes: scopes => `-${[...scopes].join('')}-`,
       oauthRequestApi: mockOauth,
     });
 
-    helper.createSession({ scopes: new Set(['a', 'b']) });
+    connector.createSession({ scopes: new Set(['a', 'b']) });
 
     await mockOauth.triggerAll();
 
diff --git a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
index f2c35b0ba3..728ed3878c 100644
--- a/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
+++ b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts
@@ -126,9 +126,12 @@ export class DefaultAuthConnector<AuthSession>
     return this.authRequester(options.scopes);
   }
 
-  async refreshSession(): Promise<any> {
+  async refreshSession(scopes?: Set<string>): Promise<any> {
     const res = await fetch(
-      await this.buildUrl('/refresh', { optional: true }),
+      await this.buildUrl('/refresh', {
+        optional: true,
+        ...(scopes && { scope: this.joinScopesFunc(scopes) }),
+      }),
       {
         headers: {
           'x-requested-with': 'XMLHttpRequest',
diff --git a/packages/core-app-api/src/lib/AuthConnector/types.ts b/packages/core-app-api/src/lib/AuthConnector/types.ts
index 464a2ed627..c8e83e1ccc 100644
--- a/packages/core-app-api/src/lib/AuthConnector/types.ts
+++ b/packages/core-app-api/src/lib/AuthConnector/types.ts
@@ -25,6 +25,6 @@ export type CreateSessionOptions = {
  */
 export type AuthConnector<AuthSession> = {
   createSession(options: CreateSessionOptions): Promise<AuthSession>;
-  refreshSession(): Promise<AuthSession>;
+  refreshSession(scopes?: Set<string>): Promise<AuthSession>;
   removeSession(): Promise<void>;
 };
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
index a94aca85f8..23432856cb 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
@@ -47,7 +47,7 @@ describe('RefreshingAuthSessionManager', () => {
     await manager.getSession({});
     expect(createSession).toHaveBeenCalledTimes(1);
 
-    expect(refreshSession).toHaveBeenCalledTimes(1);
+    expect(refreshSession).toHaveBeenCalledWith(undefined);
     expect(stateSubscriber.mock.calls).toEqual([
       [SessionState.SignedOut],
       [SessionState.SignedIn],
@@ -103,7 +103,7 @@ describe('RefreshingAuthSessionManager', () => {
 
     await manager.getSession({ scopes: new Set(['a']) });
     expect(createSession).toHaveBeenCalledTimes(1);
-    expect(refreshSession).toHaveBeenCalledTimes(1);
+    expect(refreshSession).toHaveBeenCalledWith(new Set(['a']));
 
     await manager.getSession({ scopes: new Set(['a']) });
     expect(createSession).toHaveBeenCalledTimes(1);
@@ -134,7 +134,7 @@ describe('RefreshingAuthSessionManager', () => {
 
     expect(await manager.getSession({ optional: true })).toBe(undefined);
     expect(createSession).toHaveBeenCalledTimes(0);
-    expect(refreshSession).toHaveBeenCalledTimes(1);
+    expect(refreshSession).toHaveBeenCalledWith(undefined);
   });
 
   it('should forward option to instantly show auth popup and not attempt refresh', async () => {
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
index 67d83bb36a..c04eb637de 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
@@ -73,7 +73,9 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
       }
 
       try {
-        const refreshedSession = await this.collapsedSessionRefresh();
+        const refreshedSession = await this.collapsedSessionRefresh(
+          options.scopes,
+        );
         const currentScopes = this.sessionScopesFunc(this.currentSession!);
         const refreshedScopes = this.sessionScopesFunc(refreshedSession);
         if (hasScopes(refreshedScopes, currentScopes)) {
@@ -97,7 +99,7 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
     // already had an existing session.
     if (!this.currentSession && !options.instantPopup) {
       try {
-        const newSession = await this.collapsedSessionRefresh();
+        const newSession = await this.collapsedSessionRefresh(options.scopes);
         this.currentSession = newSession;
         // The session might not have the scopes requested so go back and check again
         return this.getSession(options);
@@ -130,12 +132,12 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
     return this.stateTracker.sessionState$();
   }
 
-  private async collapsedSessionRefresh(): Promise<T> {
+  private async collapsedSessionRefresh(scopes?: Set<string>): Promise<T> {
     if (this.refreshPromise) {
       return this.refreshPromise;
     }
 
-    this.refreshPromise = this.connector.refreshSession();
+    this.refreshPromise = this.connector.refreshSession(scopes);
 
     try {
       const session = await this.refreshPromise;
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index ceff1a0857..996fe8638c 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/core-components
 
+## 0.13.0-next.3
+
+### Minor Changes
+
+- 01cd4e25754: **BREAKING:** Removing `Tabs` component from `core-components` as it is neither used in the core Backstage app nor in the monorepo plugins. If you are using this component in your instance please consider replacing it with the [Material UI `Tabs`](https://v4.mui.com/components/tabs/#tabs) component like the following:
+
+  ```diff
+  - <Tabs
+  -    tabs={[{
+  -       icon: <AccessAlarmIcon />,
+  -       content: <div>Label</div>,
+  -    }]}
+  - />
+
+  + <Tabs>
+  +    <Tab
+  +       label = "Label"
+  +       icon = { <AccessAlarmIcon /> }
+  +    />
+  + </Tabs>
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/version-bridge@1.0.4-next.0
+
+## 0.12.6-next.2
+
+### Patch Changes
+
+- 67140d9f96f: Upgrade `react-virtualized-auto-sizer´ to version `^1.0.11`
+- 7e60bee2dea: Split the `BackstageSidebar` style `drawer` class, such that the `width` property is in a separate `drawerWidth` class instead. This makes it such that you can style the `drawer` class in your theme again.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/version-bridge@1.0.4-next.0
+
 ## 0.12.6-next.1
 
 ### Patch Changes
diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index 6439be23a7..1e5fa77ed3 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -1318,11 +1318,6 @@ export type Tab = {
   >;
 };
 
-// Warning: (ae-missing-release-tag) "TabBarClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export type TabBarClassKey = 'indicator' | 'flexContainer' | 'root';
-
 // Warning: (ae-forgotten-export) The symbol "Props_18" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "TabbedCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -1348,14 +1343,6 @@ export namespace TabbedLayout {
     Route: (props: SubRoute) => null;
 }
 
-// @public (undocumented)
-export type TabClassKey = 'root' | 'selected';
-
-// Warning: (ae-missing-release-tag) "TabIconClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export type TabIconClassKey = 'root';
-
 // Warning: (ae-missing-release-tag) "Table" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1438,17 +1425,6 @@ export type TableState = {
 // @public (undocumented)
 export type TableToolbarClassKey = 'root' | 'title' | 'searchField';
 
-// Warning: (ae-forgotten-export) The symbol "TabsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Tabs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export function Tabs(props: TabsProps): JSX.Element;
-
-// Warning: (ae-missing-release-tag) "TabsClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export type TabsClassKey = 'root' | 'styledTabs' | 'appbar';
-
 // Warning: (ae-missing-release-tag) "TrendLine" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 76c53a7809..ca2fdae3d0 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.12.6-next.1",
+  "version": "0.13.0-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/core-components/src/components/Select/Select.test.tsx b/packages/core-components/src/components/Select/Select.test.tsx
index df29983222..e9828e70fd 100644
--- a/packages/core-components/src/components/Select/Select.test.tsx
+++ b/packages/core-components/src/components/Select/Select.test.tsx
@@ -54,4 +54,16 @@ describe('<Select />', () => {
     fireEvent.click(option);
     expect(input.textContent).toBe('test 1');
   });
+
+  it('display the placeholder value when selected props updated to undefined', async () => {
+    const { getByTestId, rerender } = render(
+      <Select {...minProps} selected="test_1" />,
+    );
+
+    expect(getByTestId('select').textContent).toBe('test 1');
+
+    rerender(<Select {...minProps} selected={undefined} />);
+
+    expect(getByTestId('select').textContent).toBe('All results');
+  });
 });
diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 9cb8822a05..1b57e0d4da 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -163,10 +163,8 @@ export function SelectComponent(props: SelectProps) {
   }, [triggerReset, multiple]);
 
   useEffect(() => {
-    if (selected !== undefined) {
-      setValue(selected);
-    }
-  }, [selected]);
+    setValue(selected || (multiple ? [] : ''));
+  }, [selected, multiple]);
 
   const handleChange = (event: React.ChangeEvent<{ value: unknown }>) => {
     setValue(event.target.value as SelectedItems);
diff --git a/packages/core-components/src/components/Tabs/Tab.tsx b/packages/core-components/src/components/Tabs/Tab.tsx
deleted file mode 100644
index 2922bd9651..0000000000
--- a/packages/core-components/src/components/Tabs/Tab.tsx
+++ /dev/null
@@ -1,72 +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 React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import Tab from '@material-ui/core/Tab';
-import { BackstageTheme } from '@backstage/theme';
-
-interface StyledTabProps {
-  label?: string;
-  icon?: any; // TODO: define type for material-ui icons
-  isFirstNav?: boolean;
-  isFirstIndex?: boolean;
-  value?: any;
-}
-
-const tabMarginLeft = (isFirstNav: boolean, isFirstIndex: boolean) => {
-  if (isFirstIndex) {
-    if (isFirstNav) {
-      return '20px';
-    }
-    return '0';
-  }
-  return '40px';
-};
-
-/** @public */
-export type TabClassKey = 'root' | 'selected';
-
-const useStyles = makeStyles<BackstageTheme, StyledTabProps>(
-  theme => ({
-    root: {
-      textTransform: 'none',
-      height: '64px',
-      fontWeight: theme.typography.fontWeightBold,
-      fontSize: theme.typography.pxToRem(13),
-      color: theme.palette.textSubtle,
-      marginLeft: props =>
-        tabMarginLeft(
-          props.isFirstNav as boolean,
-          props.isFirstIndex as boolean,
-        ),
-      width: '130px',
-      minWidth: '130px',
-      '&:hover': {
-        outline: 'none',
-        backgroundColor: 'transparent',
-        color: theme.palette.textSubtle,
-      },
-    },
-  }),
-  { name: 'BackstageTab' },
-);
-
-export const StyledTab = (props: StyledTabProps) => {
-  const classes = useStyles(props);
-  const { isFirstNav, isFirstIndex, ...rest } = props;
-  return <Tab classes={classes} disableRipple {...rest} />;
-};
diff --git a/packages/core-components/src/components/Tabs/TabBar.tsx b/packages/core-components/src/components/Tabs/TabBar.tsx
deleted file mode 100644
index 99be9a7d1d..0000000000
--- a/packages/core-components/src/components/Tabs/TabBar.tsx
+++ /dev/null
@@ -1,60 +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 React, { PropsWithChildren } from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import Tabs from '@material-ui/core/Tabs';
-import Typography from '@material-ui/core/Typography';
-import { BackstageTheme } from '@backstage/theme';
-
-interface StyledTabsProps {
-  value: number | boolean;
-  selectionFollowsFocus: boolean;
-  onChange: (event: React.ChangeEvent<{}>, newValue: number) => void;
-}
-
-export type TabBarClassKey = 'indicator' | 'flexContainer' | 'root';
-
-const useStyles = makeStyles<BackstageTheme>(
-  theme => ({
-    indicator: {
-      display: 'flex',
-      justifyContent: 'center',
-      backgroundColor: theme.palette.tabbar.indicator,
-      height: theme.spacing(0.5),
-    },
-    flexContainer: {
-      alignItems: 'center',
-    },
-    root: {
-      '&:last-child': {
-        marginLeft: 'auto',
-      },
-    },
-  }),
-  { name: 'BackstageTabBar' },
-);
-
-export const StyledTabs = (props: PropsWithChildren<StyledTabsProps>) => {
-  const classes = useStyles(props);
-  return (
-    <Tabs
-      classes={classes}
-      {...props}
-      TabIndicatorProps={{ children: <Typography component="span" /> }}
-    />
-  );
-};
diff --git a/packages/core-components/src/components/Tabs/TabIcon.tsx b/packages/core-components/src/components/Tabs/TabIcon.tsx
deleted file mode 100644
index 0e93924de9..0000000000
--- a/packages/core-components/src/components/Tabs/TabIcon.tsx
+++ /dev/null
@@ -1,66 +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 React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import IconButton from '@material-ui/core/IconButton';
-import { BackstageTheme } from '@backstage/theme';
-
-interface StyledIconProps {
-  ariaLabel: string;
-  children: any;
-  isNext?: boolean;
-  onClick: any;
-}
-
-export type TabIconClassKey = 'root';
-
-const useStyles = makeStyles<BackstageTheme, StyledIconProps>(
-  theme => ({
-    root: {
-      color: '#6E6E6E',
-      overflow: 'visible',
-      fontSize: theme.typography.h5.fontSize,
-      textAlign: 'center',
-      borderRadius: '50%',
-      backgroundColor: '#E6E6E6',
-      marginLeft: props => (props.isNext ? 'auto' : '0'),
-      marginRight: props => (props.isNext ? '0' : theme.spacing(1.25)),
-      '&:hover': {
-        backgroundColor: '#E6E6E6',
-        opacity: '1',
-      },
-    },
-  }),
-  { name: 'BackstageTabIcon' },
-);
-
-export const StyledIcon = (props: StyledIconProps) => {
-  const classes = useStyles(props);
-  const { ariaLabel, onClick } = props;
-  return (
-    <IconButton
-      onClick={onClick}
-      className={classes.root}
-      size="small"
-      disableRipple
-      disableFocusRipple
-      aria-label={ariaLabel}
-    >
-      {props.children}
-    </IconButton>
-  );
-};
diff --git a/packages/core-components/src/components/Tabs/Tabs.stories.tsx b/packages/core-components/src/components/Tabs/Tabs.stories.tsx
deleted file mode 100644
index 4d4cad8757..0000000000
--- a/packages/core-components/src/components/Tabs/Tabs.stories.tsx
+++ /dev/null
@@ -1,71 +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 React from 'react';
-import { Tabs } from './Tabs';
-import AccessAlarmIcon from '@material-ui/icons/AccessAlarm';
-
-export default {
-  title: 'Navigation/Tabs',
-  component: Tabs,
-};
-
-const containerStyle = {};
-
-export const Default = () => (
-  <div style={containerStyle}>
-    <Tabs
-      tabs={[...Array(4)].map((_, index) => ({
-        label: `ANOTHER TAB`,
-        content: <div>Content {index}</div>,
-      }))}
-    />
-  </div>
-);
-
-export const Expandable = () => (
-  <div style={containerStyle}>
-    <Tabs
-      tabs={[...Array(31)].map((_, index) => ({
-        label: `ANOTHER TAB`,
-        content: <div>Content {index}</div>,
-      }))}
-    />
-  </div>
-);
-
-export const Icons = () => (
-  <div style={containerStyle}>
-    <Tabs
-      tabs={[...Array(4)].map((_, index) => ({
-        icon: <AccessAlarmIcon />,
-        content: <div>Content {index}</div>,
-      }))}
-    />
-  </div>
-);
-
-export const IconsAndLabels = () => (
-  <div style={containerStyle}>
-    <Tabs
-      tabs={[...Array(4)].map((_, index) => ({
-        icon: <AccessAlarmIcon />,
-        label: `ANOTHER TAB`,
-        content: <div>Content {index}</div>,
-      }))}
-    />
-  </div>
-);
diff --git a/packages/core-components/src/components/Tabs/Tabs.tsx b/packages/core-components/src/components/Tabs/Tabs.tsx
deleted file mode 100644
index 420263f576..0000000000
--- a/packages/core-components/src/components/Tabs/Tabs.tsx
+++ /dev/null
@@ -1,170 +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 React, { useRef, useEffect, MutableRefObject, useState } from 'react';
-import { BackstageTheme } from '@backstage/theme';
-import AppBar from '@material-ui/core/AppBar';
-import { makeStyles } from '@material-ui/core/styles';
-import NavigateBeforeIcon from '@material-ui/icons/NavigateBefore';
-import NavigateNextIcon from '@material-ui/icons/NavigateNext';
-import { chunkArray } from './utils';
-import useWindowSize from 'react-use/lib/useWindowSize';
-
-/* Import Components */
-
-import { TabPanel } from './TabPanel';
-import { StyledIcon } from './TabIcon';
-import { StyledTab } from './Tab';
-import { StyledTabs } from './TabBar';
-import Box from '@material-ui/core/Box';
-
-/* Props Types */
-
-export interface TabProps {
-  content: any;
-  label?: string;
-  icon?: any; // TODO: define type for material-ui icons
-}
-
-export interface TabsProps {
-  tabs: TabProps[];
-}
-
-export type TabsClassKey = 'root' | 'styledTabs' | 'appbar';
-
-const useStyles = makeStyles<BackstageTheme>(
-  theme => ({
-    root: {
-      flexGrow: 1,
-      width: '100%',
-    },
-    styledTabs: {
-      backgroundColor: theme.palette.background.paper,
-    },
-    appbar: {
-      boxShadow: 'none',
-      backgroundColor: theme.palette.background.paper,
-      paddingLeft: theme.spacing(1.25),
-      paddingRight: theme.spacing(1.25),
-    },
-  }),
-  { name: 'BackstageTabs' },
-);
-
-export function Tabs(props: TabsProps) {
-  const { tabs } = props;
-  const classes = useStyles();
-  const [value, setValue] = useState([0, 0]); // [selectedChunkedNavIndex, selectedIndex]
-  const [navIndex, setNavIndex] = useState(0);
-  const [numberOfChunkedElement, setNumberOfChunkedElement] = useState(0);
-  const [chunkedTabs, setChunkedTabs] = useState<TabProps[][]>([[]]);
-  const wrapper = useRef() as MutableRefObject<HTMLDivElement>;
-
-  const { width } = useWindowSize();
-
-  const handleChange = (_: React.ChangeEvent<{}>, newValue: number) => {
-    setValue([navIndex, newValue]);
-  };
-
-  const navigateToPrevChunk = () => {
-    setNavIndex(navIndex - 1);
-  };
-
-  const navigateToNextChunk = () => {
-    setNavIndex(navIndex + 1);
-  };
-
-  const hasNextNavIndex = () => navIndex + 1 < chunkedTabs.length;
-
-  useEffect(() => {
-    // Each time the window is resized we calculate how many tabs we can render given the window width
-    const padding = 20; // The AppBar padding
-
-    const numberOfTabIcons = navIndex === 0 ? 1 : 2;
-    const wrapperWidth =
-      wrapper.current.offsetWidth - padding - numberOfTabIcons * 30;
-    const flattenIndex = value[0] * numberOfChunkedElement + value[1];
-    const newChunkedElementSize = Math.floor(wrapperWidth / 170);
-
-    setNumberOfChunkedElement(newChunkedElementSize);
-    setChunkedTabs(chunkArray(tabs, newChunkedElementSize));
-    setValue([
-      Math.floor(flattenIndex / newChunkedElementSize),
-      flattenIndex % newChunkedElementSize,
-    ]);
-    // eslint-disable-next-line
-  }, [width, tabs]);
-
-  const currentIndex = navIndex === value[0] ? value[1] : false;
-
-  return (
-    <Box className={classes.root}>
-      <AppBar ref={wrapper} className={classes.appbar} position="static">
-        <Box>
-          <StyledTabs
-            value={currentIndex}
-            onChange={handleChange}
-            selectionFollowsFocus
-          >
-            {navIndex !== 0 && (
-              <StyledIcon
-                onClick={navigateToPrevChunk}
-                ariaLabel="navigate-before"
-              >
-                <NavigateBeforeIcon />
-              </StyledIcon>
-            )}
-            {chunkedTabs[navIndex].map((tab, index) => (
-              <StyledTab
-                value={index}
-                isFirstIndex={index === 0}
-                isFirstNav={navIndex === 0}
-                key={index}
-                icon={tab.icon || undefined}
-                label={tab.label || undefined}
-              />
-            ))}
-            {hasNextNavIndex() && (
-              <StyledIcon
-                isNext
-                onClick={navigateToNextChunk}
-                ariaLabel="navigate-next"
-              >
-                <NavigateNextIcon />
-              </StyledIcon>
-            )}
-          </StyledTabs>
-        </Box>
-      </AppBar>
-      {currentIndex !== false ? (
-        chunkedTabs[navIndex].map((tab, index) => (
-          <TabPanel key={index} value={index} index={currentIndex}>
-            {tab.content}
-          </TabPanel>
-        ))
-      ) : (
-        // Render if the selected tab index is outside the current rendered chunked array
-        <TabPanel
-          key="panel_outside_chunked_array"
-          value={value[1]}
-          index={value[1]}
-        >
-          {chunkedTabs[value[0]][value[1]].content}
-        </TabPanel>
-      )}
-    </Box>
-  );
-}
diff --git a/packages/core-components/src/components/index.ts b/packages/core-components/src/components/index.ts
index 0057847754..0222b82aa4 100644
--- a/packages/core-components/src/components/index.ts
+++ b/packages/core-components/src/components/index.ts
@@ -44,6 +44,5 @@ export * from './StructuredMetadataTable';
 export * from './SupportButton';
 export * from './TabbedLayout';
 export * from './Table';
-export * from './Tabs';
 export * from './TrendLine';
 export * from './WarningPanel';
diff --git a/packages/core-components/src/overridableComponents.ts b/packages/core-components/src/overridableComponents.ts
index 49bc162951..c872317049 100644
--- a/packages/core-components/src/overridableComponents.ts
+++ b/packages/core-components/src/overridableComponents.ts
@@ -60,10 +60,6 @@ import {
   TableToolbarClassKey,
   FiltersContainerClassKey,
   TableClassKey,
-  TabBarClassKey,
-  TabIconClassKey,
-  TabsClassKey,
-  TabClassKey,
   WarningPanelClassKey,
 } from './components';
 
@@ -141,10 +137,6 @@ type BackstageComponentsNameToClassKey = {
   BackstageTableToolbar: TableToolbarClassKey;
   BackstageTableFiltersContainer: FiltersContainerClassKey;
   BackstageTable: TableClassKey;
-  BackstageTabBar: TabBarClassKey;
-  BackstageTabIcon: TabIconClassKey;
-  BackstageTabs: TabsClassKey;
-  BackstageTab: TabClassKey;
   BackstageWarningPanel: WarningPanelClassKey;
   BackstageBottomLink: BottomLinkClassKey;
   BackstageBreadcrumbsClickableText: BreadcrumbsClickableTextClassKey;
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 8c6258dc11..c3b4b660d1 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/core-plugin-api
 
+## 1.5.1-next.1
+
+### Patch Changes
+
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+
 ## 1.5.1-next.0
 
 ### Patch Changes
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 5bdcf83f4b..a5d55c89c6 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.1-next.0",
+  "version": "1.5.1-next.1",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index ee40fba169..8871330045 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/create-app
 
+## 0.4.39-next.3
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
+## 0.4.39-next.2
+
+### Patch Changes
+
+- 2945923b133: Upgraded the TypeScript version to 5.0
+
+  To apply this change in your own project, switch the TypeScript version in your root `package.json`:
+
+  ```diff
+  -    "typescript": "~4.6.4",
+  +    "typescript": "~5.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+
 ## 0.4.39-next.1
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 20333dff0f..12cf1d74ad 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "A CLI that helps you create your own Backstage app",
-  "version": "0.4.39-next.1",
+  "version": "0.4.39-next.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 89e0b58770..85a1001d15 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/dev-utils
 
+## 1.0.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## 1.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+
 ## 1.0.14-next.1
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 528565d87e..1c9ee69f09 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.14-next.1",
+  "version": "1.0.14-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index 6aab69e59c..ae7e7871ca 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,23 @@
 # e2e-test
 
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.4.39-next.3
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.4.39-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
 ## 0.2.2-next.1
 
 ### Patch Changes
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 8d50128a49..b367ba8c2c 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.2-next.1",
+  "version": "0.2.2-next.3",
   "private": true,
   "backstage": {
     "role": "cli"
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 5ce97a4ba3..0dfe231e97 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/integration-react
 
+## 1.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## 1.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
 ## 1.1.12-next.1
 
 ### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index e31202c2fc..81b2a66ef9 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.12-next.1",
+  "version": "1.1.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 875bc7a85a..f0dec4e702 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/repo-tools
 
+## 0.2.0-next.2
+
+### Minor Changes
+
+- a876e69b20e: Adding two new commands to support OpenAPI spec writing, `schema:openapi:generate` to generate the Typescript file that `@backstage/backend-openapi-utils` needs for typing and `schema:openapi:verify` to verify that this file exists and matches your `src/schema/openapi.yaml` file.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.12
+  - @backstage/errors@1.1.5
+
 ## 0.1.4-next.1
 
 ### Patch Changes
diff --git a/packages/repo-tools/cli-report.md b/packages/repo-tools/cli-report.md
index 0e1b2d2a4c..857c705006 100644
--- a/packages/repo-tools/cli-report.md
+++ b/packages/repo-tools/cli-report.md
@@ -14,6 +14,8 @@ Options:
 Commands:
   api-reports [options] [paths...]
   type-deps
+  schema:openapi:verify [paths...]
+  schema:openapi:generate [paths...]
   help [command]
 ```
 
@@ -33,6 +35,24 @@ Options:
   -h, --help
 ```
 
+### `backstage-repo-tools schema:openapi:generate`
+
+```
+Usage: backstage-repo-tools schema:openapi:generate [options] [paths...]
+
+Options:
+  -h, --help
+```
+
+### `backstage-repo-tools schema:openapi:verify`
+
+```
+Usage: backstage-repo-tools schema:openapi:verify [options] [paths...]
+
+Options:
+  -h, --help
+```
+
 ### `backstage-repo-tools type-deps`
 
 ```
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 4a53cc9976..5eb85378de 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/repo-tools",
   "description": "CLI for Backstage repo tooling ",
-  "version": "0.1.4-next.1",
+  "version": "0.2.0-next.2",
   "publishConfig": {
     "access": "public"
   },
@@ -30,6 +30,7 @@
     "backstage-repo-tools": "bin/backstage-repo-tools"
   },
   "dependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
     "@backstage/cli-common": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
@@ -40,7 +41,10 @@
     "fs-extra": "10.1.0",
     "glob": "^8.0.3",
     "is-glob": "^4.0.3",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
     "minimatch": "^5.1.1",
+    "p-limit": "^3.0.2",
     "ts-node": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/repo-tools/src/commands/api-reports/api-reports.ts b/packages/repo-tools/src/commands/api-reports/api-reports.ts
index a917975750..b673689b5a 100644
--- a/packages/repo-tools/src/commands/api-reports/api-reports.ts
+++ b/packages/repo-tools/src/commands/api-reports/api-reports.ts
@@ -15,7 +15,6 @@
  */
 
 import { OptionValues } from 'commander';
-import fs from 'fs-extra';
 import {
   createTemporaryTsConfig,
   categorizePackageDirs,
@@ -23,7 +22,7 @@ import {
   runCliExtraction,
   buildDocs,
 } from './api-extractor';
-import { findPackageDirs, paths as cliPaths } from '../../lib/paths';
+import { getMatchingWorkspacePaths, paths as cliPaths } from '../../lib/paths';
 import { generateTypeDeclarations } from './generateTypeDeclarations';
 
 type Options = {
@@ -49,10 +48,7 @@ export const buildApiReports = async (paths: string[] = [], opts: Options) => {
   const omitMessages = parseArrayOption(opts.omitMessages);
 
   const isAllPackages = !paths?.length;
-  const selectedPaths = isAllPackages
-    ? await getWorkspacePackagePathPatterns()
-    : paths;
-  const selectedPackageDirs = await findPackageDirs(selectedPaths);
+  const selectedPackageDirs = await getMatchingWorkspacePaths(paths);
 
   if (isAllPackages && !isCiBuild && !isDocsBuild) {
     console.log('');
@@ -111,26 +107,6 @@ export const buildApiReports = async (paths: string[] = [], opts: Options) => {
   }
 };
 
-/**
- * Retrieves the list of package names in the "workspaces" field of the `package.json` file in the current workspace root.
- *
- * If the file does not exist, or the "workspaces" field is not present, returns `undefined`.
- *
- * @returns {Promise<string[] | undefined>} The list of package names, or `undefined` if not found.
- */
-async function getWorkspacePackagePathPatterns() {
-  const pkgJson = await fs
-    .readJson(cliPaths.resolveTargetRoot('package.json'))
-    .catch(error => {
-      if (error.code === 'ENOENT') {
-        return undefined;
-      }
-      throw error;
-    });
-  const workspaces = pkgJson?.workspaces?.packages;
-  return workspaces;
-}
-
 /**
  * Splits the input string on comma, and returns an array of the resulting substrings.
  * for `undefined` or an empty string, returns an empty array.
diff --git a/packages/repo-tools/src/commands/index.ts b/packages/repo-tools/src/commands/index.ts
index f283e9c743..7aa7acef0b 100644
--- a/packages/repo-tools/src/commands/index.ts
+++ b/packages/repo-tools/src/commands/index.ts
@@ -52,6 +52,20 @@ export function registerCommands(program: Command) {
     .command('type-deps')
     .description('Find inconsistencies in types of all packages and plugins')
     .action(lazy(() => import('./type-deps/type-deps').then(m => m.default)));
+
+  program
+    .command('schema:openapi:verify [paths...]')
+    .description(
+      'Verify that all OpenAPI schemas are valid and have a matching `schemas/openapi.ts` file.',
+    )
+    .action(lazy(() => import('./openapi/verify').then(m => m.bulkCommand)));
+
+  program
+    .command('schema:openapi:generate [paths...]')
+    .description(
+      'Generates a Typescript file from an OpenAPI yaml spec. For use with the `@backstage/backend-openapi-utils` ApiRouter type.',
+    )
+    .action(lazy(() => import('./openapi/generate').then(m => m.bulkCommand)));
 }
 
 // Wraps an action function so that it always exits and handles errors
diff --git a/packages/repo-tools/src/commands/openapi/constants.ts b/packages/repo-tools/src/commands/openapi/constants.ts
new file mode 100644
index 0000000000..7c91f423c1
--- /dev/null
+++ b/packages/repo-tools/src/commands/openapi/constants.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 const YAML_SCHEMA_PATH = 'src/schema/openapi.yaml';
+export const TS_MODULE = 'src/schema/openapi';
+export const TS_SCHEMA_PATH = `${TS_MODULE}.ts`;
diff --git a/packages/repo-tools/src/commands/openapi/generate.ts b/packages/repo-tools/src/commands/openapi/generate.ts
new file mode 100644
index 0000000000..fc73013765
--- /dev/null
+++ b/packages/repo-tools/src/commands/openapi/generate.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 fs from 'fs-extra';
+import YAML from 'js-yaml';
+import chalk from 'chalk';
+import { resolve } from 'path';
+import { runner } from './runner';
+import { TS_SCHEMA_PATH, YAML_SCHEMA_PATH } from './constants';
+import { promisify } from 'util';
+import { exec as execCb } from 'child_process';
+
+const exec = promisify(execCb);
+
+async function generate(
+  directoryPath: string,
+  config?: { skipMissingYamlFile: boolean },
+) {
+  const { skipMissingYamlFile } = config ?? {};
+  const openapiPath = resolve(directoryPath, YAML_SCHEMA_PATH);
+  if (!(await fs.pathExists(openapiPath))) {
+    if (skipMissingYamlFile) {
+      return;
+    }
+    throw new Error(`Could not find ${YAML_SCHEMA_PATH} in root of directory.`);
+  }
+  const yaml = YAML.load(await fs.readFile(openapiPath, 'utf8'));
+
+  const tsPath = resolve(directoryPath, TS_SCHEMA_PATH);
+
+  await fs.writeFile(
+    tsPath,
+    `export default ${JSON.stringify(yaml, null, 2)} as const`,
+  );
+
+  await exec(`yarn backstage-cli package lint --fix ${tsPath}`);
+}
+
+export async function bulkCommand(paths: string[] = []): Promise<void> {
+  const resultsList = await runner(paths, (dir: string) =>
+    generate(dir, { skipMissingYamlFile: true }),
+  );
+
+  let failed = false;
+  for (const { relativeDir, resultText } of resultsList) {
+    if (resultText) {
+      console.log();
+      console.log(
+        chalk.red(
+          `OpenAPI yaml to Typescript generation failed in ${relativeDir}:`,
+        ),
+      );
+      console.log(resultText.trimStart());
+
+      failed = true;
+    }
+  }
+
+  if (failed) {
+    process.exit(1);
+  } else {
+    console.log(chalk.green('Generated all files.'));
+  }
+}
diff --git a/packages/repo-tools/src/commands/openapi/runner.ts b/packages/repo-tools/src/commands/openapi/runner.ts
new file mode 100644
index 0000000000..4b1b0167bf
--- /dev/null
+++ b/packages/repo-tools/src/commands/openapi/runner.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 { getMatchingWorkspacePaths } from '../../lib/paths';
+import pLimit from 'p-limit';
+import { relative as relativePath } from 'path';
+import { paths as cliPaths } from '../../lib/paths';
+
+export async function runner(
+  paths: string[],
+  command: (dir: string) => Promise<void>,
+) {
+  const packages = await getMatchingWorkspacePaths(paths);
+  const limit = pLimit(5);
+
+  const resultsList = await Promise.all(
+    packages.map(pkg =>
+      limit(async () => {
+        let resultText = '';
+        try {
+          console.log(`## Processing ${pkg}`);
+          await command(pkg);
+        } catch (err) {
+          resultText = err.message;
+        }
+
+        return {
+          relativeDir: relativePath(cliPaths.targetRoot, pkg),
+          resultText,
+        };
+      }),
+    ),
+  );
+
+  return resultsList;
+}
diff --git a/packages/repo-tools/src/commands/openapi/verify.ts b/packages/repo-tools/src/commands/openapi/verify.ts
new file mode 100644
index 0000000000..f6dda66738
--- /dev/null
+++ b/packages/repo-tools/src/commands/openapi/verify.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 fs from 'fs-extra';
+import YAML from 'js-yaml';
+import { isEqual, cloneDeep } from 'lodash';
+import { join } from 'path';
+import chalk from 'chalk';
+import { relative as relativePath, resolve as resolvePath } from 'path';
+import Parser from '@apidevtools/swagger-parser';
+import { runner } from './runner';
+import { paths as cliPaths } from '../../lib/paths';
+import { TS_MODULE, TS_SCHEMA_PATH, YAML_SCHEMA_PATH } from './constants';
+
+async function verify(directoryPath: string) {
+  const openapiPath = join(directoryPath, YAML_SCHEMA_PATH);
+  if (!(await fs.pathExists(openapiPath))) {
+    return;
+  }
+
+  const yaml = YAML.load(await fs.readFile(openapiPath, 'utf8'));
+  await Parser.validate(cloneDeep(yaml) as any);
+
+  const schemaPath = join(directoryPath, TS_SCHEMA_PATH);
+  if (!(await fs.pathExists(schemaPath))) {
+    throw new Error(`No \`${TS_SCHEMA_PATH}\` file found.`);
+  }
+
+  const schema = await import(resolvePath(join(directoryPath, TS_MODULE)));
+
+  if (!schema.default) {
+    throw new Error(`\`${TS_SCHEMA_PATH}\` needs to have a default export.`);
+  }
+  if (!isEqual(schema.default, yaml)) {
+    const path = relativePath(cliPaths.targetRoot, directoryPath);
+    throw new Error(
+      `\`${YAML_SCHEMA_PATH}\` and \`${TS_SCHEMA_PATH}\` do not match. Please run \`yarn backstage-repo-tools schema:openapi:generate ${path}\` to regenerate \`${TS_SCHEMA_PATH}\`.`,
+    );
+  }
+}
+
+export async function bulkCommand(paths: string[] = []): Promise<void> {
+  const resultsList = await runner(paths, dir => verify(dir));
+
+  let failed = false;
+  for (const { relativeDir, resultText } of resultsList) {
+    if (resultText) {
+      console.log();
+      console.log(chalk.red(`OpenAPI validation failed in ${relativeDir}:`));
+      console.log(resultText.trimStart());
+
+      failed = true;
+    }
+  }
+
+  if (failed) {
+    process.exit(1);
+  } else {
+    console.log(chalk.green('Verified all files.'));
+  }
+}
diff --git a/packages/repo-tools/src/lib/paths.ts b/packages/repo-tools/src/lib/paths.ts
index 01a5d92db1..73feeae21c 100644
--- a/packages/repo-tools/src/lib/paths.ts
+++ b/packages/repo-tools/src/lib/paths.ts
@@ -66,3 +66,39 @@ export async function findPackageDirs(selectedPaths: string[] = []) {
   }
   return packageDirs;
 }
+
+/**
+ * Retrieves the list of package names in the "workspaces" field of the `package.json` file in the current workspace root.
+ *
+ * If the file does not exist, or the "workspaces" field is not present, returns `undefined`.
+ *
+ * @returns The list of package names, or `undefined` if not found.
+ */
+export async function getWorkspacePackagePathPatterns(): Promise<
+  string[] | undefined
+> {
+  const pkgJson = await fs
+    .readJson(paths.resolveTargetRoot('package.json'))
+    .catch(error => {
+      if (error.code === 'ENOENT') {
+        return undefined;
+      }
+      throw error;
+    });
+  const workspaces = pkgJson?.workspaces?.packages;
+  return workspaces;
+}
+
+/**
+ * Given a list of paths from the user, returns the listing package directories from the
+ *  workspace. Returns all directories if no paths are given.
+ * @param cliPaths User given paths from CLI.
+ * @returns Matching package directories or all if no cli paths passed in.
+ */
+export async function getMatchingWorkspacePaths(cliPaths: string[]) {
+  const isAllPackages = !cliPaths?.length;
+  const selectedPaths = isAllPackages
+    ? await getWorkspacePackagePathPatterns()
+    : cliPaths;
+  return await findPackageDirs(selectedPaths);
+}
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index c35144626d..fd8f441171 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,43 @@
 # techdocs-cli-embedded-app
 
+## 0.2.81-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/app-defaults@1.3.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## 0.2.81-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/app-defaults@1.3.0-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
 ## 0.2.81-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index bfadbd8471..8c4b82edb8 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.81-next.1",
+  "version": "0.2.81-next.3",
   "private": true,
   "backstage": {
     "role": "frontend"
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index 38a7b04fb8..c94a22421b 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @techdocs/cli
 
+## 1.4.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## 1.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/cli-common@0.1.12
+  - @backstage/config@1.0.7
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
 ## 1.4.1-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 86a32e1cf5..f8b25d14a4 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.1-next.1",
+  "version": "1.4.1-next.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index a68765743d..92972162d3 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/test-utils
 
+## 1.3.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## 1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
 ## 1.3.0-next.1
 
 ### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index fcba882c19..f5360d007c 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.3.0-next.1",
+  "version": "1.3.0-next.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/plugins/adr-backend/CHANGELOG.md b/plugins/adr-backend/CHANGELOG.md
index 1779d769f9..89fe8b0cb5 100644
--- a/plugins/adr-backend/CHANGELOG.md
+++ b/plugins/adr-backend/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-adr-backend
 
+## 0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-adr-common@0.2.8-next.1
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-adr-common@0.2.8-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.3.2-next.1
 
 ### Patch Changes
diff --git a/plugins/adr-backend/package.json b/plugins/adr-backend/package.json
index 8e7c676cc9..6438981675 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.2-next.1",
+  "version": "0.3.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/adr-common/CHANGELOG.md b/plugins/adr-common/CHANGELOG.md
index b4cb2a1a51..32462cbec2 100644
--- a/plugins/adr-common/CHANGELOG.md
+++ b/plugins/adr-common/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-adr-common
 
+## 0.2.8-next.1
+
+### Patch Changes
+
+- 77aa3a4d47e: use path attribute to fetch files instead of name and update the UI to navigate over subdirectories
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.2.8-next.0
 
 ### Patch Changes
diff --git a/plugins/adr-common/package.json b/plugins/adr-common/package.json
index 81cb09c0ae..3d16fddad5 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.8-next.0",
+  "version": "0.2.8-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/adr-common/src/index.ts b/plugins/adr-common/src/index.ts
index c3a048d9d1..cf71367cba 100644
--- a/plugins/adr-common/src/index.ts
+++ b/plugins/adr-common/src/index.ts
@@ -77,7 +77,7 @@ export type AdrFilePathFilterFn = (path: string) => boolean;
  * @public
  */
 export const madrFilePathFilter: AdrFilePathFilterFn = (path: string) =>
-  /^\d{4}-.+\.md$/.test(path);
+  /^(?:.*\/)?\d{4}-.+\.md$/.test(path);
 
 /**
  * ADR indexable document interface
diff --git a/plugins/adr/CHANGELOG.md b/plugins/adr/CHANGELOG.md
index 1e193fb1dc..98d035253d 100644
--- a/plugins/adr/CHANGELOG.md
+++ b/plugins/adr/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-adr
 
+## 0.4.2-next.3
+
+### Patch Changes
+
+- 77aa3a4d47e: use path attribute to fetch files instead of name and update the UI to navigate over subdirectories
+- Updated dependencies
+  - @backstage/plugin-adr-common@0.2.8-next.1
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-adr-common@0.2.8-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/plugins/adr/api-report.md b/plugins/adr/api-report.md
index 1d07edc4ce..dceca2411c 100644
--- a/plugins/adr/api-report.md
+++ b/plugins/adr/api-report.md
@@ -10,6 +10,7 @@ import { AdrFilePathFilterFn } from '@backstage/plugin-adr-common';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { FetchApi } from '@backstage/core-plugin-api';
 import { isAdrAvailable } from '@backstage/plugin-adr-common';
 import { ReactNode } from 'react';
 import { ResultHighlight } from '@backstage/plugin-search-common';
@@ -37,6 +38,8 @@ export class AdrClient implements AdrApi {
 export interface AdrClientOptions {
   // (undocumented)
   discoveryApi: DiscoveryApi;
+  // (undocumented)
+  fetchApi: FetchApi;
 }
 
 // @public
diff --git a/plugins/adr/package.json b/plugins/adr/package.json
index 9928fde364..a4e0d148a5 100644
--- a/plugins/adr/package.json
+++ b/plugins/adr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-adr",
-  "version": "0.4.2-next.1",
+  "version": "0.4.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -35,6 +35,7 @@
     "@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-markdown": "^8.0.0",
     "react-use": "^17.2.4",
     "remark-gfm": "^3.0.1"
diff --git a/plugins/adr/src/api/AdrClient.ts b/plugins/adr/src/api/AdrClient.ts
index da1adc04e4..9b85e8680d 100644
--- a/plugins/adr/src/api/AdrClient.ts
+++ b/plugins/adr/src/api/AdrClient.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 import { AdrApi, AdrListResult, AdrReadResult } from './types';
 
 /**
@@ -24,6 +24,7 @@ import { AdrApi, AdrListResult, AdrReadResult } from './types';
  */
 export interface AdrClientOptions {
   discoveryApi: DiscoveryApi;
+  fetchApi: FetchApi;
 }
 
 const readEndpoint = 'file';
@@ -36,9 +37,11 @@ const listEndpoint = 'list';
  */
 export class AdrClient implements AdrApi {
   private readonly discoveryApi: DiscoveryApi;
+  private readonly fetchApi: FetchApi;
 
   constructor(options: AdrClientOptions) {
     this.discoveryApi = options.discoveryApi;
+    this.fetchApi = options.fetchApi;
   }
 
   private async fetchAdrApi<T>(endpoint: string, fileUrl: string): Promise<T> {
@@ -47,7 +50,7 @@ export class AdrClient implements AdrApi {
       fileUrl,
     )}`;
 
-    const result = await fetch(targetUrl);
+    const result = await this.fetchApi.fetch(targetUrl);
     const data = await result.json();
 
     if (!result.ok) {
diff --git a/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx b/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
index eb5b4aed21..d136de4717 100644
--- a/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
+++ b/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
@@ -16,9 +16,14 @@
 
 import React, { useEffect, useState } from 'react';
 import { Link, useSearchParams } from 'react-router-dom';
+import useAsync from 'react-use/lib/useAsync';
+
+import groupBy from 'lodash/groupBy';
+
 import {
   Content,
   ContentHeader,
+  InfoCard,
   MissingAnnotationEmptyState,
   Progress,
   SupportButton,
@@ -35,27 +40,119 @@ import {
 } from '@backstage/plugin-adr-common';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import {
+  Box,
   Chip,
+  Collapse,
   Grid,
   List,
   ListItem,
+  ListItemIcon,
   ListItemText,
   makeStyles,
   Theme,
   Typography,
 } from '@material-ui/core';
+import ExpandLess from '@material-ui/icons/ExpandLess';
+import ExpandMore from '@material-ui/icons/ExpandMore';
+import FolderIcon from '@material-ui/icons/Folder';
 
+import { adrApiRef, AdrFileInfo } from '../../api';
 import { rootRouteRef } from '../../routes';
 import { AdrContentDecorator, AdrReader } from '../AdrReader';
-import { adrApiRef } from '../../api';
-import useAsync from 'react-use/lib/useAsync';
 
 const useStyles = makeStyles((theme: Theme) => ({
   adrMenu: {
     backgroundColor: theme.palette.background.paper,
   },
+  adrContainerTitle: {
+    color: theme.palette.grey[700],
+    marginBottom: theme.spacing(1),
+  },
+  adrChip: {
+    position: 'absolute',
+    right: 0,
+  },
 }));
 
+const AdrListContainer = (props: {
+  adrs: AdrFileInfo[];
+  selectedAdr: string;
+  title: string;
+}) => {
+  const { adrs, selectedAdr, title } = props;
+  const classes = useStyles();
+  const rootLink = useRouteRef(rootRouteRef);
+  const [open, setOpen] = React.useState(true);
+
+  const getChipColor = (status: string) => {
+    switch (status) {
+      case 'accepted':
+        return 'primary';
+      case 'rejected':
+      case 'deprecated':
+        return 'secondary';
+      default:
+        return 'default';
+    }
+  };
+
+  const handleClick = () => {
+    setOpen(!open);
+  };
+
+  return (
+    <>
+      {title && (
+        <ListItem
+          button
+          className={classes.adrContainerTitle}
+          onClick={handleClick}
+        >
+          <ListItemIcon>
+            <FolderIcon />
+          </ListItemIcon>
+          <ListItemText primary={title} />
+          {open ? <ExpandLess /> : <ExpandMore />}
+        </ListItem>
+      )}
+      <Collapse in={open} timeout="auto" unmountOnExit>
+        <List dense>
+          {adrs.map((adr, idx) => (
+            <ListItem
+              button
+              component={Link}
+              key={idx}
+              selected={selectedAdr === adr.path}
+              to={`${rootLink()}?record=${adr.path}`}
+            >
+              <ListItemText
+                primary={adr.title ?? adr?.name.replace(/\.md$/, '')}
+                primaryTypographyProps={{
+                  style: { whiteSpace: 'normal' },
+                }}
+                secondary={
+                  <Box>
+                    {adr.date}
+                    {adr.status && (
+                      <Chip
+                        color={getChipColor(adr.status)}
+                        label={adr.status}
+                        size="small"
+                        variant="outlined"
+                        className={classes.adrChip}
+                      />
+                    )}
+                  </Box>
+                }
+              />
+            </ListItem>
+          ))}
+        </List>
+      </Collapse>
+    </>
+  );
+};
+
 /**
  * Component for browsing ADRs on an entity page.
  * @public
@@ -67,10 +164,7 @@ export const EntityAdrContent = (props: {
   const { contentDecorators, filePathFilterFn } = props;
   const classes = useStyles();
   const { entity } = useEntity();
-  const rootLink = useRouteRef(rootRouteRef);
-  const [adrList, setAdrList] = useState<
-    { name: string; title?: string; status?: string; date?: string }[]
-  >([]);
+  const [adrList, setAdrList] = useState<AdrFileInfo[]>([]);
   const [searchParams, setSearchParams] = useSearchParams();
   const scmIntegrations = useApi(scmIntegrationsApiRef);
   const adrApi = useApi(adrApiRef);
@@ -82,10 +176,15 @@ export const EntityAdrContent = (props: {
   }, [entity, scmIntegrations]);
 
   const selectedAdr =
-    adrList.find(adr => adr.name === searchParams.get('record'))?.name ?? '';
+    adrList.find(adr => adr.path === searchParams.get('record'))?.path ?? '';
+
+  const adrSubDirectoryFunc = (adr: AdrFileInfo) => {
+    return adr.path.split('/').slice(0, -1).join('/');
+  };
+
   useEffect(() => {
     if (adrList.length && !selectedAdr) {
-      searchParams.set('record', adrList[0].name);
+      searchParams.set('record', adrList[0].path);
       setSearchParams(searchParams, { replace: true });
     }
   });
@@ -95,29 +194,20 @@ export const EntityAdrContent = (props: {
       return;
     }
 
-    const adrs = value.data
-      .filter(
-        (item: { type: string; name: string }) =>
-          item.type === 'file' &&
-          (filePathFilterFn
-            ? filePathFilterFn(item.name)
-            : madrFilePathFilter(item.name)),
-      )
-      .map(({ name, title, status, date }) => ({ name, title, status, date }));
+    const adrs: AdrFileInfo[] = value.data.filter(
+      (item: AdrFileInfo) =>
+        item.type === 'file' &&
+        (filePathFilterFn
+          ? filePathFilterFn(item.path)
+          : madrFilePathFilter(item.path)),
+    );
 
     setAdrList(adrs);
   }, [filePathFilterFn, value]);
 
-  const getChipColor = (status: string) => {
-    switch (status) {
-      case 'accepted':
-        return 'primary';
-      case 'rejected' || 'deprecated':
-        return 'secondary';
-      default:
-        return 'default';
-    }
-  };
+  const adrListGrouped = Object.entries(
+    groupBy(adrList, adrSubDirectoryFunc),
+  ).sort();
 
   return (
     <Content>
@@ -141,33 +231,18 @@ export const EntityAdrContent = (props: {
         (adrList.length ? (
           <Grid container direction="row">
             <Grid item xs={3}>
-              <List className={classes.adrMenu} dense>
-                {adrList.map((adr, idx) => (
-                  <ListItem
-                    key={idx}
-                    button
-                    component={Link}
-                    to={`${rootLink()}?record=${adr.name}`}
-                    selected={selectedAdr === adr.name}
-                  >
-                    <ListItemText
-                      primaryTypographyProps={{
-                        style: { whiteSpace: 'normal' },
-                      }}
-                      primary={adr.title ?? adr?.name.replace(/\.md$/, '')}
-                      secondary={adr.date}
+              <InfoCard>
+                <List className={classes.adrMenu} dense>
+                  {adrListGrouped.map(([title, adrs], idx) => (
+                    <AdrListContainer
+                      adrs={adrs}
+                      key={idx}
+                      selectedAdr={selectedAdr}
+                      title={title}
                     />
-                    {adr.status && (
-                      <Chip
-                        label={adr.status}
-                        size="small"
-                        variant="outlined"
-                        color={getChipColor(adr.status)}
-                      />
-                    )}
-                  </ListItem>
-                ))}
-              </List>
+                  ))}
+                </List>
+              </InfoCard>
             </Grid>
             <Grid item xs={9}>
               <AdrReader adr={selectedAdr} decorators={contentDecorators} />
diff --git a/plugins/adr/src/plugin.ts b/plugins/adr/src/plugin.ts
index 05e4adec4a..d173ef5d78 100644
--- a/plugins/adr/src/plugin.ts
+++ b/plugins/adr/src/plugin.ts
@@ -20,6 +20,7 @@ import {
   createPlugin,
   createRoutableExtension,
   discoveryApiRef,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
 import { rootRouteRef } from './routes';
@@ -36,9 +37,10 @@ export const adrPlugin = createPlugin({
       api: adrApiRef,
       deps: {
         discoveryApi: discoveryApiRef,
+        fetchApi: fetchApiRef,
       },
-      factory({ discoveryApi }) {
-        return new AdrClient({ discoveryApi });
+      factory({ discoveryApi, fetchApi }) {
+        return new AdrClient({ discoveryApi, fetchApi });
       },
     }),
   ],
diff --git a/plugins/airbrake-backend/CHANGELOG.md b/plugins/airbrake-backend/CHANGELOG.md
index 74d2567b20..a04748cc1e 100644
--- a/plugins/airbrake-backend/CHANGELOG.md
+++ b/plugins/airbrake-backend/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-airbrake-backend
 
+## 0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+
 ## 0.2.17-next.1
 
 ### Patch Changes
diff --git a/plugins/airbrake-backend/package.json b/plugins/airbrake-backend/package.json
index 3c445c578c..6010fd99be 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.17-next.1",
+  "version": "0.2.17-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/airbrake/CHANGELOG.md b/plugins/airbrake/CHANGELOG.md
index 0869ca7fb0..3497761f1f 100644
--- a/plugins/airbrake/CHANGELOG.md
+++ b/plugins/airbrake/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-airbrake
 
+## 0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/dev-utils@1.0.14-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/dev-utils@1.0.14-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.17-next.1
 
 ### Patch Changes
diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json
index 706793ad41..be1258a725 100644
--- a/plugins/airbrake/package.json
+++ b/plugins/airbrake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-airbrake",
-  "version": "0.3.17-next.1",
+  "version": "0.3.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
index b0920244c7..310aea81c7 100644
--- a/plugins/allure/CHANGELOG.md
+++ b/plugins/allure/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-allure
 
+## 0.1.33-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.33-next.1
 
 ### Patch Changes
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index ba28028373..306c1bb7de 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.33-next.1",
+  "version": "0.1.33-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/analytics-module-ga/CHANGELOG.md b/plugins/analytics-module-ga/CHANGELOG.md
index a1728540fd..b8b022b909 100644
--- a/plugins/analytics-module-ga/CHANGELOG.md
+++ b/plugins/analytics-module-ga/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-analytics-module-ga
 
+## 0.1.28-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.28-next.1
 
 ### Patch Changes
diff --git a/plugins/analytics-module-ga/package.json b/plugins/analytics-module-ga/package.json
index 9d76a6966f..fc52670354 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.28-next.1",
+  "version": "0.1.28-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/apache-airflow/CHANGELOG.md b/plugins/apache-airflow/CHANGELOG.md
index 8220cfda4a..041bc2ee37 100644
--- a/plugins/apache-airflow/CHANGELOG.md
+++ b/plugins/apache-airflow/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-apache-airflow
 
+## 0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json
index a0f34b5bf6..a313d860a9 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.10-next.1",
+  "version": "0.2.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 2d988f1654..17580e8b99 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-api-docs
 
+## 0.9.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## 0.9.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+
 ## 0.9.2-next.1
 
 ### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 9e4592e680..1099df5adb 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.2-next.1",
+  "version": "0.9.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
index bc413661a8..f89897524d 100644
--- a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
+++ b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
@@ -64,6 +64,7 @@ describe('DefaultApiExplorerPage', () => {
       }),
     getLocationByRef: () =>
       Promise.resolve({ id: 'id', type: 'url', target: 'url' }),
+    getEntitiesByRefs: () => Promise.resolve({ items: [] }),
     getEntityByRef: async entityRef => {
       return {
         apiVersion: 'backstage.io/v1alpha1',
diff --git a/plugins/apollo-explorer/CHANGELOG.md b/plugins/apollo-explorer/CHANGELOG.md
index 185f55f013..8f784e9af1 100644
--- a/plugins/apollo-explorer/CHANGELOG.md
+++ b/plugins/apollo-explorer/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-apollo-explorer
 
+## 0.1.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/apollo-explorer/package.json b/plugins/apollo-explorer/package.json
index 486e437f31..887917212f 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.10-next.1",
+  "version": "0.1.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index 4fc9b23420..7a77524198 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-app-backend
 
+## 0.3.44-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/config-loader@1.1.9
+  - @backstage/types@1.0.2
+
 ## 0.3.44-next.1
 
 ### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index d8cfdac3ec..c244f8272c 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.44-next.1",
+  "version": "0.3.44-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 63ca11d829..85c20f12bd 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-auth-backend
 
+## 0.18.2-next.3
+
+### Patch Changes
+
+- 475abd1dc3f: The `microsoft` (i.e. Azure) auth provider now supports negotiating tokens for
+  Azure resources besides Microsoft Graph (e.g. AKS, Virtual Machines, Machine
+  Learning Services, etc.). When the `/frame/handler` endpoint is called with an
+  authorization code for a non-Microsoft Graph scope, the user profile will not be
+  fetched. Similarly no user profile or photo data will be fetched by the backend
+  if the `/refresh` endpoint is called with the `scope` query parameter strictly
+  containing scopes for resources besides Microsoft Graph.
+
+  Furthermore, the `offline_access` scope will be requested by default, even when
+  it is not mentioned in the argument to `getAccessToken`. This means that any
+  Azure access token can be automatically refreshed, even if the user has not
+  signed in via Azure.
+
+- 6a900951336: Add common identify resolvers for `oidc` auth provider.
+- a0ef1ec7349: Export Azure Easy Auth provider so it can actually be used.
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## 0.18.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 0.18.2-next.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 7515083c09..80db2e0b71 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -229,6 +229,12 @@ export const defaultAuthProviderFactories: {
   [providerId: string]: AuthProviderFactory;
 };
 
+// @public (undocumented)
+export type EasyAuthResult = {
+  fullProfile: Profile;
+  accessToken?: string;
+};
+
 // @public (undocumented)
 export const encodeState: (state: OAuthState) => string;
 
@@ -641,7 +647,10 @@ export const providers: Readonly<{
           }
         | undefined,
     ) => AuthProviderFactory;
-    resolvers: never;
+    resolvers: Readonly<{
+      emailLocalPartMatchingUserEntityName: () => SignInResolver<unknown>;
+      emailMatchingUserEntityProfileEmail: () => SignInResolver<unknown>;
+    }>;
   }>;
   okta: Readonly<{
     create: (
@@ -694,6 +703,19 @@ export const providers: Readonly<{
       nameIdMatchingUserEntityName(): SignInResolver<SamlAuthResult>;
     }>;
   }>;
+  easyAuth: Readonly<{
+    create: (
+      options?:
+        | {
+            authHandler?: AuthHandler<EasyAuthResult> | undefined;
+            signIn: {
+              resolver: SignInResolver<EasyAuthResult>;
+            };
+          }
+        | undefined,
+    ) => AuthProviderFactory;
+    resolvers: never;
+  }>;
 }>;
 
 // @public (undocumented)
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 6ed1a125f7..97ee5f2657 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.2-next.1",
+  "version": "0.18.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/auth-backend/src/providers/azure-easyauth/index.ts b/plugins/auth-backend/src/providers/azure-easyauth/index.ts
index 698092d73f..73abde5f37 100644
--- a/plugins/auth-backend/src/providers/azure-easyauth/index.ts
+++ b/plugins/auth-backend/src/providers/azure-easyauth/index.ts
@@ -15,4 +15,4 @@
  */
 
 export { easyAuth } from './provider';
-export type { EasyAuthResponse } from './provider';
+export type { EasyAuthResult } from './provider';
diff --git a/plugins/auth-backend/src/providers/azure-easyauth/provider.ts b/plugins/auth-backend/src/providers/azure-easyauth/provider.ts
index 405ca9ed59..7da069f6ae 100644
--- a/plugins/auth-backend/src/providers/azure-easyauth/provider.ts
+++ b/plugins/auth-backend/src/providers/azure-easyauth/provider.ts
@@ -38,6 +38,7 @@ type Options = {
   resolverContext: AuthResolverContext;
 };
 
+/** @public */
 export type EasyAuthResult = {
   fullProfile: Profile;
   accessToken?: string;
diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index a922065fd8..8173a7fbc3 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -15,6 +15,7 @@
  */
 
 export type { AwsAlbResult } from './aws-alb';
+export type { EasyAuthResult } from './azure-easyauth';
 export type {
   BitbucketOAuthResult,
   BitbucketPassportProfile,
diff --git a/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.test.ts b/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.test.ts
new file mode 100644
index 0000000000..dee37f0f6b
--- /dev/null
+++ b/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.test.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 { FakeMicrosoftAPI } from './fake';
+
+describe('FakeMicrosoftAPI', () => {
+  const api = new FakeMicrosoftAPI();
+
+  describe('#token', () => {
+    it('exchanges auth codes', () => {
+      const { access_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'authorization_code',
+          code: api.generateAuthCode('User.Read'),
+        }),
+      );
+
+      expect(api.tokenHasScope(access_token, 'User.Read')).toBe(true);
+    });
+
+    it('supports scopes for the first requested audience only', () => {
+      const { access_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'authorization_code',
+          code: api.generateAuthCode('someaudience/somescope User.Read'),
+        }),
+      );
+
+      expect(api.tokenHasScope(access_token, 'User.Read')).toBe(false);
+    });
+
+    it('special openid scopes do not count towards the 1-audience limit', () => {
+      const { access_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'authorization_code',
+          code: api.generateAuthCode('openid offline_access User.Read'),
+        }),
+      );
+
+      expect(api.tokenHasScope(access_token, 'User.Read')).toBe(true);
+    });
+
+    it('refreshes tokens', () => {
+      const { access_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'refresh_token',
+          refresh_token: api.generateRefreshToken(
+            'email openid profile User.Read',
+          ),
+        }),
+      );
+
+      expect(
+        api.tokenHasScope(access_token, 'email openid profile User.Read'),
+      ).toBe(true);
+    });
+    it('requires `openid` scope for ID token', () => {
+      const { id_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'authorization_code',
+          code: api.generateAuthCode('User.Read'),
+        }),
+      );
+
+      expect(id_token).toBeUndefined();
+    });
+    it('requires `offline_access` scope for refresh token', () => {
+      const { refresh_token } = api.token(
+        new URLSearchParams({
+          grant_type: 'authorization_code',
+          code: api.generateAuthCode('User.Read'),
+        }),
+      );
+
+      expect(refresh_token).toBeUndefined();
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.ts b/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.ts
new file mode 100644
index 0000000000..9b3ca09c57
--- /dev/null
+++ b/plugins/auth-backend/src/providers/microsoft/__testUtils__/fake.ts
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { decodeJwt } from 'jose';
+
+type Claims = { aud: string; scp: string };
+
+export class FakeMicrosoftAPI {
+  generateAccessToken(scope: string): string {
+    return this.tokenWithClaims(this.allClaimsForScope(scope)).access_token;
+  }
+  generateAuthCode(scope: string): string {
+    return this.encodeClaims(this.allClaimsForScope(scope));
+  }
+  generateRefreshToken(scope: string): string {
+    return this.encodeClaims(this.allClaimsForScope(scope));
+  }
+  token(formData: URLSearchParams): {
+    access_token: string;
+    scope: string;
+    refresh_token?: string;
+    id_token?: string;
+  } {
+    const scopeParameter = formData.get('scope');
+    const claims =
+      (scopeParameter && this.allClaimsForScope(scopeParameter)) ??
+      formData.get('grant_type') === 'refresh_token'
+        ? this.decodeClaims(formData.get('refresh_token')!)
+        : this.decodeClaims(formData.get('code')!);
+    return {
+      ...this.tokenWithClaims(claims),
+      ...(this.hasScope(claims, 'offline_access') && {
+        refresh_token: this.encodeClaims(claims),
+      }),
+      ...(this.hasScope(claims, 'openid') && {
+        id_token: 'header.e30K.microsoft',
+      }),
+    };
+  }
+  tokenHasScope(token: string, scope: string): boolean {
+    const { aud, scp } = decodeJwt(token);
+    return this.hasScope({ aud: aud as string, scp: scp as string }, scope);
+  }
+  private tokenWithClaims(claims: Claims): {
+    access_token: string;
+    scope: string;
+  } {
+    const filteredClaims = {
+      ...claims,
+      scp: claims.scp
+        .split(' ')
+        .filter(s => s !== 'offline_access')
+        .join(' '),
+    };
+    return {
+      access_token: `header.${Buffer.from(
+        JSON.stringify(filteredClaims),
+      ).toString('base64')}.signature`,
+      scope: this.scopeFromClaims(filteredClaims),
+    };
+  }
+  private allClaimsForScope(scope: string): Claims {
+    const scopes = scope.split(' ').map(this.parseScope);
+    const firstAudience = scopes
+      .map(({ aud }) => aud)
+      .find(aud => aud !== 'openid');
+    return {
+      aud: firstAudience ?? '00000003-0000-0000-c000-000000000000',
+      scp: scopes
+        .filter(({ aud }) => aud === 'openid' || aud === firstAudience)
+        .map(({ scp }) => scp)
+        .join(' '),
+    };
+  }
+  // auth codes and refresh tokens in this fake system are base64-encoded JSON
+  // strings of claims
+  private encodeClaims(claims: Claims): string {
+    return Buffer.from(JSON.stringify(claims)).toString('base64');
+  }
+  private decodeClaims(encoded: string): Claims {
+    return JSON.parse(Buffer.from(encoded, 'base64').toString());
+  }
+  private hasScope(claims: Claims, scope: string): boolean {
+    return this.scopeFromClaims(claims).includes(scope);
+  }
+  private parseScope(s: string): Claims {
+    if (s.includes('/')) {
+      const [aud, scp] = s.split('/');
+      return { aud, scp };
+    }
+    switch (s) {
+      case 'email':
+      case 'openid':
+      case 'offline_access':
+      case 'profile': {
+        return { aud: 'openid', scp: s };
+      }
+      default:
+        return { aud: '00000003-0000-0000-c000-000000000000', scp: s };
+    }
+  }
+  private scopeFromClaims(claims: Claims): string {
+    return claims.scp
+      .split(' ')
+      .map(this.parseScope)
+      .map(({ aud, scp }) =>
+        aud === 'openid' ||
+        claims.aud === '00000003-0000-0000-c000-000000000000'
+          ? scp
+          : `${claims.aud}/${scp}`,
+      )
+      .join(' ');
+  }
+}
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.test.ts b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
index e4e919004c..6f8df2d4df 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.test.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.test.ts
@@ -14,145 +14,423 @@
  * limitations under the License.
  */
 
-import { MicrosoftAuthProvider } from './provider';
-import * as helpers from '../../lib/passport/PassportStrategyHelper';
-import { OAuthResult } from '../../lib/oauth';
+import { microsoft } from './provider';
 import { getVoidLogger } from '@backstage/backend-common';
 import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { ConfigReader } from '@backstage/config';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { AuthResolverContext } from '../types';
+import { AuthProviderRouteHandlers, AuthResolverContext } from '../types';
+import express from 'express';
+import crypto from 'crypto';
+import { FakeMicrosoftAPI } from './__testUtils__/fake';
 
-jest.mock('../../lib/passport/PassportStrategyHelper', () => {
-  return {
-    executeFrameHandlerStrategy: jest.fn(),
-  };
-});
+describe('MicrosoftAuthProvider', () => {
+  const nonce = 'AAAAAAAAAAAAAAAAAAAAAA=='; // 16 bytes of zeros in base64
+  const state = Buffer.from(
+    `nonce=${encodeURIComponent(nonce)}&env=development`,
+  ).toString('hex');
 
-const mockFrameHandler = jest.spyOn(
-  helpers,
-  'executeFrameHandlerStrategy',
-) as unknown as jest.MockedFunction<
-  () => Promise<{ result: OAuthResult; privateInfo: any }>
->;
+  const server = setupServer();
+  const microsoftApi = new FakeMicrosoftAPI();
+  let provider: AuthProviderRouteHandlers;
+  let response: jest.Mocked<express.Response>;
 
-const mockResult = {
-  result: {
-    fullProfile: {
-      emails: [
-        {
-          type: 'work',
-          value: 'conrad@example.com',
-        },
-      ],
-      displayName: 'Conrad',
-      name: {
-        familyName: 'Ribas',
-        givenName: 'Francisco',
+  setupRequestMockHandlers(server);
+
+  beforeEach(() => {
+    provider = microsoft.create({
+      signIn: {
+        resolver: microsoft.resolvers.emailMatchingUserEntityAnnotation(),
       },
-      id: 'conrad',
-      provider: 'microsoft',
-      photos: [
-        {
-          value: 'some-data',
+    })({
+      providerId: 'microsoft',
+      globalConfig: {
+        baseUrl: 'http://backstage.test/api/auth',
+        appUrl: 'http://backstage.test',
+        isOriginAllowed: _ => true,
+      },
+      config: new ConfigReader({
+        development: {
+          tenantId: 'tenantId',
+          clientId: 'clientId',
+          clientSecret: 'clientSecret',
         },
-      ],
-    },
-    params: {
-      id_token: 'idToken',
-      scope: 'scope',
-      expires_in: 123,
-    },
-    accessToken: 'accessToken',
-  },
-  privateInfo: {
-    refreshToken: 'wacka',
-  },
-};
+      }),
+      logger: getVoidLogger(),
+      resolverContext: {
+        issueToken: jest.fn(),
+        findCatalogUser: jest.fn(),
+        signInWithCatalogUser: _ =>
+          Promise.resolve({
+            token: 'header.e30K.backstage',
+          }),
+      } as AuthResolverContext,
+    }) as AuthProviderRouteHandlers;
 
-const server = setupServer();
-setupRequestMockHandlers(server);
-
-const setupHandlers = () => {
-  server.use(
-    rest.get(
-      'https://graph.microsoft.com/v1.0/me/photos/*',
-      async (_, res, ctx) => {
-        const imageBuffer = new Uint8Array([104, 111, 119, 100, 121]).buffer;
+    server.use(
+      rest.post(
+        'https://login.microsoftonline.com/tenantId/oauth2/v2.0/token',
+        async (req, res, ctx) => {
+          return res(
+            ctx.json({
+              ...microsoftApi.token(new URLSearchParams(await req.text())),
+              token_type: 'Bearer',
+              expires_in: 123,
+              ext_expires_in: 123,
+            }),
+          );
+        },
+      ),
+      rest.get('https://graph.microsoft.com/v1.0/me/', (req, res, ctx) => {
+        if (
+          !microsoftApi.tokenHasScope(
+            req.headers.get('authorization')!.replace(/^Bearer /, ''),
+            'User.Read',
+          )
+        ) {
+          return res(ctx.status(403));
+        }
         return res(
-          ctx.set('Content-Length', imageBuffer.byteLength.toString()),
-          ctx.set('Content-Type', 'image/jpeg'),
-          ctx.body(imageBuffer),
+          ctx.json({
+            id: 'conrad',
+            displayName: 'Conrad',
+            surname: 'Ribas',
+            givenName: 'Francisco',
+            mail: 'conrad@example.com',
+          }),
         );
-      },
-    ),
-  );
-};
-
-describe('createMicrosoftProvider', () => {
-  it('should auth', async () => {
-    setupHandlers();
-
-    const provider = new MicrosoftAuthProvider({
-      logger: getVoidLogger(),
-      resolverContext: {} as AuthResolverContext,
-      authHandler: async ({ fullProfile }) => ({
-        profile: {
-          email: fullProfile.emails![0]!.value,
-          displayName: fullProfile.displayName,
-          picture: 'http://microsoft.com/lols',
-        },
       }),
-      clientId: 'mock',
-      clientSecret: 'mock',
-      callbackUrl: 'mock',
+      rest.get(
+        'https://graph.microsoft.com/v1.0/me/photos/*',
+        async (req, res, ctx) => {
+          if (
+            !microsoftApi.tokenHasScope(
+              req.headers.get('authorization')!.replace(/^Bearer /, ''),
+              'User.Read',
+            )
+          ) {
+            return res(ctx.status(403));
+          }
+          const imageBuffer = new Uint8Array([104, 111, 119, 100, 121]).buffer;
+          return res(
+            ctx.set('Content-Length', imageBuffer.byteLength.toString()),
+            ctx.set('Content-Type', 'image/jpeg'),
+            ctx.body(imageBuffer),
+          );
+        },
+      ),
+    );
+    response = {
+      cookie: jest.fn(),
+      end: jest.fn(),
+      json: jest.fn(),
+      setHeader: jest.fn(),
+      status: jest.fn(),
+    } as unknown as jest.Mocked<express.Response>;
+    response.status.mockReturnValue(response);
+  });
+
+  describe('#start', () => {
+    const randomBytes = jest.spyOn(
+      crypto,
+      'randomBytes',
+    ) as unknown as jest.MockedFunction<(size: number) => Buffer>;
+
+    afterEach(() => {
+      randomBytes.mockRestore();
     });
 
-    mockFrameHandler.mockResolvedValueOnce(mockResult);
-    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://microsoft.com/lols',
-      },
+    it('redirects to authorize URL', async () => {
+      randomBytes.mockReturnValue(Buffer.from(nonce, 'base64'));
+
+      await provider.start(
+        {
+          query: {
+            env: 'development',
+            scope: 'email openid profile User.Read',
+          },
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.setHeader).toHaveBeenCalledWith(
+        'Location',
+        'https://login.microsoftonline.com/tenantId/oauth2/v2.0/authorize' +
+          '?response_type=code' +
+          `&redirect_uri=${encodeURIComponent(
+            'http://backstage.test/api/auth/microsoft/handler/frame',
+          )}` +
+          `&scope=${encodeURIComponent('email openid profile User.Read')}` +
+          `&state=${state}` +
+          '&client_id=clientId',
+      );
     });
   });
 
-  it('should return the base64 encoded photo data of the profile', async () => {
-    setupHandlers();
-    const provider = new MicrosoftAuthProvider({
-      logger: getVoidLogger(),
-      resolverContext: {} as AuthResolverContext,
-      authHandler: async ({ fullProfile }) => ({
-        profile: {
-          email: fullProfile.emails![0]!.value,
-          displayName: fullProfile.displayName,
-          picture: 'http://microsoft.com/lols',
-        },
-      }),
-      clientId: 'mock',
-      clientSecret: 'mock',
-      callbackUrl: 'mock',
-      // define resolver to return user `info` for photo validation
-      signInResolver: async (info, _) => {
-        return {
-          id: 'user.name',
-          token: 'token',
-          info: info,
-        };
-      },
+  describe('#handle', () => {
+    it('returns provider info and profile with photo data', async () => {
+      await provider.frameHandler(
+        {
+          query: {
+            env: 'development',
+            code: microsoftApi.generateAuthCode(
+              'email openid profile User.Read',
+            ),
+            state,
+          },
+          cookies: {
+            'microsoft-nonce': nonce,
+          },
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.end).toHaveBeenCalledWith(
+        expect.stringContaining(
+          encodeURIComponent(
+            JSON.stringify({
+              type: 'authorization_response',
+              response: {
+                providerInfo: {
+                  accessToken: microsoftApi.generateAccessToken(
+                    'email openid profile User.Read',
+                  ),
+                  scope: 'email openid profile User.Read',
+                  expiresInSeconds: 123,
+                  idToken: 'header.e30K.microsoft',
+                },
+                profile: {
+                  email: 'conrad@example.com',
+                  picture: 'data:image/jpeg;base64,aG93ZHk=',
+                  displayName: 'Conrad',
+                },
+                backstageIdentity: {
+                  token: 'header.e30K.backstage',
+                  identity: { type: 'user', ownershipEntityRefs: [] },
+                },
+              },
+            }),
+          ),
+        ),
+      );
+    });
+
+    it('returns access token for non-microsoft graph scope', async () => {
+      await provider.frameHandler(
+        {
+          query: {
+            env: 'development',
+            code: microsoftApi.generateAuthCode('aks-audience/user.read'),
+            state,
+          },
+          cookies: {
+            'microsoft-nonce': nonce,
+          },
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.end).toHaveBeenCalledWith(
+        expect.stringContaining(
+          encodeURIComponent(
+            JSON.stringify({
+              type: 'authorization_response',
+              response: {
+                providerInfo: {
+                  accessToken: microsoftApi.generateAccessToken(
+                    'aks-audience/user.read',
+                  ),
+                  scope: 'aks-audience/user.read',
+                  expiresInSeconds: 123,
+                },
+                profile: {},
+              },
+            }),
+          ),
+        ),
+      );
+    });
+
+    it('sets refresh token', async () => {
+      await provider.frameHandler(
+        {
+          query: {
+            env: 'development',
+            code: microsoftApi.generateAuthCode(
+              'email offline_access openid profile User.Read',
+            ),
+            state,
+          },
+          cookies: {
+            'microsoft-nonce': nonce,
+          },
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.cookie).toHaveBeenCalledWith(
+        'microsoft-refresh-token',
+        microsoftApi.generateRefreshToken(
+          'email offline_access openid profile User.Read',
+        ),
+        {
+          domain: 'backstage.test',
+          httpOnly: true,
+          maxAge: 86400000000,
+          path: '/api/auth/microsoft',
+          sameSite: 'lax',
+          secure: false,
+        },
+      );
+    });
+
+    it('omits photo data when fetching it fails', async () => {
+      server.use(
+        rest.get('https://graph.microsoft.com/v1.0/me/photos/*', (_, res) =>
+          res.networkError('remote hung up'),
+        ),
+      );
+
+      await provider.frameHandler(
+        {
+          query: {
+            env: 'development',
+            code: microsoftApi.generateAuthCode(
+              'email openid profile User.Read',
+            ),
+            state,
+          },
+          cookies: {
+            'microsoft-nonce': nonce,
+          },
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.end).toHaveBeenCalledWith(
+        expect.stringContaining(
+          encodeURIComponent(
+            JSON.stringify({
+              type: 'authorization_response',
+              response: {
+                providerInfo: {
+                  accessToken: microsoftApi.generateAccessToken(
+                    'email openid profile User.Read',
+                  ),
+                  scope: 'email openid profile User.Read',
+                  expiresInSeconds: 123,
+                  idToken: 'header.e30K.microsoft',
+                },
+                profile: {
+                  email: 'conrad@example.com',
+                  displayName: 'Conrad',
+                },
+                backstageIdentity: {
+                  token: 'header.e30K.backstage',
+                  identity: { type: 'user', ownershipEntityRefs: [] },
+                },
+              },
+            }),
+          ),
+        ),
+      );
+    });
+  });
+
+  describe('#refresh', () => {
+    it('returns provider info and profile with photo data', async () => {
+      await provider.refresh!(
+        {
+          query: {
+            env: 'development',
+            scope: 'email openid profile User.Read',
+          },
+          header: jest.fn(_ => 'XMLHttpRequest'),
+          cookies: {
+            'microsoft-refresh-token': microsoftApi.generateRefreshToken(
+              'email openid profile User.Read',
+            ),
+          },
+          get: jest.fn(),
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.json).toHaveBeenCalledWith(
+        expect.objectContaining({
+          providerInfo: {
+            accessToken: microsoftApi.generateAccessToken(
+              'email openid profile User.Read',
+            ),
+            scope: 'email openid profile User.Read',
+            expiresInSeconds: 123,
+            idToken: 'header.e30K.microsoft',
+          },
+          profile: {
+            email: 'conrad@example.com',
+            picture: 'data:image/jpeg;base64,aG93ZHk=',
+            displayName: 'Conrad',
+          },
+        }),
+      );
+    });
+
+    it('returns access token for non-microsoft graph scope', async () => {
+      await provider.refresh!(
+        {
+          query: {
+            env: 'development',
+            scope: 'aks-audience/user.read',
+          },
+          header: jest.fn(_ => 'XMLHttpRequest'),
+          cookies: {
+            'microsoft-refresh-token': microsoftApi.generateRefreshToken(
+              'aks-audience/user.read',
+            ),
+          },
+          get: jest.fn(),
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.json).toHaveBeenCalledWith({
+        providerInfo: {
+          accessToken: microsoftApi.generateAccessToken(
+            'aks-audience/user.read',
+          ),
+          expiresInSeconds: 123,
+          scope: 'aks-audience/user.read',
+        },
+        profile: {},
+      });
+    });
+
+    it('returns backstage identity', async () => {
+      await provider.refresh!(
+        {
+          query: {
+            env: 'development',
+            scope: 'email openid profile User.Read',
+          },
+          header: jest.fn(_ => 'XMLHttpRequest'),
+          cookies: {
+            'microsoft-refresh-token': microsoftApi.generateRefreshToken(
+              'email openid profile User.Read',
+            ),
+          },
+          get: jest.fn(),
+        } as unknown as express.Request,
+        response,
+      );
+
+      expect(response.json).toHaveBeenCalledWith(
+        expect.objectContaining({
+          backstageIdentity: expect.objectContaining({
+            token: 'header.e30K.backstage',
+          }),
+        }),
+      );
     });
-    mockFrameHandler.mockResolvedValueOnce(mockResult);
-    const { response } = await provider.handler({} as any);
-    const overloadedIdentity = response.backstageIdentity as any;
-    const photo = overloadedIdentity.info.result.fullProfile.photos[0];
-    expect(photo.value).toEqual('data:image/jpeg;base64,aG93ZHk=');
   });
 });
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index 9b14a3c91b..5d02b7ef61 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -49,6 +49,8 @@ import {
 } from '../resolvers';
 import { Logger } from 'winston';
 import fetch from 'node-fetch';
+import { decodeJwt } from 'jose';
+import { Profile as PassportProfile } from 'passport';
 
 const BACKSTAGE_SESSION_EXPIRATION = 3600;
 
@@ -86,6 +88,12 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
         authorizationURL: options.authorizationUrl,
         tokenURL: options.tokenUrl,
         passReqToCallback: false,
+        skipUserProfile: (
+          accessToken: string,
+          done: (err: unknown, skip: boolean) => void,
+        ) => {
+          done(null, this.skipUserProfile(accessToken));
+        },
       },
       (
         accessToken: any,
@@ -99,6 +107,17 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
     );
   }
 
+  private skipUserProfile = (accessToken: string): boolean => {
+    const { aud, scp } = decodeJwt(accessToken);
+    const hasGraphReadScope =
+      aud === '00000003-0000-0000-c000-000000000000' &&
+      (scp as string)
+        .split(' ')
+        .map(s => s.toLowerCase())
+        .includes('user.read');
+    return !hasGraphReadScope;
+  };
+
   async start(req: OAuthStartRequest): Promise<OAuthStartResponse> {
     return await executeRedirectStrategy(req, this._strategy, {
       scope: req.scope,
@@ -126,53 +145,62 @@ export class MicrosoftAuthProvider implements OAuthHandlers {
         req.scope,
       );
 
-    const fullProfile = await executeFetchUserProfileStrategy(
-      this._strategy,
-      accessToken,
-    );
-
     return {
       response: await this.handleResult({
-        fullProfile,
         params,
         accessToken,
+        ...(!this.skipUserProfile(accessToken) && {
+          fullProfile: await executeFetchUserProfileStrategy(
+            this._strategy,
+            accessToken,
+          ),
+        }),
       }),
       refreshToken,
     };
   }
 
-  private async handleResult(result: OAuthResult) {
-    const photo = await this.getUserPhoto(result.accessToken);
-    result.fullProfile.photos = photo ? [{ value: photo }] : undefined;
-
-    const { profile } = await this.authHandler(result, this.resolverContext);
+  private async handleResult(result: {
+    fullProfile?: PassportProfile;
+    params: {
+      id_token?: string;
+      scope: string;
+      expires_in: number;
+    };
+    accessToken: string;
+    refreshToken?: string;
+  }): Promise<OAuthResponse> {
+    let profile = {};
+    if (result.fullProfile) {
+      const photo = await this.getUserPhoto(result.accessToken);
+      result.fullProfile.photos = photo ? [{ value: photo }] : undefined;
+      ({ profile } = await this.authHandler(
+        result as OAuthResult,
+        this.resolverContext,
+      ));
+    }
 
     const expiresInSeconds =
       result.params.expires_in === undefined
         ? BACKSTAGE_SESSION_EXPIRATION
         : Math.min(result.params.expires_in, BACKSTAGE_SESSION_EXPIRATION);
 
-    const response: OAuthResponse = {
+    return {
       providerInfo: {
-        idToken: result.params.id_token,
         accessToken: result.accessToken,
         scope: result.params.scope,
         expiresInSeconds,
+        ...{ idToken: result.params.id_token },
       },
       profile,
+      ...(result.fullProfile &&
+        this.signInResolver && {
+          backstageIdentity: await this.signInResolver(
+            { result: result as OAuthResult, profile },
+            this.resolverContext,
+          ),
+        }),
     };
-
-    if (this.signInResolver) {
-      response.backstageIdentity = await this.signInResolver(
-        {
-          result,
-          profile,
-        },
-        this.resolverContext,
-      );
-    }
-
-    return response;
   }
 
   private async getUserPhoto(accessToken: string): Promise<string | undefined> {
@@ -236,7 +264,7 @@ export const microsoft = createAuthProviderIntegration({
         const authHandler: AuthHandler<OAuthResult> = options?.authHandler
           ? options.authHandler
           : async ({ fullProfile, params }) => ({
-              profile: makeProfileInfo(fullProfile, params.id_token),
+              profile: makeProfileInfo(fullProfile ?? {}, params.id_token),
             });
 
         const provider = new MicrosoftAuthProvider({
diff --git a/plugins/auth-backend/src/providers/oidc/provider.ts b/plugins/auth-backend/src/providers/oidc/provider.ts
index bce8ba843b..a5196f0930 100644
--- a/plugins/auth-backend/src/providers/oidc/provider.ts
+++ b/plugins/auth-backend/src/providers/oidc/provider.ts
@@ -44,6 +44,10 @@ import {
   SignInResolver,
 } from '../types';
 import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
+import {
+  commonByEmailLocalPartResolver,
+  commonByEmailResolver,
+} from '../resolvers';
 
 type PrivateInfo = {
   refreshToken?: string;
@@ -255,4 +259,14 @@ export const oidc = createAuthProviderIntegration({
         });
       });
   },
+  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,
+  },
 });
diff --git a/plugins/auth-backend/src/providers/providers.ts b/plugins/auth-backend/src/providers/providers.ts
index aa630b7481..36a24f4f6c 100644
--- a/plugins/auth-backend/src/providers/providers.ts
+++ b/plugins/auth-backend/src/providers/providers.ts
@@ -32,6 +32,7 @@ import { onelogin } from './onelogin';
 import { saml } from './saml';
 import { AuthProviderFactory } from './types';
 import { bitbucketServer } from './bitbucketServer';
+import { easyAuth } from './azure-easyauth';
 
 /**
  * All built-in auth provider integrations.
@@ -56,6 +57,7 @@ export const providers = Object.freeze({
   okta,
   onelogin,
   saml,
+  easyAuth,
 });
 
 /**
@@ -73,6 +75,7 @@ export const defaultAuthProviderFactories: {
   okta: okta.create(),
   auth0: auth0.create(),
   microsoft: microsoft.create(),
+  easyAuth: easyAuth.create(),
   oauth2: oauth2.create(),
   oidc: oidc.create(),
   onelogin: onelogin.create(),
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index 44ed726d5a..9dde123f84 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-node
 
+## 0.2.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.2.13-next.1
 
 ### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index ba5e912ebc..3c5003793b 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.13-next.1",
+  "version": "0.2.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops-backend/CHANGELOG.md b/plugins/azure-devops-backend/CHANGELOG.md
index d5339767bd..5102c3c787 100644
--- a/plugins/azure-devops-backend/CHANGELOG.md
+++ b/plugins/azure-devops-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-azure-devops-backend
 
+## 0.3.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-azure-devops-common@0.3.0
+
 ## 0.3.23-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json
index 8db640ba28..dadb20d3e7 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.23-next.1",
+  "version": "0.3.23-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops/CHANGELOG.md b/plugins/azure-devops/CHANGELOG.md
index e16dcf8ae8..d526ed8fd4 100644
--- a/plugins/azure-devops/CHANGELOG.md
+++ b/plugins/azure-devops/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-azure-devops
 
+## 0.2.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.2.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
 ## 0.2.8-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index c01f24f4d7..045307a2f2 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-devops",
-  "version": "0.2.8-next.1",
+  "version": "0.2.8-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-sites-backend/CHANGELOG.md b/plugins/azure-sites-backend/CHANGELOG.md
index 65536ca7e1..38fe8f8478 100644
--- a/plugins/azure-sites-backend/CHANGELOG.md
+++ b/plugins/azure-sites-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-azure-sites-backend
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-azure-sites-common@0.1.0
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-sites-backend/package.json b/plugins/azure-sites-backend/package.json
index dfe0d0072e..fbfd3b2426 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-sites/CHANGELOG.md b/plugins/azure-sites/CHANGELOG.md
index 91518fc2d6..24cd5302d4 100644
--- a/plugins/azure-sites/CHANGELOG.md
+++ b/plugins/azure-sites/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-azure-sites
 
+## 0.1.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/azure-sites/package.json b/plugins/azure-sites/package.json
index d1ef1c04f1..77d7c083b2 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.6-next.1",
+  "version": "0.1.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/badges-backend/CHANGELOG.md b/plugins/badges-backend/CHANGELOG.md
index 7e85f16b61..2d5a54dd2d 100644
--- a/plugins/badges-backend/CHANGELOG.md
+++ b/plugins/badges-backend/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-badges-backend
 
+## 0.1.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## 0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.1.38-next.1
 
 ### Patch Changes
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index af36d6d383..ec16daed9f 100644
--- a/plugins/badges-backend/package.json
+++ b/plugins/badges-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-badges-backend",
   "description": "A Backstage backend plugin that generates README badges for your entities",
-  "version": "0.1.38-next.1",
+  "version": "0.1.38-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index 944e5d006b..5d0640c877 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-badges
 
+## 0.2.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.41-next.1
 
 ### Patch Changes
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index feaa9e7199..977c56774f 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.41-next.1",
+  "version": "0.2.41-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar-backend/CHANGELOG.md b/plugins/bazaar-backend/CHANGELOG.md
index 69dd407f58..d2fe3dd640 100644
--- a/plugins/bazaar-backend/CHANGELOG.md
+++ b/plugins/bazaar-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-bazaar-backend
 
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 0.2.7-next.1
 
 ### Patch Changes
diff --git a/packages/core-components/src/components/Tabs/Tab.test.tsx b/plugins/bazaar-backend/migrations/20230407142544_add_docs_to_metadata.js
similarity index 52%
rename from packages/core-components/src/components/Tabs/Tab.test.tsx
rename to plugins/bazaar-backend/migrations/20230407142544_add_docs_to_metadata.js
index d30420ebb6..de73308431 100644
--- a/packages/core-components/src/components/Tabs/Tab.test.tsx
+++ b/plugins/bazaar-backend/migrations/20230407142544_add_docs_to_metadata.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2022 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,24 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { renderInTestApp } from '@backstage/test-utils';
-import { StyledTab } from './Tab';
+// @ts-check
 
-describe('<Tab />', () => {
-  it('renders without exploding', async () => {
-    const rendered = await renderInTestApp(<StyledTab label="test" />);
-    expect(rendered.getByText('test')).toBeInTheDocument();
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('metadata', table => {
+    table.text('docs').comment('The link to the project docs (optional)');
   });
-});
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('metadata', table => {
+    table.dropColumn('docs');
+  });
+};
diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json
index 9312cd1e88..3c417dc7aa 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.7-next.1",
+  "version": "0.2.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
index 8978679ff4..0c78dbdd87 100644
--- a/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
+++ b/plugins/bazaar-backend/src/service/DatabaseHandler.test.ts
@@ -29,6 +29,7 @@ const bazaarProject: any = {
   endDate: null,
   size: 'small',
   responsible: 'r',
+  docs: '',
 };
 
 jest.setTimeout(60_000);
@@ -75,6 +76,7 @@ describe('DatabaseHandler', () => {
         end_date: bazaarProject.endDate,
         size: bazaarProject.size,
         responsible: bazaarProject.responsible,
+        docs: bazaarProject.docs,
       });
 
       // Add a member to the project
@@ -94,6 +96,7 @@ describe('DatabaseHandler', () => {
       expect(res[0].end_date).toEqual(null);
       expect(res[0].size).toEqual('small');
       expect(res[0].responsible).toEqual('r');
+      expect(res[0].docs).toEqual('');
       expect(
         res[0].members_count === '1' || res[0].members_count === 1,
       ).toBeTruthy();
diff --git a/plugins/bazaar-backend/src/service/DatabaseHandler.ts b/plugins/bazaar-backend/src/service/DatabaseHandler.ts
index f75ea8b782..1d3c231409 100644
--- a/plugins/bazaar-backend/src/service/DatabaseHandler.ts
+++ b/plugins/bazaar-backend/src/service/DatabaseHandler.ts
@@ -61,6 +61,7 @@ export class DatabaseHandler {
     'metadata.start_date',
     'metadata.end_date',
     'metadata.responsible',
+    'metadata.docs',
   ];
 
   async getMembers(id: string) {
@@ -120,6 +121,7 @@ export class DatabaseHandler {
       entityRef,
       community,
       description,
+      docs,
       status,
       size,
       startDate,
@@ -133,6 +135,7 @@ export class DatabaseHandler {
         entity_ref: entityRef,
         community,
         description,
+        docs,
         status,
         updated_at: new Date().toISOString(),
         size,
@@ -150,6 +153,7 @@ export class DatabaseHandler {
       entityRef,
       community,
       description,
+      docs,
       status,
       size,
       startDate,
@@ -162,6 +166,7 @@ export class DatabaseHandler {
       entity_ref: entityRef,
       description,
       community,
+      docs,
       status,
       updated_at: new Date().toISOString(),
       size,
diff --git a/plugins/bazaar/CHANGELOG.md b/plugins/bazaar/CHANGELOG.md
index 726ab99b0d..adc425b408 100644
--- a/plugins/bazaar/CHANGELOG.md
+++ b/plugins/bazaar/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-bazaar
 
+## 0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.3
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.6-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+
 ## 0.2.7-next.1
 
 ### Patch Changes
diff --git a/plugins/bazaar/README.md b/plugins/bazaar/README.md
index bd4589f2d3..9b5fb466df 100644
--- a/plugins/bazaar/README.md
+++ b/plugins/bazaar/README.md
@@ -127,6 +127,7 @@ The other fields are:
 
 - project - link Bazaar project to existing entity in the catalog
 - community link - link to where the project members can communicate, e.g. Teams or Discord link
+- docs link - link to visit the documentation of the project
 - start date
 - end date
 
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index 0d0db8b1bd..7bce3eedc7 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.2.7-next.1",
+  "version": "0.2.7-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx b/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx
index 45392206d9..c07ae0cfd1 100644
--- a/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx
+++ b/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx
@@ -45,6 +45,7 @@ export const AddProjectDialog = ({
     title: '',
     community: '',
     description: '',
+    docs: '',
     status: 'proposed' as Status,
     size: 'medium' as Size,
     responsible: '',
diff --git a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
index e0a3a9b881..0c7b0bb126 100644
--- a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
+++ b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
@@ -26,6 +26,7 @@ import ChatIcon from '@material-ui/icons/Chat';
 import PersonAddIcon from '@material-ui/icons/PersonAdd';
 import DashboardIcon from '@material-ui/icons/Dashboard';
 import LinkOffIcon from '@material-ui/icons/LinkOff';
+import Description from '@material-ui/icons/Description';
 import { EditProjectDialog } from '../EditProjectDialog';
 import { useApi, identityApiRef } from '@backstage/core-plugin-api';
 import { BazaarProject, Member } from '../../types';
@@ -128,6 +129,12 @@ export const EntityBazaarInfoContent = ({
       href: bazaarProject?.community,
       disabled: bazaarProject?.community === '' || !isMember,
     },
+    {
+      label: 'Docs',
+      icon: <Description />,
+      href: bazaarProject?.docs,
+      disabled: bazaarProject?.docs === null || bazaarProject?.docs === '',
+    },
   ];
 
   const handleEditClose = () => {
diff --git a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
index 7c6491c8a5..782b7d3c67 100644
--- a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
+++ b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
@@ -34,6 +34,7 @@ import InsertLinkIcon from '@material-ui/icons/InsertLink';
 import DashboardIcon from '@material-ui/icons/Dashboard';
 import CloseIcon from '@material-ui/icons/Close';
 import LinkOffIcon from '@material-ui/icons/LinkOff';
+import Description from '@material-ui/icons/Description';
 import { EditProjectDialog } from '../EditProjectDialog';
 import ExitToAppIcon from '@material-ui/icons/ExitToApp';
 import {
@@ -197,6 +198,13 @@ export const HomePageBazaarInfoCard = ({
       href: bazaarProject.value?.community,
       disabled: !bazaarProject.value?.community || !isMember,
     },
+    {
+      label: 'Docs',
+      icon: <Description />,
+      href: bazaarProject.value?.docs,
+      disabled:
+        bazaarProject.value?.docs === null || bazaarProject.value?.docs === '',
+    },
   ];
 
   const handleUnlinkSubmit = async () => {
diff --git a/plugins/bazaar/src/components/InputField/InputField.tsx b/plugins/bazaar/src/components/InputField/InputField.tsx
index a2c8ca4ac4..a926ac41ad 100644
--- a/plugins/bazaar/src/components/InputField/InputField.tsx
+++ b/plugins/bazaar/src/components/InputField/InputField.tsx
@@ -30,7 +30,7 @@ type Rules = {
 };
 
 type Props = {
-  inputType: 'description' | 'community' | 'responsible' | 'title';
+  inputType: 'description' | 'community' | 'responsible' | 'title' | 'docs';
   error?: FieldError | undefined;
   control: Control<FormValues, object>;
   helperText?: string;
diff --git a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
index ec7312576d..3a0d156fd8 100644
--- a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
+++ b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx
@@ -144,6 +144,18 @@ export const ProjectDialog = ({
             placeholder="Community link to e.g. Teams or Discord"
           />
 
+          <InputField
+            error={errors.docs}
+            control={control}
+            rules={{
+              required: false,
+              pattern: RegExp('^(https?)://'),
+            }}
+            inputType="docs"
+            helperText="Please enter a link starting with http/https"
+            placeholder="Project docs link"
+          />
+
           <DoubleDateSelector setValue={setValue} control={control} />
         </DialogContent>
 
diff --git a/plugins/bazaar/src/types.ts b/plugins/bazaar/src/types.ts
index 055ec2fcab..7ca8e07aad 100644
--- a/plugins/bazaar/src/types.ts
+++ b/plugins/bazaar/src/types.ts
@@ -39,6 +39,7 @@ export type BazaarProject = {
   startDate?: string | null;
   endDate?: string | null;
   responsible: string;
+  docs: string;
 };
 
 export type FormValues = {
@@ -50,4 +51,5 @@ export type FormValues = {
   startDate?: string | null;
   endDate?: string | null;
   responsible: string;
+  docs: string;
 };
diff --git a/plugins/bazaar/src/util/parseMethods.ts b/plugins/bazaar/src/util/parseMethods.ts
index b93f70c9f1..3be2be2aa9 100644
--- a/plugins/bazaar/src/util/parseMethods.ts
+++ b/plugins/bazaar/src/util/parseMethods.ts
@@ -30,6 +30,7 @@ export const parseBazaarProject = (metadata: any): BazaarProject => {
     startDate: metadata.start_date,
     endDate: metadata.end_date,
     responsible: metadata.responsible,
+    docs: metadata.docs,
   } as BazaarProject;
 };
 
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index 69cc1ebb14..98888ae185 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-bitrise
 
+## 0.1.44-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.44-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.44-next.1
 
 ### Patch Changes
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index d491d51969..d974f8ed10 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.44-next.1",
+  "version": "0.1.44-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index 7f90b3fd48..78743db39b 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.1.18-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+
+## 0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+
 ## 0.1.18-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 2cc7af7864..0e5c7f892a 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-aws",
   "description": "A Backstage catalog backend module that helps integrate towards AWS",
-  "version": "0.1.18-next.1",
+  "version": "0.1.18-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index 84fa012561..9e218177e3 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.15-next.2
+
+### Patch Changes
+
+- 62a725e3a94: Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.15-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/api-report.md b/plugins/catalog-backend-module-azure/api-report.md
index a1b9d706a9..596ebbf6cf 100644
--- a/plugins/catalog-backend-module-azure/api-report.md
+++ b/plugins/catalog-backend-module-azure/api-report.md
@@ -8,7 +8,7 @@ import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
 import { Config } from '@backstage/config';
 import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { Logger } from 'winston';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { ScmIntegrationRegistry } from '@backstage/integration';
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index 0c1fd67dfa..d70cd34492 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.15-next.1",
+  "version": "0.1.15-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -52,6 +52,7 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
+    "@backstage/plugin-catalog-common": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "lodash": "^4.17.21",
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 0a1ec1e3cf..4a8e1d4537 100644
--- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts
@@ -16,7 +16,7 @@
 
 import { getVoidLogger } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 import {
   AzureDevOpsDiscoveryProcessor,
   parseUrl,
diff --git a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
index fde59046ef..bad6067dc3 100644
--- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
@@ -22,9 +22,9 @@ import {
 import {
   CatalogProcessor,
   CatalogProcessorEmit,
-  LocationSpec,
   processingResult,
 } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { Logger } from 'winston';
 import { codeSearch } from '../lib';
 
diff --git a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
index 6ad4e9ae0b..5abd23ce00 100644
--- a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
@@ -20,9 +20,9 @@ import { AzureIntegration, ScmIntegrations } from '@backstage/integration';
 import {
   EntityProvider,
   EntityProviderConnection,
-  LocationSpec,
   locationSpecToLocationEntity,
 } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { readAzureDevOpsConfigs } from './config';
 import { Logger } from 'winston';
 import { AzureDevOpsConfig } from './types';
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 83ad89a421..c9d9952759 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.1.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## 0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.11-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 6c68e623bb..5672ebd7c4 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.11-next.1",
+  "version": "0.1.11-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index 585d71de97..b6e03afe72 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.1.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.9-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 26172a1a67..e2239cd678 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.9-next.1",
+  "version": "0.1.9-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
index ad1095e516..03ed8519d2 100644
--- a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-bitbucket
 
+## 0.2.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.2.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.2.11-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket/package.json b/plugins/catalog-backend-module-bitbucket/package.json
index 82ffe0e2b2..c466a9fca0 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.11-next.1",
+  "version": "0.2.11-next.3",
   "deprecated": true,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 64f6802299..4e761e0a12 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.12-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index 1738e353f3..3d1d4fb629 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.12-next.1",
+  "version": "0.1.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index 25b20998a8..fcfecd07c0 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.2.7-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index 75dfdad2df..d52718f1ce 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
-  "version": "0.2.7-next.1",
+  "version": "0.2.7-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index 22520d23f4..be98941f00 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.2.0-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index c690cc4c58..bbb645c127 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.0-next.1",
+  "version": "0.2.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index dc093645eb..f8e428c520 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.3.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 61ad8f365d..0beff7de8e 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.3.1-next.1",
+  "version": "0.3.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 3f29bba1b9..97d8290c60 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.5.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.5.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.5.11-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index ba8fa9935d..61cc16058d 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.11-next.1",
+  "version": "0.5.11-next.3",
   "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 deadba915f..787354261d 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.5.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.5.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 5a781a7cae..bd1e2ace2f 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.3-next.1",
+  "version": "0.5.3-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index e90fe8386a..fc7eafcff5 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.1.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.10-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index b2120322f5..0ff05ebb31 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.10-next.1",
+  "version": "0.1.10-next.3",
   "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 df41ec8386..130ab65d9b 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index e62bac1646..7db4a24b72 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.1-next.1",
+  "version": "0.1.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 637e2ed103..17516a84f2 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-catalog-backend
 
+## 1.9.0-next.3
+
+### Minor Changes
+
+- 92a4590fc3a: Add monorepo support to CodeOwnersProccesor.
+
+### Patch Changes
+
+- be5aca50114: Updates and moves OpenAPI spec to `src/schema/openapi.yaml` and uses `ApiRouter` type from `@backstage/backend-openapi-utils` to handle automatic types from the OpenAPI spec file.
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 1.8.1-next.2
+
+### Patch Changes
+
+- 62a725e3a94: Use the `LocationSpec` type from the `catalog-common` package in place of the deprecated `LocationSpec` from the `catalog-node` package.
+- c36b89f2af3: Fixed bug in the `DefaultCatalogProcessingEngine` where entities that contained multiple different types of relations for the same source entity would not properly trigger stitching for that source entity.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.8.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 3929491378..d8b42fafe6 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.8.1-next.1",
+  "version": "1.9.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -84,6 +84,7 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
+    "@backstage/backend-openapi-utils": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
diff --git a/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts b/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts
index 9cb4d414c0..6c2774a6fb 100644
--- a/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts
+++ b/plugins/catalog-backend/src/modules/codeowners/CodeOwnersProcessor.test.ts
@@ -17,11 +17,13 @@
 import { getVoidLogger } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { CodeOwnersProcessor } from './CodeOwnersProcessor';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 
 const mockCodeOwnersText = () => `
-*       @acme/team-foo @acme/team-bar
-/docs   @acme/team-bar
+*                   @acme/team-foo @acme/team-bar
+/docs               @acme/team-docs
+/plugins/catalog-*  @backstage/maintainers @backstage/catalog-core
+**/logs             @logs-owner
 `;
 
 describe('CodeOwnersProcessor', () => {
@@ -34,8 +36,12 @@ describe('CodeOwnersProcessor', () => {
   });
 
   describe('preProcessEntity', () => {
-    const setupTest = ({ kind = 'Component', spec = {} } = {}) => {
-      const entity = { kind, spec };
+    const setupTest = ({
+      kind = 'Component',
+      spec = {},
+      metadata = {},
+    } = {}) => {
+      const entity = { kind, spec, metadata };
       const config = new ConfigReader({});
       const reader = {
         read: jest.fn(),
@@ -101,5 +107,44 @@ describe('CodeOwnersProcessor', () => {
         spec: { owner: 'team-foo' },
       });
     });
+    it('should match owner based on the targetUrl', async () => {
+      const { entity, processor } = setupTest();
+
+      const result = await processor.preProcessEntity(
+        entity as any,
+        mockLocation({ basePath: 'docs/' }),
+      );
+
+      expect(result).toEqual({
+        ...entity,
+        spec: { owner: 'team-docs' },
+      });
+    });
+    it('should match wildcard pattern', async () => {
+      const { entity, processor } = setupTest();
+
+      const result = await processor.preProcessEntity(
+        entity as any,
+        mockLocation({ basePath: 'plugins/catalog-foo' }),
+      );
+
+      expect(result).toEqual({
+        ...entity,
+        spec: { owner: 'maintainers' },
+      });
+    });
+    it('should match glob pattern', async () => {
+      const { entity, processor } = setupTest();
+
+      const result = await processor.preProcessEntity(
+        entity as any,
+        mockLocation({ basePath: 'plugins/catalog-foo/logs/1.txt' }),
+      );
+
+      expect(result).toEqual({
+        ...entity,
+        spec: { owner: 'User:logs-owner' },
+      });
+    });
   });
 });
diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/read.ts b/plugins/catalog-backend/src/modules/codeowners/lib/read.ts
index 2987e162cc..6a5234c94f 100644
--- a/plugins/catalog-backend/src/modules/codeowners/lib/read.ts
+++ b/plugins/catalog-backend/src/modules/codeowners/lib/read.ts
@@ -70,7 +70,7 @@ export async function findCodeOwnerByTarget(
     return undefined;
   }
 
-  const owner = resolveCodeOwner(contents);
+  const owner = resolveCodeOwner(contents, targetUrl);
 
   return owner;
 }
diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts b/plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts
index 4e6c646073..f9cdf79530 100644
--- a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts
+++ b/plugins/catalog-backend/src/modules/codeowners/lib/resolve.test.ts
@@ -18,12 +18,33 @@ import { normalizeCodeOwner, resolveCodeOwner } from './resolve';
 
 const mockCodeOwnersText = () => `
 *       @acme/team-foo @acme/team-bar
-/docs   @acme/team-bar
+/docs   @acme/team-docs
 `;
 
 describe('resolveCodeOwner', () => {
   it('should parse the codeowners file', () => {
-    expect(resolveCodeOwner(mockCodeOwnersText())).toBe('team-foo');
+    expect(
+      resolveCodeOwner(
+        mockCodeOwnersText(),
+        'https://github.com/can/be/tree/anything/catalog-info.yaml',
+      ),
+    ).toBe('team-foo');
+  });
+  it('should include the codeowners path into the provided pattern', () => {
+    expect(
+      resolveCodeOwner(
+        mockCodeOwnersText(),
+        'https://github.com/acme/repo/tree/main/docs/catalog-info.yaml',
+      ),
+    ).toBe('team-docs');
+  });
+  it('should match only in resource path', () => {
+    expect(
+      resolveCodeOwner(
+        mockCodeOwnersText(),
+        'https://github.com/acme/repo/tree/docs/catalog-info.yaml',
+      ),
+    ).toBe('team-foo');
   });
 });
 
diff --git a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts b/plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts
index 00645f0c9d..675f6542aa 100644
--- a/plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts
+++ b/plugins/catalog-backend/src/modules/codeowners/lib/resolve.ts
@@ -15,8 +15,7 @@
  */
 
 import * as codeowners from 'codeowners-utils';
-import { CodeOwnersEntry } from 'codeowners-utils';
-import { filter, get, head, pipe, reverse } from 'lodash/fp';
+import parseGitUrl from 'git-url-parse';
 
 const USER_PATTERN = /^@.*/;
 const GROUP_PATTERN = /^@.*\/.*/;
@@ -24,18 +23,14 @@ const EMAIL_PATTERN = /^.*@.*\..*$/;
 
 export function resolveCodeOwner(
   contents: string,
-  pattern = '*',
+  catalogInfoFileUrl: string,
 ): string | undefined {
-  const owners = codeowners.parse(contents);
+  const codeOwnerEntries = codeowners.parse(contents);
 
-  return pipe(
-    filter((e: CodeOwnersEntry) => e.pattern === pattern),
-    reverse,
-    head,
-    get('owners'),
-    head,
-    normalizeCodeOwner,
-  )(owners);
+  const { filepath } = parseGitUrl(catalogInfoFileUrl);
+  const match = codeowners.matchFile(filepath, codeOwnerEntries);
+
+  return match ? normalizeCodeOwner(match.owners[0]) : undefined;
 }
 
 export function normalizeCodeOwner(owner: string) {
diff --git a/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts b/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts
index 228429c647..66b6300df9 100644
--- a/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts
+++ b/plugins/catalog-backend/src/modules/core/AnnotateLocationEntityProcessor.test.ts
@@ -17,7 +17,7 @@
 import { Entity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor';
 
 describe('AnnotateLocationEntityProcessor', () => {
diff --git a/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts b/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts
index 6154d82330..bafac6e3ac 100644
--- a/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts
+++ b/plugins/catalog-backend/src/modules/core/AnnotateScmSlugEntityProcessor.test.ts
@@ -16,7 +16,7 @@
 import { Entity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { AnnotateScmSlugEntityProcessor } from './AnnotateScmSlugEntityProcessor';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
 
 describe('AnnotateScmSlugEntityProcessor', () => {
   describe('github', () => {
diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
index a358f1d07e..3002218d89 100644
--- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
+++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
@@ -452,4 +452,247 @@ describe('DefaultCatalogProcessingEngine', () => {
     );
     await engine.stop();
   });
+
+  it('should not stitch sources entities when relations are the same', async () => {
+    const engine = new DefaultCatalogProcessingEngine(
+      getVoidLogger(),
+      db,
+      orchestrator,
+      stitcher,
+      () => hash,
+      100,
+    );
+
+    db.transaction.mockImplementation(cb => cb((() => {}) as any));
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'k',
+      metadata: { name: 'me', namespace: 'ns' },
+    };
+    const processableEntity = {
+      entityRef: 'foo',
+      id: '1',
+      unprocessedEntity: entity,
+      resultHash: '',
+      state: [] as any,
+      nextUpdateAt: DateTime.now(),
+      lastDiscoveryAt: DateTime.now(),
+    };
+
+    db.listParents.mockResolvedValue({ entityRefs: [] });
+    db.getProcessableEntities.mockResolvedValueOnce({
+      items: [processableEntity],
+    });
+    db.updateProcessedEntity.mockImplementationOnce(async () => ({
+      previous: {
+        relations: [
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other1',
+            target_entity_ref: 'k:ns/me',
+          },
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other2',
+            target_entity_ref: 'k:ns/me',
+          },
+        ],
+      },
+    }));
+
+    orchestrator.process.mockResolvedValueOnce({
+      ok: true,
+      completedEntity: entity,
+      relations: [
+        {
+          type: 't',
+          source: { kind: 'k', namespace: 'ns', name: 'other1' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+        {
+          type: 't',
+          source: { kind: 'k', namespace: 'ns', name: 'other2' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+      ],
+      errors: [],
+      deferredEntities: [],
+      state: {},
+      refreshKeys: [],
+    });
+
+    await engine.start();
+    await waitForExpect(() => {
+      expect(stitcher.stitch).toHaveBeenCalledTimes(1);
+    });
+    expect([...stitcher.stitch.mock.calls[0][0]]).toEqual(
+      expect.arrayContaining(['k:ns/me']),
+    );
+    await engine.stop();
+  });
+
+  it('should stitch sources entities when new relation of different type added', async () => {
+    const engine = new DefaultCatalogProcessingEngine(
+      getVoidLogger(),
+      db,
+      orchestrator,
+      stitcher,
+      () => hash,
+      100,
+    );
+
+    db.transaction.mockImplementation(cb => cb((() => {}) as any));
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'k',
+      metadata: { name: 'me', namespace: 'ns' },
+    };
+    const processableEntity = {
+      entityRef: 'foo',
+      id: '1',
+      unprocessedEntity: entity,
+      resultHash: '',
+      state: [] as any,
+      nextUpdateAt: DateTime.now(),
+      lastDiscoveryAt: DateTime.now(),
+    };
+
+    db.listParents.mockResolvedValue({ entityRefs: [] });
+    db.getProcessableEntities.mockResolvedValueOnce({
+      items: [processableEntity],
+    });
+    db.updateProcessedEntity.mockImplementationOnce(async () => ({
+      previous: {
+        relations: [
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other1',
+            target_entity_ref: 'k:ns/me',
+          },
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other2',
+            target_entity_ref: 'k:ns/me',
+          },
+        ],
+      },
+    }));
+
+    orchestrator.process.mockResolvedValueOnce({
+      ok: true,
+      completedEntity: entity,
+      relations: [
+        {
+          type: 't',
+          source: { kind: 'k', namespace: 'ns', name: 'other1' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+        {
+          type: 't',
+          source: { kind: 'k', namespace: 'ns', name: 'other2' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+        {
+          type: 'u',
+          source: { kind: 'k', namespace: 'ns', name: 'other2' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+      ],
+      errors: [],
+      deferredEntities: [],
+      state: {},
+      refreshKeys: [],
+    });
+
+    await engine.start();
+    await waitForExpect(() => {
+      expect(stitcher.stitch).toHaveBeenCalledTimes(1);
+    });
+    expect([...stitcher.stitch.mock.calls[0][0]]).toEqual(
+      expect.arrayContaining(['k:ns/me', 'k:ns/other2']),
+    );
+    await engine.stop();
+  });
+
+  it('should stitch sources entities when relation is removed', async () => {
+    const engine = new DefaultCatalogProcessingEngine(
+      getVoidLogger(),
+      db,
+      orchestrator,
+      stitcher,
+      () => hash,
+      100,
+    );
+
+    db.transaction.mockImplementation(cb => cb((() => {}) as any));
+
+    const entity = {
+      apiVersion: '1',
+      kind: 'k',
+      metadata: { name: 'me', namespace: 'ns' },
+    };
+    const processableEntity = {
+      entityRef: 'foo',
+      id: '1',
+      unprocessedEntity: entity,
+      resultHash: '',
+      state: [] as any,
+      nextUpdateAt: DateTime.now(),
+      lastDiscoveryAt: DateTime.now(),
+    };
+
+    db.listParents.mockResolvedValue({ entityRefs: [] });
+    db.getProcessableEntities.mockResolvedValueOnce({
+      items: [processableEntity],
+    });
+    db.updateProcessedEntity.mockImplementationOnce(async () => ({
+      previous: {
+        relations: [
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other1',
+            target_entity_ref: 'k:ns/me',
+          },
+          {
+            originating_entity_id: '',
+            type: 't',
+            source_entity_ref: 'k:ns/other2',
+            target_entity_ref: 'k:ns/me',
+          },
+        ],
+      },
+    }));
+
+    orchestrator.process.mockResolvedValueOnce({
+      ok: true,
+      completedEntity: entity,
+      relations: [
+        {
+          type: 't',
+          source: { kind: 'k', namespace: 'ns', name: 'other1' },
+          target: { kind: 'k', namespace: 'ns', name: 'me' },
+        },
+      ],
+      errors: [],
+      deferredEntities: [],
+      state: {},
+      refreshKeys: [],
+    });
+
+    await engine.start();
+    await waitForExpect(() => {
+      expect(stitcher.stitch).toHaveBeenCalledTimes(1);
+    });
+    expect([...stitcher.stitch.mock.calls[0][0]]).toEqual(
+      expect.arrayContaining(['k:ns/me', 'k:ns/other2']),
+    );
+    await engine.stop();
+  });
 });
diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
index c8f159b195..8457381ccd 100644
--- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
+++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
@@ -199,7 +199,7 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
           }
 
           result.completedEntity.metadata.uid = id;
-          let oldRelationSources: Set<string>;
+          let oldRelationSources: Map<string, string>;
           await this.processingDatabase.transaction(async tx => {
             const { previous } =
               await this.processingDatabase.updateProcessedEntity(tx, {
@@ -212,28 +212,32 @@ export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine {
                 locationKey,
                 refreshKeys: result.refreshKeys,
               });
-            oldRelationSources = new Set(
-              previous.relations.map(r => r.source_entity_ref),
+            oldRelationSources = new Map(
+              previous.relations.map(r => [
+                `${r.source_entity_ref}:${r.type}`,
+                r.source_entity_ref,
+              ]),
             );
           });
 
-          const newRelationSources = new Set<string>(
-            result.relations.map(relation =>
-              stringifyEntityRef(relation.source),
-            ),
+          const newRelationSources = new Map<string, string>(
+            result.relations.map(relation => {
+              const sourceEntityRef = stringifyEntityRef(relation.source);
+              return [`${sourceEntityRef}:${relation.type}`, sourceEntityRef];
+            }),
           );
 
           const setOfThingsToStitch = new Set<string>([
             stringifyEntityRef(result.completedEntity),
           ]);
-          newRelationSources.forEach(r => {
-            if (!oldRelationSources.has(r)) {
-              setOfThingsToStitch.add(r);
+          newRelationSources.forEach((sourceEntityRef, uniqueKey) => {
+            if (!oldRelationSources.has(uniqueKey)) {
+              setOfThingsToStitch.add(sourceEntityRef);
             }
           });
-          oldRelationSources!.forEach(r => {
-            if (!newRelationSources.has(r)) {
-              setOfThingsToStitch.add(r);
+          oldRelationSources!.forEach((sourceEntityRef, uniqueKey) => {
+            if (!newRelationSources.has(uniqueKey)) {
+              setOfThingsToStitch.add(sourceEntityRef);
             }
           });
 
diff --git a/plugins/catalog-backend/src/schema/openapi.ts b/plugins/catalog-backend/src/schema/openapi.ts
new file mode 100644
index 0000000000..3d775c54cf
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi.ts
@@ -0,0 +1,1320 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 default {
+  openapi: '3.1.0',
+  info: {
+    title: '@backstage/plugin-catalog-backend',
+    version: '1',
+    description:
+      'The Backstage backend plugin that provides the Backstage catalog',
+    license: {
+      name: 'Apache-2.0',
+      url: 'http://www.apache.org/licenses/LICENSE-2.0.html',
+    },
+    contact: {},
+  },
+  servers: [
+    {
+      url: '/',
+    },
+  ],
+  components: {
+    examples: {},
+    headers: {},
+    parameters: {
+      kind: {
+        name: 'kind',
+        in: 'path',
+        required: true,
+        schema: {
+          type: 'string',
+        },
+      },
+      namespace: {
+        name: 'namespace',
+        in: 'path',
+        required: true,
+        schema: {
+          type: 'string',
+        },
+      },
+      name: {
+        name: 'name',
+        in: 'path',
+        required: true,
+        schema: {
+          type: 'string',
+        },
+      },
+      uid: {
+        name: 'uid',
+        in: 'path',
+        required: true,
+        schema: {
+          type: 'string',
+        },
+      },
+      cursor: {
+        name: 'cursor',
+        in: 'query',
+        description: 'Cursor to a set page of results.',
+        required: false,
+        schema: {
+          type: 'string',
+          minLength: 1,
+        },
+      },
+      after: {
+        name: 'after',
+        in: 'query',
+        description: 'Pointer to the previous page of results.',
+        required: false,
+        schema: {
+          type: 'string',
+          minLength: 1,
+        },
+      },
+      fields: {
+        name: 'fields',
+        in: 'query',
+        description: 'Restrict to just these fields in the response.',
+        required: false,
+        schema: {
+          type: 'string',
+        },
+      },
+      filter: {
+        name: 'filter',
+        in: 'query',
+        description: 'Filter for just the entities defined by this filter.',
+        required: false,
+        schema: {
+          type: 'string',
+        },
+      },
+      offset: {
+        name: 'offset',
+        in: 'query',
+        description: 'Number of records to skip in the query page.',
+        required: false,
+        schema: {
+          type: 'integer',
+          minimum: 0,
+        },
+      },
+      limit: {
+        name: 'limit',
+        in: 'query',
+        description: 'Number of records to return in the response.',
+        required: false,
+        schema: {
+          type: 'integer',
+          minimum: 1,
+        },
+      },
+      sortField: {
+        name: 'sortField',
+        in: 'query',
+        description: 'The fields to sort returned results by.',
+        required: false,
+        schema: {
+          type: 'array',
+          items: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            description: 'A two-item tuple of [field, order].',
+          },
+        },
+        explode: true,
+        style: 'form',
+      },
+    },
+    requestBodies: {},
+    responses: {},
+    schemas: {
+      JsonObject: {
+        type: 'object',
+        properties: {},
+        description: 'A type representing all allowed JSON object values.',
+      },
+      MapStringString: {
+        type: 'object',
+        properties: {},
+        additionalProperties: {
+          type: 'string',
+        },
+        description: 'Construct a type with a set of properties K of type T',
+      },
+      EntityLink: {
+        type: 'object',
+        properties: {
+          type: {
+            type: 'string',
+            description:
+              'An optional value to categorize links into specific groups',
+          },
+          icon: {
+            type: 'string',
+            description:
+              'An optional semantic key that represents a visual icon.',
+          },
+          title: {
+            type: 'string',
+            description: 'An optional descriptive title for the link.',
+          },
+          url: {
+            type: 'string',
+            description: 'The url to the external site, document, etc.',
+          },
+        },
+        required: ['url'],
+        description:
+          'A link to external information that is related to the entity.',
+        additionalProperties: false,
+      },
+      EntityMeta: {
+        allOf: [
+          {
+            $ref: '#/components/schemas/JsonObject',
+          },
+          {
+            type: 'object',
+            properties: {
+              links: {
+                type: 'array',
+                items: {
+                  $ref: '#/components/schemas/EntityLink',
+                },
+                description:
+                  'A list of external hyperlinks related to the entity.',
+              },
+              tags: {
+                type: 'array',
+                items: {
+                  type: 'string',
+                },
+                description:
+                  'A list of single-valued strings, to for example classify catalog entities in\nvarious ways.',
+              },
+              annotations: {
+                $ref: '#/components/schemas/MapStringString',
+              },
+              labels: {
+                $ref: '#/components/schemas/MapStringString',
+              },
+              description: {
+                type: 'string',
+                description:
+                  'A short (typically relatively few words, on one line) description of the\nentity.',
+              },
+              title: {
+                type: 'string',
+                description:
+                  'A display name of the entity, to be presented in user interfaces instead\nof the `name` property above, when available.\nThis field is sometimes useful when the `name` is cumbersome or ends up\nbeing perceived as overly technical. The title generally does not have\nas stringent format requirements on it, so it may contain special\ncharacters and be more explanatory. Do keep it very short though, and\navoid situations where a title can be confused with the name of another\nentity, or where two entities share a title.\nNote that this is only for display purposes, and may be ignored by some\nparts of the code. Entity references still always make use of the `name`\nproperty, not the title.',
+              },
+              namespace: {
+                type: 'string',
+                description: 'The namespace that the entity belongs to.',
+              },
+              name: {
+                type: 'string',
+                description:
+                  'The name of the entity.\nMust be unique within the catalog at any given point in time, for any\ngiven namespace + kind pair. This value is part of the technical\nidentifier of the entity, and as such it will appear in URLs, database\ntables, entity references, and similar. It is subject to restrictions\nregarding what characters are allowed.\nIf you want to use a different, more human readable string with fewer\nrestrictions on it in user interfaces, see the `title` field below.',
+              },
+              etag: {
+                type: 'string',
+                description:
+                  'An opaque string that changes for each update operation to any part of\nthe entity, including metadata.\nThis field can not be set by the user at creation time, and the server\nwill reject an attempt to do so. The field will be populated in read\noperations. The field can (optionally) be specified when performing\nupdate or delete operations, and the server will then reject the\noperation if it does not match the current stored value.',
+              },
+              uid: {
+                type: 'string',
+                description:
+                  'A globally unique ID for the entity.\nThis field can not be set by the user at creation time, and the server\nwill reject an attempt to do so. The field will be populated in read\noperations. The field can (optionally) be specified when performing\nupdate or delete operations, but the server is free to reject requests\nthat do so in such a way that it breaks semantics.',
+              },
+            },
+            required: ['name'],
+          },
+        ],
+        description: 'Metadata fields common to all versions/kinds of entity.',
+        additionalProperties: false,
+      },
+      EntityRelation: {
+        type: 'object',
+        properties: {
+          targetRef: {
+            type: 'string',
+            description: 'The entity ref of the target of this relation.',
+          },
+          type: {
+            type: 'string',
+            description: 'The type of the relation.',
+          },
+        },
+        required: ['targetRef', 'type'],
+        description:
+          'A relation of a specific type to another entity in the catalog.',
+        additionalProperties: false,
+      },
+      Entity: {
+        type: 'object',
+        properties: {
+          relations: {
+            type: 'array',
+            items: {
+              $ref: '#/components/schemas/EntityRelation',
+            },
+            description:
+              'The relations that this entity has with other entities.',
+          },
+          spec: {
+            $ref: '#/components/schemas/JsonObject',
+          },
+          metadata: {
+            $ref: '#/components/schemas/EntityMeta',
+          },
+          kind: {
+            type: 'string',
+            description: 'The high level entity type being described.',
+          },
+          apiVersion: {
+            type: 'string',
+            description:
+              'The version of specification format for this particular entity that\nthis is written against.',
+          },
+        },
+        required: ['metadata', 'kind', 'apiVersion'],
+        description:
+          "The parts of the format that's common to all versions/kinds of entity.",
+        additionalProperties: false,
+      },
+      EntityAncestryResponse: {
+        type: 'object',
+        properties: {
+          items: {
+            type: 'array',
+            items: {
+              type: 'object',
+              properties: {
+                parentEntityRefs: {
+                  items: {
+                    type: 'string',
+                  },
+                  type: 'array',
+                },
+                entity: {
+                  $ref: '#/components/schemas/Entity',
+                },
+              },
+              required: ['parentEntityRefs', 'entity'],
+            },
+          },
+          rootEntityRef: {
+            type: 'string',
+          },
+        },
+        required: ['items', 'rootEntityRef'],
+        additionalProperties: false,
+      },
+      EntitiesBatchResponse: {
+        type: 'object',
+        properties: {
+          items: {
+            type: 'array',
+            items: {
+              anyOf: [
+                {
+                  $ref: '#/components/schemas/Entity',
+                },
+                {
+                  type: 'null',
+                },
+              ],
+            },
+            description:
+              'The list of entities, in the same order as the refs in the request. Entries\nthat are null signify that no entity existed with that ref.',
+          },
+        },
+        required: ['items'],
+        additionalProperties: false,
+      },
+      EntityFacet: {
+        type: 'object',
+        properties: {
+          value: {
+            type: 'string',
+          },
+          count: {
+            type: 'number',
+          },
+        },
+        additionalProperties: false,
+      },
+      EntityFacetsResponse: {
+        type: 'object',
+        properties: {
+          facets: {
+            type: 'object',
+            additionalProperties: {
+              type: 'array',
+              items: {
+                $ref: '#/components/schemas/EntityFacet',
+              },
+            },
+          },
+        },
+        required: ['facets'],
+        additionalProperties: false,
+      },
+      Location: {
+        type: 'object',
+        properties: {
+          target: {
+            type: 'string',
+          },
+          type: {
+            type: 'string',
+          },
+          id: {
+            type: 'string',
+          },
+        },
+        required: ['target', 'type', 'id'],
+        description: 'Entity location for a specific entity.',
+        additionalProperties: false,
+      },
+      LocationSpec: {
+        type: 'object',
+        properties: {
+          presence: {
+            type: 'string',
+            enum: ['optional', 'required'],
+          },
+          target: {
+            type: 'string',
+          },
+          type: {
+            type: 'string',
+          },
+        },
+        required: ['target', 'type'],
+        description: 'Holds the entity location information.',
+        additionalProperties: false,
+      },
+      AnalyzeLocationExistingEntity: {
+        type: 'object',
+        properties: {
+          entity: {
+            $ref: '#/components/schemas/Entity',
+          },
+          isRegistered: {
+            type: 'boolean',
+          },
+          location: {
+            $ref: '#/components/schemas/LocationSpec',
+          },
+        },
+        required: ['entity', 'isRegistered', 'location'],
+        description:
+          "If the folder pointed to already contained catalog info yaml files, they are\nread and emitted like this so that the frontend can inform the user that it\nlocated them and can make sure to register them as well if they weren't\nalready",
+        additionalProperties: false,
+      },
+      RecursivePartialEntityRelation: {
+        type: 'object',
+        properties: {
+          targetRef: {
+            type: 'string',
+            description: 'The entity ref of the target of this relation.',
+          },
+          type: {
+            type: 'string',
+            description: 'The type of the relation.',
+          },
+        },
+        description:
+          'A relation of a specific type to another entity in the catalog.',
+        additionalProperties: false,
+      },
+      RecursivePartialEntityMeta: {
+        allOf: [
+          {
+            $ref: '#/components/schemas/JsonObject',
+          },
+          {
+            type: 'object',
+            properties: {
+              links: {
+                type: 'array',
+                items: {
+                  $ref: '#/components/schemas/EntityLink',
+                },
+                description:
+                  'A list of external hyperlinks related to the entity.',
+              },
+              tags: {
+                type: 'array',
+                items: {
+                  type: 'string',
+                },
+                description:
+                  'A list of single-valued strings, to for example classify catalog entities in\nvarious ways.',
+              },
+              annotations: {
+                $ref: '#/components/schemas/MapStringString',
+              },
+              labels: {
+                $ref: '#/components/schemas/MapStringString',
+              },
+              description: {
+                type: 'string',
+                description:
+                  'A short (typically relatively few words, on one line) description of the\nentity.',
+              },
+              title: {
+                type: 'string',
+                description:
+                  'A display name of the entity, to be presented in user interfaces instead\nof the `name` property above, when available.\nThis field is sometimes useful when the `name` is cumbersome or ends up\nbeing perceived as overly technical. The title generally does not have\nas stringent format requirements on it, so it may contain special\ncharacters and be more explanatory. Do keep it very short though, and\navoid situations where a title can be confused with the name of another\nentity, or where two entities share a title.\nNote that this is only for display purposes, and may be ignored by some\nparts of the code. Entity references still always make use of the `name`\nproperty, not the title.',
+              },
+              namespace: {
+                type: 'string',
+                description: 'The namespace that the entity belongs to.',
+              },
+              name: {
+                type: 'string',
+                description:
+                  'The name of the entity.\nMust be unique within the catalog at any given point in time, for any\ngiven namespace + kind pair. This value is part of the technical\nidentifier of the entity, and as such it will appear in URLs, database\ntables, entity references, and similar. It is subject to restrictions\nregarding what characters are allowed.\nIf you want to use a different, more human readable string with fewer\nrestrictions on it in user interfaces, see the `title` field below.',
+              },
+              etag: {
+                type: 'string',
+                description:
+                  'An opaque string that changes for each update operation to any part of\nthe entity, including metadata.\nThis field can not be set by the user at creation time, and the server\nwill reject an attempt to do so. The field will be populated in read\noperations. The field can (optionally) be specified when performing\nupdate or delete operations, and the server will then reject the\noperation if it does not match the current stored value.',
+              },
+              uid: {
+                type: 'string',
+                description:
+                  'A globally unique ID for the entity.\nThis field can not be set by the user at creation time, and the server\nwill reject an attempt to do so. The field will be populated in read\noperations. The field can (optionally) be specified when performing\nupdate or delete operations, but the server is free to reject requests\nthat do so in such a way that it breaks semantics.',
+              },
+            },
+            description:
+              'Metadata fields common to all versions/kinds of entity.',
+          },
+        ],
+        additionalProperties: false,
+      },
+      RecursivePartialEntity: {
+        type: 'object',
+        properties: {
+          apiVersion: {
+            type: 'string',
+            description:
+              'The version of specification format for this particular entity that\nthis is written against.',
+          },
+          kind: {
+            type: 'string',
+            description: 'The high level entity type being described.',
+          },
+          metadata: {
+            $ref: '#/components/schemas/RecursivePartialEntityMeta',
+          },
+          spec: {
+            $ref: '#/components/schemas/JsonObject',
+          },
+          relations: {
+            type: 'array',
+            items: {
+              $ref: '#/components/schemas/RecursivePartialEntityRelation',
+            },
+            description:
+              'The relations that this entity has with other entities.',
+          },
+        },
+        description: 'Makes all keys of an entire hierarchy optional.',
+        additionalProperties: false,
+      },
+      AnalyzeLocationEntityField: {
+        type: 'object',
+        properties: {
+          description: {
+            type: 'string',
+            description:
+              'A text to show to the user to inform about the choices made. Like, it could say\n"Found a CODEOWNERS file that covers this target, so we suggest leaving this\nfield empty; which would currently make it owned by X" where X is taken from the\ncodeowners file.',
+          },
+          value: {
+            type: ['string', 'null'],
+          },
+          state: {
+            type: 'string',
+            enum: [
+              'analysisSuggestedValue',
+              'analysisSuggestedNoValue',
+              'needsUserInput',
+            ],
+            description:
+              'The outcome of the analysis for this particular field',
+          },
+          field: {
+            type: 'string',
+            description:
+              'e.g. "spec.owner"? The frontend needs to know how to "inject" the field into the\nentity again if the user wants to change it',
+          },
+        },
+        required: ['description', 'value', 'state', 'field'],
+        additionalProperties: false,
+      },
+      AnalyzeLocationGenerateEntity: {
+        type: 'object',
+        properties: {
+          fields: {
+            type: 'array',
+            items: {
+              $ref: '#/components/schemas/AnalyzeLocationEntityField',
+            },
+          },
+          entity: {
+            $ref: '#/components/schemas/RecursivePartialEntity',
+          },
+        },
+        required: ['fields', 'entity'],
+        description:
+          "This is some form of representation of what the analyzer could deduce.\nWe should probably have a chat about how this can best be conveyed to\nthe frontend. It'll probably contain a (possibly incomplete) entity, plus\nenough info for the frontend to know what form data to show to the user\nfor overriding/completing the info.",
+        additionalProperties: false,
+      },
+      AnalyzeLocationResponse: {
+        type: 'object',
+        properties: {
+          generateEntities: {
+            items: {
+              $ref: '#/components/schemas/AnalyzeLocationGenerateEntity',
+            },
+            type: 'array',
+          },
+          existingEntityFiles: {
+            items: {
+              $ref: '#/components/schemas/AnalyzeLocationExistingEntity',
+            },
+            type: 'array',
+          },
+        },
+        required: ['generateEntities', 'existingEntityFiles'],
+        additionalProperties: false,
+      },
+      LocationInput: {
+        type: 'object',
+        properties: {
+          type: {
+            type: 'string',
+          },
+          target: {
+            type: 'string',
+          },
+          presence: {
+            type: 'string',
+            enum: ['optional', 'required'],
+          },
+        },
+        required: ['type', 'target', 'presence'],
+        additionalProperties: false,
+      },
+      SerializedError: {
+        allOf: [
+          {
+            $ref: '#/components/schemas/JsonObject',
+          },
+          {
+            type: 'object',
+            properties: {
+              code: {
+                type: 'string',
+                description:
+                  'A custom code (not necessarily the same as an HTTP response code); may not be present',
+              },
+              stack: {
+                type: 'string',
+                description: 'A stringified stack trace; may not be present',
+              },
+              message: {
+                type: 'string',
+                description: 'The message of the exception that was thrown',
+              },
+              name: {
+                type: 'string',
+                description: 'The name of the exception that was thrown',
+              },
+            },
+            required: ['message', 'name'],
+          },
+        ],
+        description: 'The serialized form of an Error.',
+        additionalProperties: false,
+      },
+      EntitiesQueryResponse: {
+        type: 'object',
+        properties: {
+          items: {
+            type: 'array',
+            items: {
+              $ref: '#/components/schemas/Entity',
+            },
+            description: 'The list of entities paginated by a specific filter.',
+          },
+          totalItems: {
+            type: 'number',
+          },
+          pageInfo: {
+            type: 'object',
+            properties: {
+              nextCursor: {
+                type: 'string',
+                description: 'The cursor for the next batch of entities.',
+              },
+              prevCursor: {
+                type: 'string',
+                description: 'The cursor for the previous batch of entities.',
+              },
+            },
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    securitySchemes: {
+      JWT: {
+        type: 'http',
+        scheme: 'bearer',
+        bearerFormat: 'JWT',
+      },
+    },
+  },
+  paths: {
+    '/refresh': {
+      post: {
+        operationId: 'RefreshEntity',
+        responses: {
+          '200': {
+            description: 'Refreshed',
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [],
+        requestBody: {
+          required: true,
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                properties: {
+                  authorizationToken: {
+                    type: 'string',
+                  },
+                  entityRef: {
+                    type: 'string',
+                    description:
+                      'The reference to a single entity that should be refreshed',
+                  },
+                },
+                required: ['entityRef'],
+                description:
+                  'Options for requesting a refresh of entities in the catalog.',
+                additionalProperties: false,
+              },
+            },
+          },
+        },
+      },
+    },
+    '/entities': {
+      get: {
+        operationId: 'GetEntities',
+        responses: {
+          '200': {
+            description: '',
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'array',
+                  items: {
+                    $ref: '#/components/schemas/Entity',
+                  },
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/fields',
+          },
+          {
+            $ref: '#/components/parameters/limit',
+          },
+          {
+            $ref: '#/components/parameters/filter',
+          },
+          {
+            $ref: '#/components/parameters/offset',
+          },
+          {
+            $ref: '#/components/parameters/after',
+          },
+        ],
+      },
+    },
+    '/entities/by-uid/{uid}': {
+      get: {
+        operationId: 'GetEntityByUid',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/Entity',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/uid',
+          },
+        ],
+      },
+      delete: {
+        operationId: 'DeleteEntityByUid',
+        responses: {
+          '204': {
+            description: 'Deleted successfully.',
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/uid',
+          },
+        ],
+      },
+    },
+    '/entities/by-name/{kind}/{namespace}/{name}': {
+      get: {
+        operationId: 'GetEntityByName',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/Entity',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/kind',
+          },
+          {
+            $ref: '#/components/parameters/namespace',
+          },
+          {
+            $ref: '#/components/parameters/name',
+          },
+        ],
+      },
+    },
+    '/entities/by-name/{kind}/{namespace}/{name}/ancestry': {
+      get: {
+        operationId: 'GetEntityAncestryByName',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/EntityAncestryResponse',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/kind',
+          },
+          {
+            $ref: '#/components/parameters/namespace',
+          },
+          {
+            $ref: '#/components/parameters/name',
+          },
+        ],
+      },
+    },
+    '/entities/by-refs': {
+      post: {
+        operationId: 'GetEntitiesByRefs',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/EntitiesBatchResponse',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/fields',
+          },
+        ],
+        requestBody: {
+          required: true,
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                required: ['entityRefs'],
+                properties: {
+                  entityRefs: {
+                    type: 'array',
+                    items: {
+                      type: 'string',
+                    },
+                  },
+                  fields: {
+                    type: 'array',
+                    items: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    '/entities/by-query': {
+      get: {
+        operationId: 'GetEntitiesByQuery',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/EntitiesQueryResponse',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            $ref: '#/components/parameters/fields',
+          },
+          {
+            $ref: '#/components/parameters/limit',
+          },
+          {
+            $ref: '#/components/parameters/sortField',
+          },
+          {
+            $ref: '#/components/parameters/cursor',
+          },
+          {
+            name: 'fullTextFilterTerm',
+            in: 'query',
+            description: 'Text search term.',
+            required: false,
+            schema: {
+              type: 'string',
+            },
+          },
+          {
+            name: 'fullTextFilterFields',
+            in: 'query',
+            description:
+              'A comma separated list of fields to sort returned results by.',
+            required: false,
+            schema: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+            explode: false,
+            style: 'form',
+          },
+        ],
+      },
+    },
+    '/entity-facets': {
+      get: {
+        operationId: 'GetEntityFacets',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/EntityFacetsResponse',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            in: 'query',
+            name: 'facet',
+            required: true,
+            schema: {
+              type: 'string',
+            },
+          },
+          {
+            $ref: '#/components/parameters/filter',
+          },
+        ],
+      },
+    },
+    '/locations': {
+      post: {
+        operationId: 'CreateLocation',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    exists: {
+                      type: 'boolean',
+                    },
+                    entities: {
+                      items: {
+                        $ref: '#/components/schemas/Entity',
+                      },
+                      type: 'array',
+                    },
+                    location: {
+                      $ref: '#/components/schemas/Location',
+                    },
+                  },
+                  required: ['entities', 'location'],
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            in: 'query',
+            name: 'dryRun',
+            required: false,
+            schema: {
+              type: 'string',
+            },
+          },
+        ],
+        requestBody: {
+          required: true,
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                properties: {
+                  presence: {
+                    type: 'string',
+                    enum: ['required', 'optional'],
+                  },
+                  target: {
+                    type: 'string',
+                  },
+                  type: {
+                    type: 'string',
+                  },
+                },
+                required: ['presence', 'target', 'type'],
+              },
+            },
+          },
+        },
+      },
+      get: {
+        operationId: 'GetLocations',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      data: {
+                        $ref: '#/components/schemas/Location',
+                      },
+                    },
+                    required: ['data'],
+                  },
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [],
+      },
+    },
+    '/locations/{id}': {
+      get: {
+        operationId: 'GetLocation',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/Location',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            in: 'path',
+            name: 'id',
+            required: true,
+            schema: {
+              type: 'string',
+            },
+          },
+        ],
+      },
+      delete: {
+        operationId: 'DeleteLocation',
+        responses: {
+          '204': {
+            description: 'No content',
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [
+          {
+            in: 'path',
+            name: 'id',
+            required: true,
+            schema: {
+              type: 'string',
+            },
+          },
+        ],
+      },
+    },
+    '/analyze-location': {
+      post: {
+        operationId: 'AnalyzeLocation',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  $ref: '#/components/schemas/AnalyzeLocationResponse',
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [],
+        requestBody: {
+          required: true,
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                properties: {
+                  catalogFileName: {
+                    type: 'string',
+                  },
+                  location: {
+                    $ref: '#/components/schemas/LocationInput',
+                  },
+                },
+                required: ['catalogFileName', 'location'],
+              },
+            },
+          },
+        },
+      },
+    },
+    '/validate-entity': {
+      post: {
+        operationId: 'ValidateEntity',
+        responses: {
+          '200': {
+            description: 'Ok',
+            content: {
+              'application/json': {
+                schema: {
+                  anyOf: [
+                    {
+                      type: 'object',
+                      properties: {
+                        errors: {
+                          $ref: '#/components/schemas/SerializedError',
+                        },
+                      },
+                      required: ['errors'],
+                    },
+                    {
+                      type: 'object',
+                      properties: {
+                        errors: {
+                          type: 'array',
+                          items: {
+                            $ref: '#/components/schemas/SerializedError',
+                          },
+                        },
+                      },
+                      required: ['errors'],
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        },
+        security: [
+          {},
+          {
+            JWT: [],
+          },
+        ],
+        parameters: [],
+        requestBody: {
+          required: true,
+          content: {
+            'application/json': {
+              schema: {
+                type: 'object',
+                properties: {
+                  location: {
+                    type: 'string',
+                  },
+                  entity: {
+                    $ref: '#/components/schemas/Entity',
+                  },
+                },
+                required: ['location', 'entity'],
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+} as const;
diff --git a/plugins/catalog-backend/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml
similarity index 66%
rename from plugins/catalog-backend/openapi.yaml
rename to plugins/catalog-backend/src/schema/openapi.yaml
index ea09f5da10..d2dd74fb33 100644
--- a/plugins/catalog-backend/openapi.yaml
+++ b/plugins/catalog-backend/src/schema/openapi.yaml
@@ -6,6 +6,7 @@ info:
   description: The Backstage backend plugin that provides the Backstage catalog
   license:
     name: Apache-2.0
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
   contact: {}
 
 servers:
@@ -14,21 +15,94 @@ servers:
 components:
   examples: {}
   headers: {}
-  parameters: {}
+  parameters:
+    kind:
+      name: kind
+      in: path
+      required: true
+      schema:
+        type: string
+    namespace:
+      name: namespace
+      in: path
+      required: true
+      schema:
+        type: string
+    name:
+      name: name
+      in: path
+      required: true
+      schema:
+        type: string
+    uid:
+      name: uid
+      in: path
+      required: true
+      schema:
+        type: string
+    cursor:
+      name: cursor
+      in: query
+      description: Cursor to a set page of results.
+      required: false
+      schema:
+        type: string
+        minLength: 1
+    after:
+      name: after
+      in: query
+      description: Pointer to the previous page of results.
+      required: false
+      schema:
+        type: string
+        minLength: 1
+    fields:
+      name: fields
+      in: query
+      description: Restrict to just these fields in the response.
+      required: false
+      schema:
+        type: string
+    filter:
+      name: filter
+      in: query
+      description: Filter for just the entities defined by this filter.
+      required: false
+      schema:
+        type: string
+    offset:
+      name: offset
+      in: query
+      description: Number of records to skip in the query page.
+      required: false
+      schema:
+        type: integer
+        minimum: 0
+    limit:
+      name: limit
+      in: query
+      description: Number of records to return in the response.
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+    sortField:
+      name: sortField
+      in: query
+      description: The fields to sort returned results by.
+      required: false
+      schema:
+        type: array
+        items:
+          type: array
+          items:
+            type: string
+          description: A two-item tuple of [field, order].
+      explode: true
+      style: form
   requestBodies: {}
   responses: {}
   schemas:
-    RefreshOptions:
-      type: object
-      properties:
-        authorizationToken:
-          type: string
-        entityRef:
-          type: string
-          description: The reference to a single entity that should be refreshed
-      required:
-        - entityRef
-      description: Options for requesting a refresh of entities in the catalog.
     JsonObject:
       type: object
       properties: {}
@@ -57,6 +131,7 @@ components:
       required:
         - url
       description: A link to external information that is related to the entity.
+      additionalProperties: false
     EntityMeta:
       allOf:
         - $ref: '#/components/schemas/JsonObject'
@@ -133,6 +208,7 @@ components:
           required:
             - name
       description: Metadata fields common to all versions/kinds of entity.
+      additionalProperties: false
     EntityRelation:
       type: object
       properties:
@@ -146,6 +222,7 @@ components:
         - targetRef
         - type
       description: A relation of a specific type to another entity in the catalog.
+      additionalProperties: false
     Entity:
       type: object
       properties:
@@ -171,6 +248,7 @@ components:
         - kind
         - apiVersion
       description: The parts of the format that's common to all versions/kinds of entity.
+      additionalProperties: false
     EntityAncestryResponse:
       type: object
       properties:
@@ -193,35 +271,43 @@ components:
       required:
         - items
         - rootEntityRef
+      additionalProperties: false
     EntitiesBatchResponse:
       type: object
       properties:
         items:
           type: array
           items:
-            allOf:
+            anyOf:
               - $ref: '#/components/schemas/Entity'
-            nullable: true
+              - type: 'null'
           description: |-
             The list of entities, in the same order as the refs in the request. Entries
             that are null signify that no entity existed with that ref.
       required:
         - items
-    EntityFacets:
+      additionalProperties: false
+    EntityFacet:
       type: object
       properties:
         value:
           type: string
         count:
           type: number
-      description: Construct a type with a set of properties K of type T
+      additionalProperties: false
+
     EntityFacetsResponse:
       type: object
-      properties: {}
-      additionalProperties:
-        $ref: '#/components/schemas/EntityFacets'
+      properties:
+        facets:
+          type: object
+          additionalProperties:
+            type: array
+            items:
+              $ref: '#/components/schemas/EntityFacet'
       required:
         - facets
+      additionalProperties: false
     Location:
       type: object
       properties:
@@ -236,6 +322,7 @@ components:
         - type
         - id
       description: Entity location for a specific entity.
+      additionalProperties: false
     LocationSpec:
       type: object
       properties:
@@ -252,6 +339,7 @@ components:
         - target
         - type
       description: Holds the entity location information.
+      additionalProperties: false
     AnalyzeLocationExistingEntity:
       type: object
       properties:
@@ -270,7 +358,94 @@ components:
         read and emitted like this so that the frontend can inform the user that it
         located them and can make sure to register them as well if they weren't
         already
-    RecursivePartial_Entity_:
+      additionalProperties: false
+    RecursivePartialEntityRelation:
+      type: object
+      properties:
+        targetRef:
+          type: string
+          description: The entity ref of the target of this relation.
+        type:
+          type: string
+          description: The type of the relation.
+      description: A relation of a specific type to another entity in the catalog.
+      additionalProperties: false
+    RecursivePartialEntityMeta:
+      allOf:
+        - $ref: '#/components/schemas/JsonObject'
+        - type: object
+          properties:
+            links:
+              type: array
+              items:
+                $ref: '#/components/schemas/EntityLink'
+              description: A list of external hyperlinks related to the entity.
+            tags:
+              type: array
+              items:
+                type: string
+              description: |-
+                A list of single-valued strings, to for example classify catalog entities in
+                various ways.
+            annotations:
+              $ref: '#/components/schemas/MapStringString'
+            labels:
+              $ref: '#/components/schemas/MapStringString'
+            description:
+              type: string
+              description: |-
+                A short (typically relatively few words, on one line) description of the
+                entity.
+            title:
+              type: string
+              description: |-
+                A display name of the entity, to be presented in user interfaces instead
+                of the `name` property above, when available.
+                This field is sometimes useful when the `name` is cumbersome or ends up
+                being perceived as overly technical. The title generally does not have
+                as stringent format requirements on it, so it may contain special
+                characters and be more explanatory. Do keep it very short though, and
+                avoid situations where a title can be confused with the name of another
+                entity, or where two entities share a title.
+                Note that this is only for display purposes, and may be ignored by some
+                parts of the code. Entity references still always make use of the `name`
+                property, not the title.
+            namespace:
+              type: string
+              description: The namespace that the entity belongs to.
+            name:
+              type: string
+              description: |-
+                The name of the entity.
+                Must be unique within the catalog at any given point in time, for any
+                given namespace + kind pair. This value is part of the technical
+                identifier of the entity, and as such it will appear in URLs, database
+                tables, entity references, and similar. It is subject to restrictions
+                regarding what characters are allowed.
+                If you want to use a different, more human readable string with fewer
+                restrictions on it in user interfaces, see the `title` field below.
+            etag:
+              type: string
+              description: |-
+                An opaque string that changes for each update operation to any part of
+                the entity, including metadata.
+                This field can not be set by the user at creation time, and the server
+                will reject an attempt to do so. The field will be populated in read
+                operations. The field can (optionally) be specified when performing
+                update or delete operations, and the server will then reject the
+                operation if it does not match the current stored value.
+            uid:
+              type: string
+              description: |-
+                A globally unique ID for the entity.
+                This field can not be set by the user at creation time, and the server
+                will reject an attempt to do so. The field will be populated in read
+                operations. The field can (optionally) be specified when performing
+                update or delete operations, but the server is free to reject requests
+                that do so in such a way that it breaks semantics.
+          description: Metadata fields common to all versions/kinds of entity.
+      additionalProperties: false
+    RecursivePartialEntity:
       type: object
       properties:
         apiVersion:
@@ -282,15 +457,16 @@ components:
           type: string
           description: The high level entity type being described.
         metadata:
-          $ref: '#/components/schemas/EntityMeta'
+          $ref: '#/components/schemas/RecursivePartialEntityMeta'
         spec:
           $ref: '#/components/schemas/JsonObject'
         relations:
           type: array
           items:
-            $ref: '#/components/schemas/EntityRelation'
+            $ref: '#/components/schemas/RecursivePartialEntityRelation'
           description: The relations that this entity has with other entities.
       description: Makes all keys of an entire hierarchy optional.
+      additionalProperties: false
     AnalyzeLocationEntityField:
       type: object
       properties:
@@ -302,8 +478,9 @@ components:
             field empty; which would currently make it owned by X" where X is taken from the
             codeowners file.
         value:
-          type: string
-          nullable: true
+          type:
+            - string
+            - 'null'
         state:
           type: string
           enum:
@@ -321,6 +498,7 @@ components:
         - value
         - state
         - field
+      additionalProperties: false
     AnalyzeLocationGenerateEntity:
       type: object
       properties:
@@ -329,7 +507,7 @@ components:
           items:
             $ref: '#/components/schemas/AnalyzeLocationEntityField'
         entity:
-          $ref: '#/components/schemas/RecursivePartial_Entity_'
+          $ref: '#/components/schemas/RecursivePartialEntity'
       required:
         - fields
         - entity
@@ -339,6 +517,7 @@ components:
         the frontend. It'll probably contain a (possibly incomplete) entity, plus
         enough info for the frontend to know what form data to show to the user
         for overriding/completing the info.
+      additionalProperties: false
     AnalyzeLocationResponse:
       type: object
       properties:
@@ -353,6 +532,7 @@ components:
       required:
         - generateEntities
         - existingEntityFiles
+      additionalProperties: false
     LocationInput:
       type: object
       properties:
@@ -369,6 +549,7 @@ components:
         - type
         - target
         - presence
+      additionalProperties: false
     SerializedError:
       allOf:
         - $ref: '#/components/schemas/JsonObject'
@@ -390,12 +571,35 @@ components:
             - message
             - name
       description: The serialized form of an Error.
+      additionalProperties: false
+    EntitiesQueryResponse:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          description: |-
+            The list of entities paginated by a specific filter.
+        totalItems:
+          type: number
+        pageInfo:
+          type: object
+          properties:
+            nextCursor:
+              type: string
+              description: |-
+                The cursor for the next batch of entities.
+            prevCursor:
+              type: string
+              description: |-
+                The cursor for the previous batch of entities.
+      additionalProperties: false
   securitySchemes:
     JWT:
       type: http
       scheme: bearer
       bearerFormat: JWT
-
 paths:
   /refresh:
     post:
@@ -404,7 +608,6 @@ paths:
         '200':
           description: Refreshed
       security:
-        # From https://stackoverflow.com/questions/47659324/how-to-specify-an-endpoints-authorization-is-optional-in-openapi-v3
         - {}
         - JWT: []
       parameters: []
@@ -413,8 +616,17 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/RefreshOptions'
-
+              type: object
+              properties:
+                authorizationToken:
+                  type: string
+                entityRef:
+                  type: string
+                  description: The reference to a single entity that should be refreshed
+              required:
+                - entityRef
+              description: Options for requesting a refresh of entities in the catalog.
+              additionalProperties: false
   /entities:
     get:
       operationId: GetEntities
@@ -431,32 +643,11 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: query
-          name: filter
-          required: false
-          schema:
-            type: string
-        - in: query
-          name: fields
-          required: false
-          schema:
-            type: string
-        - in: query
-          name: offset
-          required: false
-          schema:
-            type: string
-        - in: query
-          name: limit
-          required: false
-          schema:
-            type: string
-        - in: query
-          name: after
-          required: false
-          schema:
-            type: string
-
+        - $ref: '#/components/parameters/fields'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/filter'
+        - $ref: '#/components/parameters/offset'
+        - $ref: '#/components/parameters/after'
   /entities/by-uid/{uid}:
     get:
       operationId: GetEntityByUid
@@ -471,11 +662,7 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: path
-          name: uid
-          required: true
-          schema:
-            type: string
+        - $ref: '#/components/parameters/uid'
     delete:
       operationId: DeleteEntityByUid
       responses:
@@ -485,12 +672,7 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: path
-          name: uid
-          required: true
-          schema:
-            type: string
-
+        - $ref: '#/components/parameters/uid'
   /entities/by-name/{kind}/{namespace}/{name}:
     get:
       operationId: GetEntityByName
@@ -505,22 +687,9 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: path
-          name: kind
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: namespace
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: name
-          required: true
-          schema:
-            type: string
-
+        - $ref: '#/components/parameters/kind'
+        - $ref: '#/components/parameters/namespace'
+        - $ref: '#/components/parameters/name'
   /entities/by-name/{kind}/{namespace}/{name}/ancestry:
     get:
       operationId: GetEntityAncestryByName
@@ -535,22 +704,9 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: path
-          name: kind
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: namespace
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: name
-          required: true
-          schema:
-            type: string
-
+        - $ref: '#/components/parameters/kind'
+        - $ref: '#/components/parameters/namespace'
+        - $ref: '#/components/parameters/name'
   /entities/by-refs:
     post:
       operationId: GetEntitiesByRefs
@@ -565,20 +721,58 @@ paths:
         - {}
         - JWT: []
       parameters:
-        - in: query
-          name: fields
-          required: false
-          schema:
-            type: string
+        - $ref: '#/components/parameters/fields'
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              type: array
-              items:
-                type: string
-
+              type: object
+              required:
+                - entityRefs
+              properties:
+                entityRefs:
+                  type: array
+                  items:
+                    type: string
+                fields:
+                  type: array
+                  items:
+                    type: string
+  /entities/by-query:
+    get:
+      operationId: GetEntitiesByQuery
+      responses:
+        '200':
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EntitiesQueryResponse'
+      security:
+        - {}
+        - JWT: []
+      parameters:
+        - $ref: '#/components/parameters/fields'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/sortField'
+        - $ref: '#/components/parameters/cursor'
+        - name: fullTextFilterTerm
+          in: query
+          description: Text search term.
+          required: false
+          schema:
+            type: string
+        - name: fullTextFilterFields
+          in: query
+          description: A comma separated list of fields to sort returned results by.
+          required: false
+          schema:
+            type: array
+            items:
+              type: string
+          explode: false
+          style: form
   /entity-facets:
     get:
       operationId: GetEntityFacets
@@ -598,12 +792,7 @@ paths:
           required: true
           schema:
             type: string
-        - in: query
-          name: filter
-          required: false
-          schema:
-            type: string
-
+        - $ref: '#/components/parameters/filter'
   /locations:
     post:
       operationId: CreateLocation
@@ -634,7 +823,7 @@ paths:
           name: dryRun
           required: false
           schema:
-            type: boolean
+            type: string
       requestBody:
         required: true
         content:
@@ -675,7 +864,6 @@ paths:
         - {}
         - JWT: []
       parameters: []
-
   /locations/{id}:
     get:
       operationId: GetLocation
@@ -709,7 +897,6 @@ paths:
           required: true
           schema:
             type: string
-
   /analyze-location:
     post:
       operationId: AnalyzeLocation
@@ -738,7 +925,6 @@ paths:
               required:
                 - catalogFileName
                 - location
-
   /validate-entity:
     post:
       operationId: ValidateEntity
diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index 849096c601..830e909272 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -50,6 +50,8 @@ import {
   locationInput,
   validateRequestBody,
 } from './util';
+import type { ApiRouter } from '@backstage/backend-openapi-utils';
+import spec from '../schema/openapi';
 
 /**
  * Options used by {@link createRouter}.
@@ -85,7 +87,7 @@ export async function createRouter(
     logger,
     permissionIntegrationRouter,
   } = options;
-  const router = Router();
+  const router = Router() as ApiRouter<typeof spec>;
   router.use(express.json());
 
   const readonlyEnabled =
diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md
index 5ec8bafb7a..7a7dd32497 100644
--- a/plugins/catalog-common/CHANGELOG.md
+++ b/plugins/catalog-common/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-common
 
+## 1.0.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.0.13-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 040c6ebf2a..2ffa87215c 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.13-next.0",
+  "version": "1.0.13-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-customized/CHANGELOG.md b/plugins/catalog-customized/CHANGELOG.md
index 3cc9dc53c6..6d59ddd2b1 100644
--- a/plugins/catalog-customized/CHANGELOG.md
+++ b/plugins/catalog-customized/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @internal/plugin-catalog-customized
 
+## 0.0.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-catalog@1.10.0-next.3
+
+## 0.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-catalog@1.10.0-next.2
+
 ## 0.0.9-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-customized/package.json b/plugins/catalog-customized/package.json
index 37cb2f2488..cde45c53e6 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.9-next.1",
+  "version": "0.0.9-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index c5c5ce4966..b3cf13ad1b 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-catalog-graph
 
+## 0.2.29-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.29-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.29-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 1588bf1c61..ea6b377b8d 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.29-next.1",
+  "version": "0.2.29-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-graphql/CHANGELOG.md b/plugins/catalog-graphql/CHANGELOG.md
index 39a4340b69..1dde616895 100644
--- a/plugins/catalog-graphql/CHANGELOG.md
+++ b/plugins/catalog-graphql/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-graphql
 
+## 0.3.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+
 ## 0.3.20-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index f5403b77f5..0546bbc3fd 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.20-next.1",
+  "version": "0.3.20-next.2",
   "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 a9baac02b8..3e42af2290 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-catalog-import
 
+## 0.9.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## 0.9.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
 ## 0.9.7-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index fc7599af40..ff0c35da04 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.7-next.1",
+  "version": "0.9.7-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 7a84ad76fc..b4dd966a70 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-catalog-node
 
+## 1.3.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## 1.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
 ## 1.3.5-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 46b1430d8b..0f913f3b88 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-node",
   "description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
-  "version": "1.3.5-next.1",
+  "version": "1.3.5-next.3",
   "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 824bb6a30b..8dd3c3bb07 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-catalog-react
 
+## 1.5.0-next.3
+
+### Minor Changes
+
+- a49fb39df5a: Attempt to load entity owner names in the EntityOwnerPicker through the `by-refs` endpoint. If `spec.profile.displayName` or `metadata.title` are populated, we now attempt to show those before showing the `humanizeEntityRef`'d version.
+
+  **BREAKING**: `EntityOwnerFilter` now uses the full entity ref instead of the `humanizeEntityRef`. If you rely on `EntityOwnerFilter.values` or the `queryParameters.owners` of `useEntityList`, you will need to adjust your code like the following.
+
+  ```tsx
+  const { queryParameters: { owners } } = useEntityList();
+  // or
+  const { filter: { owners } } = useEntityList();
+
+  // Instead of,
+  if (owners.some(ref => ref === humanizeEntityRef(myEntity))) ...
+
+  // You'll need to use,
+  if (owners.some(ref => ref === stringifyEntityRef(myEntity))) ...
+  ```
+
+### Patch Changes
+
+- d1f5324dff7: Reverted the check if the selected options list is different than the query parameters list before invoking `setSelectedOptions` method. This was preventing updating list items when a query string was already present in the URL when loading the page.
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
+## 1.4.1-next.2
+
+### Patch Changes
+
+- 81bee24c5de: Fixed bug in catalog filters where you could not click on the text to select a value.
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+
 ## 1.4.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 77f439018f..20b10f18cc 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -242,7 +242,6 @@ export class EntityOwnerFilter implements EntityFilter {
   constructor(values: string[]);
   // (undocumented)
   filterEntity(entity: Entity): boolean;
-  // (undocumented)
   toQueryValue(): string[];
   // (undocumented)
   readonly values: string[];
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 39028f49bf..88618a999d 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.4.1-next.1",
+  "version": "1.5.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
index 15e44baf20..b853c2d3fc 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
@@ -28,7 +28,6 @@ import {
   useEntityList,
 } from '../../hooks/useEntityListProvider';
 import { EntityFilter } from '../../types';
-import _ from 'lodash';
 
 type KeysMatchingCondition<T, V, K> = T extends V ? K : never;
 type KeysMatching<T, V> = {
@@ -97,13 +96,10 @@ export function EntityAutocompletePicker<
   // Set selected options on query parameter updates; this happens at initial page load and from
   // external updates to the page location
   useEffect(() => {
-    if (
-      queryParameters.length &&
-      !_.isEqual(selectedOptions, queryParameters)
-    ) {
+    if (queryParameters.length) {
       setSelectedOptions(queryParameters);
     }
-  }, [selectedOptions, queryParameters]);
+  }, [queryParameters]);
 
   const availableOptions = Object.keys(availableValues ?? {});
   const shouldAddFilter = selectedOptions.length && availableOptions.length;
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
index b6e928b519..e4dc322c7c 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
@@ -14,12 +14,59 @@
  * limitations under the License.
  */
 
-import { Entity, parseEntityRef } from '@backstage/catalog-model';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
+import { fireEvent, screen } from '@testing-library/react';
 import React from 'react';
 import { MockEntityListContextProvider } from '../../testUtils/providers';
 import { EntityOwnerFilter } from '../../filters';
 import { EntityOwnerPicker } from './EntityOwnerPicker';
+import { ApiProvider } from '@backstage/core-app-api';
+import {
+  MockErrorApi,
+  renderWithEffects,
+  TestApiRegistry,
+} from '@backstage/test-utils';
+import { catalogApiRef, CatalogApi } from '../..';
+import { errorApiRef } from '@backstage/core-plugin-api';
+
+const ownerEntities: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'Group',
+    metadata: {
+      name: 'some-owner',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Group',
+    metadata: {
+      name: 'some-owner-2',
+    },
+    spec: {
+      profile: {
+        displayName: 'Some Owner 2',
+      },
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Group',
+    metadata: {
+      name: 'another-owner',
+      title: 'Another Owner',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Group',
+    metadata: {
+      namespace: 'test-namespace',
+      name: 'another-owner-2',
+      title: 'Another Owner in Another Namespace',
+    },
+  },
+];
 
 const sampleEntities: Entity[] = [
   {
@@ -50,6 +97,10 @@ const sampleEntities: Entity[] = [
         type: 'ownedBy',
         targetRef: 'group:default/another-owner',
       },
+      {
+        type: 'ownedBy',
+        targetRef: 'group:test-namespace/another-owner-2',
+      },
     ],
   },
   {
@@ -67,77 +118,104 @@ const sampleEntities: Entity[] = [
   },
 ];
 
+const getEntitiesByRefs = jest.fn(async ({ entityRefs }) => ({
+  items: entityRefs.map((e: string) =>
+    ownerEntities.find(f => stringifyEntityRef(f) === e),
+  ),
+}));
+const mockCatalogApi: Partial<CatalogApi> = {
+  getEntitiesByRefs,
+};
+const mockErrorApi = new MockErrorApi();
+
 describe('<EntityOwnerPicker/>', () => {
-  it('renders all owners', () => {
-    render(
-      <MockEntityListContextProvider
-        value={{ entities: sampleEntities, backendEntities: sampleEntities }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+  const mockApis = TestApiRegistry.from(
+    [catalogApiRef, mockCatalogApi],
+    [errorApiRef, mockErrorApi],
+  );
+
+  it('renders all owners', async () => {
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{ entities: sampleEntities, backendEntities: sampleEntities }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(screen.getByText('Owner')).toBeInTheDocument();
 
     fireEvent.click(screen.getByTestId('owner-picker-expand'));
-    sampleEntities
-      .flatMap(e => e.relations?.map(r => parseEntityRef(r.targetRef).name))
-      .forEach(owner => {
-        expect(screen.getByText(owner as string)).toBeInTheDocument();
-      });
+    [
+      'Another Owner',
+      'some-owner',
+      'Some Owner 2',
+      'Another Owner in Another Namespace',
+    ].forEach(owner => {
+      expect(screen.getByText(owner)).toBeInTheDocument();
+    });
   });
 
-  it('renders unique owners in alphabetical order', () => {
-    render(
-      <MockEntityListContextProvider
-        value={{ entities: sampleEntities, backendEntities: sampleEntities }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+  it('renders unique owners in alphabetical order', async () => {
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{ entities: sampleEntities, backendEntities: sampleEntities }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(screen.getByText('Owner')).toBeInTheDocument();
 
     fireEvent.click(screen.getByTestId('owner-picker-expand'));
 
     expect(screen.getAllByRole('option').map(o => o.textContent)).toEqual([
-      'another-owner',
+      'Another Owner',
+      'Another Owner in Another Namespace',
       'some-owner',
-      'some-owner-2',
+      'Some Owner 2',
     ]);
   });
 
-  it('respects the query parameter filter value', () => {
+  it('respects the query parameter filter value', async () => {
     const updateFilters = jest.fn();
     const queryParameters = { owners: ['another-owner'] };
-    render(
-      <MockEntityListContextProvider
-        value={{
-          entities: sampleEntities,
-          backendEntities: sampleEntities,
-          updateFilters,
-          queryParameters,
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            entities: sampleEntities,
+            backendEntities: sampleEntities,
+            updateFilters,
+            queryParameters,
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
 
     expect(updateFilters).toHaveBeenLastCalledWith({
-      owners: new EntityOwnerFilter(['another-owner']),
+      owners: new EntityOwnerFilter(['group:default/another-owner']),
     });
   });
 
-  it('adds owners to filters', () => {
+  it('adds owners to filters', async () => {
     const updateFilters = jest.fn();
-    render(
-      <MockEntityListContextProvider
-        value={{
-          entities: sampleEntities,
-          backendEntities: sampleEntities,
-          updateFilters,
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            entities: sampleEntities,
+            backendEntities: sampleEntities,
+            updateFilters,
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
       owners: undefined,
@@ -146,28 +224,31 @@ describe('<EntityOwnerPicker/>', () => {
     fireEvent.click(screen.getByTestId('owner-picker-expand'));
     fireEvent.click(screen.getByText('some-owner'));
     expect(updateFilters).toHaveBeenLastCalledWith({
-      owners: new EntityOwnerFilter(['some-owner']),
+      owners: new EntityOwnerFilter(['group:default/some-owner']),
     });
   });
 
-  it('removes owners from filters', () => {
+  it('removes owners from filters', async () => {
     const updateFilters = jest.fn();
-    render(
-      <MockEntityListContextProvider
-        value={{
-          entities: sampleEntities,
-          backendEntities: sampleEntities,
-          updateFilters,
-          filters: { owners: new EntityOwnerFilter(['some-owner']) },
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            entities: sampleEntities,
+            backendEntities: sampleEntities,
+            updateFilters,
+            filters: { owners: new EntityOwnerFilter(['some-owner']) },
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      owners: new EntityOwnerFilter(['some-owner']),
+      owners: new EntityOwnerFilter(['group:default/some-owner']),
     });
     fireEvent.click(screen.getByTestId('owner-picker-expand'));
+
     expect(screen.getByLabelText('some-owner')).toBeChecked();
 
     fireEvent.click(screen.getByLabelText('some-owner'));
@@ -176,49 +257,55 @@ describe('<EntityOwnerPicker/>', () => {
     });
   });
 
-  it('responds to external queryParameters changes', () => {
+  it('responds to external queryParameters changes', async () => {
     const updateFilters = jest.fn();
-    const rendered = render(
-      <MockEntityListContextProvider
-        value={{
-          updateFilters,
-          queryParameters: { owners: ['team-a'] },
-          backendEntities: sampleEntities,
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            updateFilters,
+            queryParameters: { owners: ['team-a'] },
+            backendEntities: sampleEntities,
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      owners: new EntityOwnerFilter(['team-a']),
+      owners: new EntityOwnerFilter(['group:default/team-a']),
     });
     rendered.rerender(
-      <MockEntityListContextProvider
-        value={{
-          updateFilters,
-          queryParameters: { owners: ['team-b'] },
-          backendEntities: sampleEntities,
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            updateFilters,
+            queryParameters: { owners: ['team-b'] },
+            backendEntities: sampleEntities,
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
-      owners: new EntityOwnerFilter(['team-b']),
+      owners: new EntityOwnerFilter(['group:default/team-b']),
     });
   });
-  it('removes owners from filters if there are none available', () => {
+  it('removes owners from filters if there are none available', async () => {
     const updateFilters = jest.fn();
-    render(
-      <MockEntityListContextProvider
-        value={{
-          updateFilters,
-          queryParameters: { owners: ['team-a'] },
-          backendEntities: [],
-        }}
-      >
-        <EntityOwnerPicker />
-      </MockEntityListContextProvider>,
+    await renderWithEffects(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider
+          value={{
+            updateFilters,
+            queryParameters: { owners: ['team-a'] },
+            backendEntities: [],
+          }}
+        >
+          <EntityOwnerPicker />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
     );
     expect(updateFilters).toHaveBeenLastCalledWith({
       owners: undefined,
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
index 185de3535a..8c4f2bfea0 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  Entity,
+  parseEntityRef,
+  RELATION_OWNED_BY,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
 import {
   Box,
   Checkbox,
@@ -31,7 +36,10 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useEntityList } from '../../hooks/useEntityListProvider';
 import { EntityOwnerFilter } from '../../filters';
 import { getEntityRelations } from '../../utils';
-import { humanizeEntityRef } from '../EntityRefLink';
+import useAsync from 'react-use/lib/useAsync';
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import { catalogApiRef } from '../../api';
+import { humanizeEntity, humanizeEntityRef } from '../EntityRefLink/humanize';
 
 /** @public */
 export type CatalogReactEntityOwnerPickerClassKey = 'input';
@@ -57,6 +65,8 @@ export const EntityOwnerPicker = () => {
     filters,
     queryParameters: { owners: ownersParameter },
   } = useEntityList();
+  const catalogApi = useApi(catalogApiRef);
+  const errorApi = useApi(errorApiRef);
 
   const queryParamOwners = useMemo(
     () => [ownersParameter].flat().filter(Boolean) as string[],
@@ -64,43 +74,93 @@ export const EntityOwnerPicker = () => {
   );
 
   const [selectedOwners, setSelectedOwners] = useState(
-    queryParamOwners.length ? queryParamOwners : filters.owners?.values ?? [],
+    queryParamOwners.length
+      ? new EntityOwnerFilter(queryParamOwners).values
+      : filters.owners?.values ?? [],
   );
 
+  const {
+    loading,
+    error,
+    value: ownerEntities,
+  } = useAsync(async () => {
+    const ownerEntityRefs = [
+      ...new Set(
+        backendEntities
+          .flatMap((e: Entity) =>
+            getEntityRelations(e, RELATION_OWNED_BY).map(o =>
+              stringifyEntityRef(o),
+            ),
+          )
+          .filter(Boolean) as string[],
+      ),
+    ];
+    const { items: ownerEntitiesOrNull } = await catalogApi.getEntitiesByRefs({
+      entityRefs: ownerEntityRefs,
+      fields: [
+        'kind',
+        'metadata.name',
+        'metadata.title',
+        'metadata.namespace',
+        'spec.profile.displayName',
+      ],
+    });
+    const owners = ownerEntitiesOrNull.map((entity, index) => {
+      if (entity) {
+        return {
+          label: humanizeEntity(entity, { defaultKind: 'Group' }),
+          entityRef: stringifyEntityRef(entity),
+        };
+      }
+      return {
+        label: humanizeEntityRef(parseEntityRef(ownerEntityRefs[index]), {
+          defaultKind: 'group',
+        }),
+        entityRef: ownerEntityRefs[index],
+      };
+    });
+
+    return owners.sort((a, b) =>
+      a.label.localeCompare(b.label, 'en-US', {
+        ignorePunctuation: true,
+        caseFirst: 'upper',
+      }),
+    );
+  }, [backendEntities]);
+
+  useEffect(() => {
+    if (error) {
+      errorApi.post(
+        {
+          ...error,
+          message: `EntityOwnerPicker failed to initialize: ${error.message}`,
+        },
+        {},
+      );
+    }
+  }, [error, errorApi]);
+
   // Set selected owners on query parameter updates; this happens at initial page load and from
   // external updates to the page location.
   useEffect(() => {
     if (queryParamOwners.length) {
-      setSelectedOwners(queryParamOwners);
+      const filter = new EntityOwnerFilter(queryParamOwners);
+      setSelectedOwners(filter.values);
     }
   }, [queryParamOwners]);
 
-  const availableOwners = useMemo(
-    () =>
-      [
-        ...new Set(
-          backendEntities
-            .flatMap((e: Entity) =>
-              getEntityRelations(e, RELATION_OWNED_BY).map(o =>
-                humanizeEntityRef(o, { defaultKind: 'group' }),
-              ),
-            )
-            .filter(Boolean) as string[],
-        ),
-      ].sort(),
-    [backendEntities],
-  );
-
   useEffect(() => {
-    updateFilters({
-      owners:
-        selectedOwners.length && availableOwners.length
-          ? new EntityOwnerFilter(selectedOwners)
-          : undefined,
-    });
-  }, [selectedOwners, updateFilters, availableOwners]);
+    if (!loading && ownerEntities) {
+      updateFilters({
+        owners:
+          selectedOwners.length && ownerEntities.length
+            ? new EntityOwnerFilter(selectedOwners)
+            : undefined,
+      });
+    }
+  }, [selectedOwners, updateFilters, ownerEntities, loading]);
 
-  if (!availableOwners.length) return null;
+  if (!loading && !ownerEntities?.length) return null;
 
   return (
     <Box pb={1} pt={1}>
@@ -109,9 +169,17 @@ export const EntityOwnerPicker = () => {
         <Autocomplete
           multiple
           disableCloseOnSelect
-          options={availableOwners}
-          value={selectedOwners}
-          onChange={(_: object, value: string[]) => setSelectedOwners(value)}
+          loading={loading}
+          options={ownerEntities || []}
+          value={
+            ownerEntities?.filter(e =>
+              selectedOwners.some((f: string) => f === e.entityRef),
+            ) ?? []
+          }
+          onChange={(_: object, value: { entityRef: string }[]) =>
+            setSelectedOwners(value.map(e => e.entityRef))
+          }
+          getOptionLabel={option => option.label}
           renderOption={(option, { selected }) => (
             <FormControlLabel
               control={
@@ -122,7 +190,7 @@ export const EntityOwnerPicker = () => {
                 />
               }
               onClick={event => event.preventDefault()}
-              label={option}
+              label={option.label}
             />
           )}
           size="small"
diff --git a/plugins/catalog-react/src/components/EntityRefLink/humanize.test.ts b/plugins/catalog-react/src/components/EntityRefLink/humanize.test.ts
index 80ce2100f6..e7d1649a29 100644
--- a/plugins/catalog-react/src/components/EntityRefLink/humanize.test.ts
+++ b/plugins/catalog-react/src/components/EntityRefLink/humanize.test.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { humanizeEntityRef } from './humanize';
+import { Entity } from '@backstage/catalog-model';
+import { humanizeEntity, humanizeEntityRef } from './humanize';
 
 describe('humanizeEntityRef', () => {
   it('formats entity in default namespace', () => {
@@ -210,3 +211,59 @@ describe('humanizeEntityRef', () => {
     expect(title).toEqual('component:default/software');
   });
 });
+
+describe('humanizeEntity', () => {
+  it('gives a readable name when one is provided at metadata.title', () => {
+    expect(
+      humanizeEntity({
+        metadata: { name: 'my-entity', title: 'My Title' },
+      } as Entity),
+    ).toBe('My Title');
+  });
+
+  it.each([
+    [
+      'User',
+      {
+        apiVersion: '1',
+        kind: 'User',
+        metadata: {
+          name: 'user-name',
+        },
+        spec: {
+          profile: {
+            displayName: 'User Name',
+          },
+        },
+      },
+      'User Name',
+    ],
+    [
+      'Group',
+      {
+        apiVersion: '1',
+        kind: 'User',
+        metadata: {
+          name: 'team-name',
+        },
+        spec: {
+          profile: {
+            displayName: 'Team Name',
+          },
+        },
+      },
+      'Team Name',
+    ],
+  ])(
+    'gives a readable name for kind %s when one is provided at spec.profile.displayName',
+    (_, entity: Entity, expected) => {
+      expect(humanizeEntity(entity)).toBe(expected);
+    },
+  );
+
+  it('should pass through to humanizeEntityRef when nothing matches', () => {
+    expect(
+      humanizeEntity({ kind: 'Group', metadata: { name: 'test' } } as Entity),
+    ).toBe('group:test');
+  });
+});
diff --git a/plugins/catalog-react/src/components/EntityRefLink/humanize.ts b/plugins/catalog-react/src/components/EntityRefLink/humanize.ts
index bfc8e2af84..7f1501280a 100644
--- a/plugins/catalog-react/src/components/EntityRefLink/humanize.ts
+++ b/plugins/catalog-react/src/components/EntityRefLink/humanize.ts
@@ -19,6 +19,7 @@ import {
   CompoundEntityRef,
   DEFAULT_NAMESPACE,
 } from '@backstage/catalog-model';
+import get from 'lodash/get';
 
 /**
  * @param defaultNamespace - if set to false then namespace is never omitted,
@@ -65,3 +66,34 @@ export function humanizeEntityRef(
       : kind;
   return `${kind ? `${kind}:` : ''}${namespace ? `${namespace}/` : ''}${name}`;
 }
+
+/**
+ * Convert an entity to its more readable name if available.
+ *
+ * If an entity is either User or Group, this will be its `spec.profile.displayName`.
+ * Otherwise, this is `metadata.title`.
+ *
+ * If neither of those are found or populated, fallback to `humanizeEntityRef`.
+ *
+ * @param entity - Entity to convert.
+ * @param opts - If entity readable name is not available, opts will be used to specify humanizeEntityRef options.
+ * @returns Readable name, defaults to unique identifier.
+ *
+ * @public
+ */
+export function humanizeEntity(
+  entity: Entity,
+  opts?: {
+    defaultKind?: string;
+    defaultNamespace?: string | false;
+  },
+) {
+  for (const path of ['spec.profile.displayName', 'metadata.title']) {
+    const value = get(entity, path);
+    if (value && typeof value === 'string') {
+      return value;
+    }
+  }
+
+  return humanizeEntityRef(entity, opts);
+}
diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
index c70217f3a4..bfaa689190 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
@@ -202,6 +202,34 @@ describe('<EntityTagPicker/>', () => {
       tags: new EntityTagFilter(['tag2']),
     });
   });
+
+  it('verify that user can select tags after query string has been set', async () => {
+    const updateFilters = jest.fn();
+    render(
+      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+        <MockEntityListContextProvider
+          value={{
+            updateFilters,
+            queryParameters: { tags: ['tag1'] },
+          }}
+        >
+          <EntityTagPicker />
+        </MockEntityListContextProvider>
+      </TestApiProvider>,
+    );
+    await waitFor(() =>
+      expect(updateFilters).toHaveBeenLastCalledWith({
+        tags: new EntityTagFilter(['tag1']),
+      }),
+    );
+    fireEvent.click(screen.getByTestId('tags-picker-expand'));
+    fireEvent.click(screen.getByLabelText('tag2'));
+    expect(screen.getByLabelText('tag2')).toBeChecked();
+    expect(updateFilters).toHaveBeenLastCalledWith({
+      tags: new EntityTagFilter(['tag1', 'tag2']),
+    });
+  });
+
   it('removes tags from filters if there are none available', async () => {
     const updateFilters = jest.fn();
     const mockCatalogApiRefNoTags = {
diff --git a/plugins/catalog-react/src/filters.test.ts b/plugins/catalog-react/src/filters.test.ts
index 2a67190633..8ddac7e53b 100644
--- a/plugins/catalog-react/src/filters.test.ts
+++ b/plugins/catalog-react/src/filters.test.ts
@@ -15,11 +15,12 @@
  */
 
 import { AlphaEntity } from '@backstage/catalog-model/alpha';
-import { Entity } from '@backstage/catalog-model';
+import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import {
   EntityErrorFilter,
   EntityOrphanFilter,
+  EntityOwnerFilter,
   EntityTextFilter,
 } from './filters';
 
@@ -143,3 +144,65 @@ describe('EntityErrorFilter', () => {
     expect(filter.filterEntity(entities[1])).toBeFalsy();
   });
 });
+
+describe('EntityOwnerFilter', () => {
+  it('should handle humanizedEntityRefs', () => {
+    const filter = new EntityOwnerFilter(['my-user']);
+    expect(
+      filter.filterEntity({
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            targetRef: 'group:default/my-user',
+          },
+        ],
+      } as Entity),
+    ).toBeTruthy();
+    expect(filter.values).toStrictEqual(['group:default/my-user']);
+  });
+
+  it('should handle full entityRefs', () => {
+    const filter = new EntityOwnerFilter(['group:default/my-user']);
+    expect(
+      filter.filterEntity({
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            targetRef: 'group:default/my-user',
+          },
+        ],
+      } as Entity),
+    ).toBeTruthy();
+    expect(filter.values).toStrictEqual(['group:default/my-user']);
+  });
+
+  it('should gracefully reject non-entity refs', () => {
+    const filter = new EntityOwnerFilter(['group:default/my-user', '']);
+    expect(
+      filter.filterEntity({
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            targetRef: 'group:default/my-user',
+          },
+        ],
+      } as Entity),
+    ).toBeTruthy();
+    expect(filter.values).toStrictEqual(['group:default/my-user']);
+  });
+
+  it('should handle non group full entity refs', () => {
+    const filter = new EntityOwnerFilter(['user:default/my-user', '']);
+    expect(
+      filter.filterEntity({
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            targetRef: 'user:default/my-user',
+          },
+        ],
+      } as Entity),
+    ).toBeTruthy();
+    expect(filter.values).toStrictEqual(['user:default/my-user']);
+  });
+});
diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts
index 5bd81780d6..ad9e917699 100644
--- a/plugins/catalog-react/src/filters.ts
+++ b/plugins/catalog-react/src/filters.ts
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  Entity,
+  parseEntityRef,
+  RELATION_OWNED_BY,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
 import { AlphaEntity } from '@backstage/catalog-model/alpha';
-import { humanizeEntityRef } from './components/EntityRefLink';
 import { EntityFilter, UserListFilterKind } from './types';
 import { getEntityRelations } from './utils';
 
@@ -113,18 +117,37 @@ export class EntityTextFilter implements EntityFilter {
 /**
  * Filter matching entities that are owned by group.
  * @public
+ *
+ * CAUTION: This class may contain both full and partial entity refs.
  */
 export class EntityOwnerFilter implements EntityFilter {
-  constructor(readonly values: string[]) {}
+  readonly values: string[];
+  constructor(values: string[]) {
+    this.values = values.reduce((fullRefs, ref) => {
+      // Attempt to remove bad entity references here.
+      try {
+        fullRefs.push(
+          stringifyEntityRef(parseEntityRef(ref, { defaultKind: 'Group' })),
+        );
+        return fullRefs;
+      } catch (err) {
+        return fullRefs;
+      }
+    }, [] as string[]);
+  }
 
   filterEntity(entity: Entity): boolean {
     return this.values.some(v =>
       getEntityRelations(entity, RELATION_OWNED_BY).some(
-        o => humanizeEntityRef(o, { defaultKind: 'group' }) === v,
+        o => stringifyEntityRef(o) === v,
       ),
     );
   }
 
+  /**
+   * Get the URL query parameter value. May be a mix of full and humanized entity refs.
+   * @returns list of entity refs.
+   */
   toQueryValue(): string[] {
     return this.values;
   }
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 335b19a415..1b36f7976a 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-catalog
 
+## 1.10.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 1.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 1.10.0-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 81cbe58f66..959295fac4 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.10.0-next.1",
+  "version": "1.10.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
index 7b92df5809..3411656426 100644
--- a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
@@ -119,6 +119,13 @@ describe('DefaultCatalogPage', () => {
         ],
       };
     },
+    /**
+     * For the purposes of this test case, use existing functionality. The picker
+     *  isn't being tested, just needs this method to render correctly.
+     */
+    getEntitiesByRefs: async refs => {
+      return { items: refs.entityRefs.map(() => undefined) };
+    },
   };
   const testProfile: Partial<ProfileInfo> = {
     displayName: 'Display Name',
diff --git a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
index f30e0a2fb2..109734731a 100644
--- a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
+++ b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-cicd-statistics-module-gitlab
 
+## 0.1.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-cicd-statistics@0.1.19-next.3
+
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-cicd-statistics@0.1.19-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics-module-gitlab/package.json b/plugins/cicd-statistics-module-gitlab/package.json
index c39b8c7ef9..19bdfa8c7c 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.13-next.1",
+  "version": "0.1.13-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cicd-statistics/CHANGELOG.md b/plugins/cicd-statistics/CHANGELOG.md
index 90d36fa01f..9e07812dc5 100644
--- a/plugins/cicd-statistics/CHANGELOG.md
+++ b/plugins/cicd-statistics/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-cicd-statistics
 
+## 0.1.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## 0.1.19-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json
index 0f2503304a..e0cbf7cbd5 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.19-next.1",
+  "version": "0.1.19-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index 4819e06e00..2fe8c4c8af 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-circleci
 
+## 0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.17-next.2
+
+### Patch Changes
+
+- d14ac997c36: Add hover over CircleCI avatar icon to show user name in builds table
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.17-next.1
 
 ### Patch Changes
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index e205aefc21..265cc8c5f4 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.17-next.1",
+  "version": "0.3.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index 6e4be27e90..2d1bb1f196 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-cloudbuild
 
+## 0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.17-next.1
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 8a4bdee93b..6cbc634204 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.17-next.1",
+  "version": "0.3.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/code-climate/CHANGELOG.md b/plugins/code-climate/CHANGELOG.md
index 5ed516f6f5..4c4fc77eb9 100644
--- a/plugins/code-climate/CHANGELOG.md
+++ b/plugins/code-climate/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-code-climate
 
+## 0.1.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.17-next.1
 
 ### Patch Changes
diff --git a/plugins/code-climate/package.json b/plugins/code-climate/package.json
index 2f834916f8..682b56c806 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.17-next.1",
+  "version": "0.1.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/code-coverage-backend/CHANGELOG.md b/plugins/code-coverage-backend/CHANGELOG.md
index 32cf86e76f..1fd9b2dcb0 100644
--- a/plugins/code-coverage-backend/CHANGELOG.md
+++ b/plugins/code-coverage-backend/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-code-coverage-backend
 
+## 0.2.10-next.3
+
+### Patch Changes
+
+- d3645a62b74: Bump `xml2js` from 0.4.23 to 0.5.0
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json
index 1b681e9f51..0cbaab56f9 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.10-next.1",
+  "version": "0.2.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -44,7 +44,7 @@
     "@types/supertest": "^2.0.8",
     "msw": "^1.0.0",
     "supertest": "^6.1.6",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
   },
   "files": [
     "dist",
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index a8a6d7078f..916dfce927 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-code-coverage
 
+## 0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 7b535be4bc..e9b0cb5a83 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.10-next.1",
+  "version": "0.2.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/codescene/CHANGELOG.md b/plugins/codescene/CHANGELOG.md
index eb4fde25e6..62dcbece4b 100644
--- a/plugins/codescene/CHANGELOG.md
+++ b/plugins/codescene/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-codescene
 
+## 0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.12-next.1
 
 ### Patch Changes
diff --git a/plugins/codescene/package.json b/plugins/codescene/package.json
index e07247370c..d4c9da7e63 100644
--- a/plugins/codescene/package.json
+++ b/plugins/codescene/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-codescene",
-  "version": "0.1.12-next.1",
+  "version": "0.1.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 9a9aa1d7a8..c0929a91d3 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-config-schema
 
+## 0.1.40-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.40-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.40-next.1
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 7f1bbca821..e583d91572 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.40-next.1",
+  "version": "0.1.40-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index 67f14ccbb2..b6b05aec4e 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-cost-insights
 
+## 0.12.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.6-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-cost-insights-common@0.1.1
+
 ## 0.12.6-next.1
 
 ### Patch Changes
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 6a552e8bd7..e991e6b44b 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.6-next.1",
+  "version": "0.12.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/dynatrace/CHANGELOG.md b/plugins/dynatrace/CHANGELOG.md
index a83c38bcdd..add3f07204 100644
--- a/plugins/dynatrace/CHANGELOG.md
+++ b/plugins/dynatrace/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-dynatrace
 
+## 4.0.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 3.0.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 3.0.1-next.1
 
 ### Patch Changes
diff --git a/plugins/dynatrace/package.json b/plugins/dynatrace/package.json
index 799194ecb5..8d2b0fcf46 100644
--- a/plugins/dynatrace/package.json
+++ b/plugins/dynatrace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-dynatrace",
-  "version": "3.0.1-next.1",
+  "version": "4.0.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/entity-feedback-backend/CHANGELOG.md b/plugins/entity-feedback-backend/CHANGELOG.md
index 9641fed208..61a6b5b3d3 100644
--- a/plugins/entity-feedback-backend/CHANGELOG.md
+++ b/plugins/entity-feedback-backend/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-entity-feedback-backend
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-feedback-backend/package.json b/plugins/entity-feedback-backend/package.json
index 715df95830..bbeba840a6 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.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/entity-feedback/CHANGELOG.md b/plugins/entity-feedback/CHANGELOG.md
index 029b41995f..5c94e5ad22 100644
--- a/plugins/entity-feedback/CHANGELOG.md
+++ b/plugins/entity-feedback/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-entity-feedback
 
+## 0.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-entity-feedback-common@0.1.1-next.0
+
 ## 0.2.0-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-feedback/package.json b/plugins/entity-feedback/package.json
index c636ecb242..6fb944feac 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.0-next.1",
+  "version": "0.2.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/entity-validation/CHANGELOG.md b/plugins/entity-validation/CHANGELOG.md
index 9cd86f5cd1..c5c17db72c 100644
--- a/plugins/entity-validation/CHANGELOG.md
+++ b/plugins/entity-validation/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-entity-validation
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/entity-validation/package.json b/plugins/entity-validation/package.json
index 7e71945859..376bbe5b5f 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.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index 18a51394bc..1ce598cbad 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index 20b4ad8278..0210e7efb4 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-aws-sqs",
-  "version": "0.1.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index a5e732f786..43f7910658 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/README.md b/plugins/events-backend-module-azure/README.md
index d16315b6e7..214c00e2fd 100644
--- a/plugins/events-backend-module-azure/README.md
+++ b/plugins/events-backend-module-azure/README.md
@@ -34,10 +34,10 @@ yarn add --cwd packages/backend @backstage/plugin-events-backend-module-azure
 Add the event router to the `EventsBackend`:
 
 ```diff
-+const githubEventRouter = new AzureDevOpsEventRouter();
++const azureEventRouter = new AzureDevOpsEventRouter();
 
  EventsBackend
-+  .addPublishers(githubEventRouter)
-+  .addSubscribers(githubEventRouter);
++  .addPublishers(azureEventRouter)
++  .addSubscribers(azureEventRouter);
 // [...]
 ```
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 4694a1909e..fa2236cf55 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index 2fad706971..c35aa7519c 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 2bcf5c6bd6..cac3d4bf57 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index a7e28557f1..b71339f368 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 3bdbc799dc..a70a784676 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index 3122ff7644..c048025dc9 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 4f24cb6b9d..8b0e35ccf3 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index 1ebfe2c2ce..0bfec21ef9 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index aa9fc68f38..2e92c8595b 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.6-next.1",
+  "version": "0.1.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index ffb55a083e..cd78f21d2e 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 0577815b23..ca66ed256f 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.6-next.1",
+  "version": "0.1.6-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 1d1c89d719..26486dcd20 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-events-backend
 
+## 0.2.5-next.3
+
+### Patch Changes
+
+- 3538d9ad2c4: Export `DefaultEventBroker` to allow decoupling of the catalog and events backends in the `example-backend`.
+
+  Please look at `plugins/events-backend/README.md` for the currently advised way to set up the event backend and catalog providers.
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-events-node@0.2.5-next.2
+
 ## 0.2.5-next.1
 
 ### Patch Changes
diff --git a/plugins/events-backend/README.md b/plugins/events-backend/README.md
index cf89f389b2..6f9d5c5a0d 100644
--- a/plugins/events-backend/README.md
+++ b/plugins/events-backend/README.md
@@ -6,7 +6,7 @@ This plugin provides the wiring of all extension points
 for managing events as defined by [plugin-events-node](../events-node)
 including backend plugin `EventsPlugin` and `EventsBackend`.
 
-Additionally, it uses a simple in-memory implementation for
+Additionally, it uses a simple in-process implementation for
 the `EventBroker` by default which you can replace with a more sophisticated
 implementation of your choice as you need (e.g., via module).
 
@@ -24,10 +24,89 @@ to the used event broker.
 yarn add --cwd packages/backend @backstage/plugin-events-backend
 ```
 
-Add a file [`packages/backend/src/plugins/events.ts`](../../packages/backend/src/plugins/events.ts)
-to your Backstage project.
+### Event Broker
 
-There, you can add all publishers, subscribers, etc. you want.
+First you will need to add and implementation of the `EventBroker` interface to the backend plugin environment.
+This will allow event broker instance any backend plugins to publish and subscribe to events in order to communicate
+between them.
+
+Add the following to `makeCreateEnv`
+
+```diff
+// packages/backend/src/index.ts
++   const eventBroker = new DefaultEventBroker(root.child({ type: 'plugin' }));
+```
+
+Then update plugin environment to include the event broker.
+
+```diff
+// packages/backend/src/types.ts
++  eventBroker: EventBroker;
+```
+
+### Publishing and Subscribing to events with the broker
+
+Backend plugins are passed the event broker in the plugin environment at startup of the application. The plugin can
+make use of this to communicate between parts of the application.
+
+Here is an example of a plugin publishing a payload to a topic.
+
+```typescript jsx
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
+  env.eventBroker.publish({
+    topic: 'publish.example',
+    eventPayload: { message: 'Hello, World!' },
+    metadata: {},
+  });
+}
+```
+
+Here is an example of a plugin subscribing to a topic.
+
+```typescript jsx
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
+  env.eventBroker.subscribe([
+    {
+      supportsEventTopics: ['publish.example'],
+      onEvent: async (params: EventParams) => {
+        env.logger.info(`receieved ${params.topic} event`);
+      },
+    },
+  ]);
+}
+```
+
+### Implementing an `EventSubscriber` class
+
+More complex solutions might need the creation of a class that implements the `EventSubscriber` interface. e.g.
+
+```typescript jsx
+import { EventSubscriber } from "./EventSubscriber";
+
+class ExampleSubscriber implements EventSubscriber {
+  ...
+
+  supportsEventTopics() {
+      return ['publish.example']
+  }
+
+  async onEvent(params: EventParams) {
+    env.logger.info(`receieved ${params.topic} event`)
+  }
+}
+```
+
+### Events Backend
+
+The events backend plugin provides a router to handler http events and publish the http requests onto the event
+broker.
+
+To configure it add a file [`packages/backend/src/plugins/events.ts`](../../packages/backend/src/plugins/events.ts)
+to your Backstage project.
 
 Additionally, add the events plugin to your backend.
 
@@ -38,54 +117,11 @@ Additionally, add the events plugin to your backend.
 // [...]
 +  const eventsEnv = useHotMemoize(module, () => createEnv('events'));
 // [...]
-+  apiRouter.use('/events', await events(eventsEnv, []));
++  apiRouter.use('/events', await events(eventsEnv));
 // [...]
 ```
 
-### With Event-based Entity Providers
-
-In case you use event-based `EntityProviders`,
-you may need something like the following:
-
-```diff
-// packages/backend/src/index.ts
--  apiRouter.use('/events', await events(eventsEnv, []));
-+  apiRouter.use('/events', await events(eventsEnv, eventBasedEntityProviders));
-```
-
-as well as a file
-[`packages/backend/src/plugins/catalogEventBasedProviders.ts`](../../packages/backend/src/plugins/catalogEventBasedProviders.ts)
-which contains event-based entity providers.
-
-In case you don't have this dependency added yet:
-
-```bash
-# From your Backstage root directory
-yarn add --cwd packages/backend @backstage/plugin-events-backend
-```
-
-```diff
-// packages/backend/src/plugins/catalog.ts
- import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
-+import { EntityProvider } from '@backstage/plugin-catalog-node';
- import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
- import { Router } from 'express';
- import { PluginEnvironment } from '../types';
-
- export default async function createPlugin(
-   env: PluginEnvironment,
-+  providers?: Array<EntityProvider>,
- ): Promise<Router> {
-   const builder = await CatalogBuilder.create(env);
-   builder.addProcessor(new ScaffolderEntitiesProcessor());
-+  builder.addEntityProvider(providers ?? []);
-   const { processingEngine, router } = await builder.build();
-   await processingEngine.start();
-   return router;
- }
-```
-
-## Configuration
+#### Configuration
 
 In order to create HTTP endpoints to receive events for a certain
 topic, you need to add them at your configuration:
@@ -115,6 +151,34 @@ in combination with suitable event subscribers.
 
 However, it is not limited to these use cases.
 
+### Event-based Entity Providers
+
+You can implement the `EventSubscriber` interface on an `EntityProviders` to allow it to handle events from other plugins e.g. the event backend plugin
+mentioned above.
+
+Assuming you have configured the `eventBroker` into the `PluginEnvironment` you can pass the broker to the entity provider for it to subscribe.
+
+```diff
+// packages/backend/src/plugins/catalog.ts
+ import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
++import { DemoEventBasedEntityProvider } from './DemoEventBasedEntityProvider';
+ import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
+ import { Router } from 'express';
+ import { PluginEnvironment } from '../types';
+
+ export default async function createPlugin(
+   env: PluginEnvironment,
+ ): Promise<Router> {
+   const builder = await CatalogBuilder.create(env);
+   builder.addProcessor(new ScaffolderEntitiesProcessor());
++  const demoProvider = new DemoEventBasedEntityProvider({ logger: env.logger, topics: ['example'], eventBroker: env.eventBroker });
++  builder.addEntityProvider(demoProvider);
+   const { processingEngine, router } = await builder.build();
+   await processingEngine.start();
+   return router;
+ }
+```
+
 ## Use Cases
 
 ### Custom Event Broker
diff --git a/plugins/events-backend/api-report.md b/plugins/events-backend/api-report.md
index 7d8ede1979..aeb6f9363d 100644
--- a/plugins/events-backend/api-report.md
+++ b/plugins/events-backend/api-report.md
@@ -5,12 +5,24 @@
 ```ts
 import { Config } from '@backstage/config';
 import { EventBroker } from '@backstage/plugin-events-node';
+import { EventParams } from '@backstage/plugin-events-node';
 import { EventPublisher } from '@backstage/plugin-events-node';
 import { EventSubscriber } from '@backstage/plugin-events-node';
 import express from 'express';
 import { HttpPostIngressOptions } from '@backstage/plugin-events-node';
 import { Logger } from 'winston';
 
+// @public
+export class DefaultEventBroker implements EventBroker {
+  constructor(logger: Logger);
+  // (undocumented)
+  publish(params: EventParams): Promise<void>;
+  // (undocumented)
+  subscribe(
+    ...subscribers: Array<EventSubscriber | Array<EventSubscriber>>
+  ): void;
+}
+
 // @public
 export class EventsBackend {
   constructor(logger: Logger);
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index 4598e8fb20..4d37dba1b8 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.5-next.1",
+  "version": "0.2.5-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend/src/index.ts b/plugins/events-backend/src/index.ts
index 4645e9a479..be173b677c 100644
--- a/plugins/events-backend/src/index.ts
+++ b/plugins/events-backend/src/index.ts
@@ -22,3 +22,4 @@
 
 export { EventsBackend } from './service/EventsBackend';
 export { HttpPostIngressEventPublisher } from './service/http';
+export { DefaultEventBroker } from './service/DefaultEventBroker';
diff --git a/plugins/events-backend/src/service/InMemoryEventBroker.test.ts b/plugins/events-backend/src/service/DefaultEventBroker.test.ts
similarity index 94%
rename from plugins/events-backend/src/service/InMemoryEventBroker.test.ts
rename to plugins/events-backend/src/service/DefaultEventBroker.test.ts
index 861cdda940..99e5f6f72d 100644
--- a/plugins/events-backend/src/service/InMemoryEventBroker.test.ts
+++ b/plugins/events-backend/src/service/DefaultEventBroker.test.ts
@@ -17,15 +17,15 @@
 import { getVoidLogger } from '@backstage/backend-common';
 import { TestEventSubscriber } from '@backstage/plugin-events-backend-test-utils';
 import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
-import { InMemoryEventBroker } from './InMemoryEventBroker';
+import { DefaultEventBroker } from './DefaultEventBroker';
 
 const logger = getVoidLogger();
 
-describe('InMemoryEventBroker', () => {
+describe('DefaultEventBroker', () => {
   it('passes events to interested subscribers', () => {
     const subscriber1 = new TestEventSubscriber('test1', ['topicA', 'topicB']);
     const subscriber2 = new TestEventSubscriber('test2', ['topicB', 'topicC']);
-    const eventBroker = new InMemoryEventBroker(logger);
+    const eventBroker = new DefaultEventBroker(logger);
 
     eventBroker.subscribe(subscriber1);
     eventBroker.subscribe(subscriber2);
@@ -86,7 +86,7 @@ describe('InMemoryEventBroker', () => {
     })();
 
     const errorSpy = jest.spyOn(logger, 'error');
-    const eventBroker = new InMemoryEventBroker(logger);
+    const eventBroker = new DefaultEventBroker(logger);
 
     eventBroker.subscribe(subscriber1);
     await eventBroker.publish({ topic, eventPayload: '1' });
diff --git a/plugins/events-backend/src/service/InMemoryEventBroker.ts b/plugins/events-backend/src/service/DefaultEventBroker.ts
similarity index 92%
rename from plugins/events-backend/src/service/InMemoryEventBroker.ts
rename to plugins/events-backend/src/service/DefaultEventBroker.ts
index 04be01f658..c3824b3e7d 100644
--- a/plugins/events-backend/src/service/InMemoryEventBroker.ts
+++ b/plugins/events-backend/src/service/DefaultEventBroker.ts
@@ -22,12 +22,14 @@ import {
 import { Logger } from 'winston';
 
 /**
- * In-memory event broker which will pass the event to all registered subscribers
+ * In process event broker which will pass the event to all registered subscribers
  * interested in it.
  * Events will not be persisted in any form.
+ *
+ * @public
  */
 // TODO(pjungermann): add prom metrics? (see plugins/catalog-backend/src/util/metrics.ts, etc.)
-export class InMemoryEventBroker implements EventBroker {
+export class DefaultEventBroker implements EventBroker {
   constructor(private readonly logger: Logger) {}
 
   private readonly subscribers: {
diff --git a/plugins/events-backend/src/service/EventsBackend.ts b/plugins/events-backend/src/service/EventsBackend.ts
index 77b1b538f7..4415b8703a 100644
--- a/plugins/events-backend/src/service/EventsBackend.ts
+++ b/plugins/events-backend/src/service/EventsBackend.ts
@@ -20,7 +20,7 @@ import {
   EventSubscriber,
 } from '@backstage/plugin-events-node';
 import { Logger } from 'winston';
-import { InMemoryEventBroker } from './InMemoryEventBroker';
+import { DefaultEventBroker } from './DefaultEventBroker';
 
 /**
  * A builder that helps wire up all component parts of the event management.
@@ -33,7 +33,7 @@ export class EventsBackend {
   private subscribers: EventSubscriber[] = [];
 
   constructor(logger: Logger) {
-    this.eventBroker = new InMemoryEventBroker(logger);
+    this.eventBroker = new DefaultEventBroker(logger);
   }
 
   setEventBroker(eventBroker: EventBroker): EventsBackend {
diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts
index 1ae038a2ac..07f2b11731 100644
--- a/plugins/events-backend/src/service/EventsPlugin.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.ts
@@ -29,7 +29,7 @@ import {
   EventSubscriber,
   HttpPostIngressOptions,
 } from '@backstage/plugin-events-node';
-import { InMemoryEventBroker } from './InMemoryEventBroker';
+import { DefaultEventBroker } from './DefaultEventBroker';
 import Router from 'express-promise-router';
 import { HttpPostIngressEventPublisher } from './http';
 
@@ -113,7 +113,7 @@ export const eventsPlugin = createBackendPlugin({
         router.use(eventsRouter);
 
         const eventBroker =
-          extensionPoint.eventBroker ?? new InMemoryEventBroker(winstonLogger);
+          extensionPoint.eventBroker ?? new DefaultEventBroker(winstonLogger);
 
         eventBroker.subscribe(extensionPoint.subscribers);
         [extensionPoint.publishers, http]
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index 9978a84a0b..10ecc60b56 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-events-node
 
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+
 ## 0.2.5-next.1
 
 ### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 616176a46f..8cb4089ecc 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.5-next.1",
+  "version": "0.2.5-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 a1bb518822..49db6f68dc 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 1.0.12-next.1
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 69e757eed0..bd8c08ca9e 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.12-next.1",
+  "version": "1.0.12-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index 96b4f4f5a5..f4fd5c9799 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @internal/plugin-todo-list
 
+## 1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 1.0.12-next.1
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index 1ee4c55707..6a9e30a625 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.12-next.1",
+  "version": "1.0.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore-backend/CHANGELOG.md b/plugins/explore-backend/CHANGELOG.md
index bf0de480b3..da59730432 100644
--- a/plugins/explore-backend/CHANGELOG.md
+++ b/plugins/explore-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-explore-backend
 
+## 0.0.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-module-explore@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.0.6-next.1
 
 ### Patch Changes
diff --git a/plugins/explore-backend/package.json b/plugins/explore-backend/package.json
index e425c1d46f..9f28f024cd 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.6-next.1",
+  "version": "0.0.6-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore-react/CHANGELOG.md b/plugins/explore-react/CHANGELOG.md
index 0880725375..8ffc709466 100644
--- a/plugins/explore-react/CHANGELOG.md
+++ b/plugins/explore-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-explore-react
 
+## 0.0.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
 ## 0.0.28-next.0
 
 ### Patch Changes
diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json
index 96f7b8d0c5..0808950a00 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.28-next.0",
+  "version": "0.0.28-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 860a42752d..4edad8921d 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/plugin-explore
 
+## 0.4.2-next.3
+
+### Patch Changes
+
+- f9ea944422e: Extracted generic `CatalogKindExploreContent` component so that it is easy to show any component kinds in their own tab in the explore page.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.28-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.28-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/plugins/explore/README.md b/plugins/explore/README.md
index 0bb7258ae6..a1cb273aab 100644
--- a/plugins/explore/README.md
+++ b/plugins/explore/README.md
@@ -2,7 +2,7 @@
 
 Welcome to the explore plugin!
 
-This plugin helps to visualize the domains and tools in your ecosystem.
+This plugin helps to visualize the top level entities like domains, groups and tools in your ecosystem.
 
 ## Setup
 
@@ -117,7 +117,10 @@ export const ExplorePage = () => {
       subtitle="Browse our ecosystem"
     >
       <ExploreLayout.Route path="domains" title="Domains">
-        <DomainExplorerContent />
+        <CatalogKindExploreContent kind="domain" />
+      </ExploreLayout.Route>
+      <ExploreLayout.Route path="systems" title="Systems">
+        <CatalogKindExploreContent kind="system" />
       </ExploreLayout.Route>
       <ExploreLayout.Route path="inner-source" title="InnerSource">
         <AcmeInnserSourceExplorerContent />
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index db89db6503..70ad479841 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -32,6 +32,12 @@ export const catalogEntityRouteRef: ExternalRouteRef<
   true
 >;
 
+// @public (undocumented)
+export const CatalogKindExploreContent: (props: {
+  title?: string;
+  kind: string;
+}) => JSX.Element;
+
 // @public (undocumented)
 export const DomainCard: (props: { entity: DomainEntity }) => JSX.Element;
 
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index ecc2e6a26a..0f0635d1eb 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.2-next.1",
+  "version": "0.4.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -47,6 +47,7 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@types/react": "^16.13.1 || ^17.0.0",
     "classnames": "^2.2.6",
+    "pluralize": "^8.0.0",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
diff --git a/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.test.tsx b/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.test.tsx
new file mode 100644
index 0000000000..4f4f0f034c
--- /dev/null
+++ b/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.test.tsx
@@ -0,0 +1,136 @@
+/*
+ * 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 { DomainEntity } from '@backstage/catalog-model';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { waitFor } from '@testing-library/react';
+import React from 'react';
+import { CatalogKindExploreContent } from './CatalogKindExploreContent';
+
+describe('<CatalogKindExploreContent />', () => {
+  const catalogApi = {
+    addLocation: jest.fn(),
+    getEntities: jest.fn(),
+    getLocationByRef: jest.fn(),
+    getLocationById: jest.fn(),
+    removeLocationById: jest.fn(),
+    removeEntityByUid: jest.fn(),
+    getEntityByRef: jest.fn(),
+    refreshEntity: jest.fn(),
+    getEntityAncestors: jest.fn(),
+    getEntityFacets: jest.fn(),
+    validateEntity: jest.fn(),
+  };
+
+  const Wrapper = ({ children }: { children?: React.ReactNode }) => (
+    <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+      {children}
+    </TestApiProvider>
+  );
+
+  const mountedRoutes = {
+    mountedRoutes: {
+      '/catalog/:namespace/:kind/:name': entityRouteRef,
+    },
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('renders a grid of domains', async () => {
+    const entities: DomainEntity[] = [
+      {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Domain',
+        metadata: {
+          name: 'playback',
+        },
+        spec: {
+          owner: 'guest',
+        },
+      },
+      {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Domain',
+        metadata: {
+          name: 'artists',
+        },
+        spec: {
+          owner: 'guest',
+        },
+      },
+    ];
+    catalogApi.getEntities.mockResolvedValue({ items: entities });
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <CatalogKindExploreContent kind="domain" />
+      </Wrapper>,
+      mountedRoutes,
+    );
+
+    await waitFor(() => {
+      expect(getByText('artists')).toBeInTheDocument();
+      expect(getByText('playback')).toBeInTheDocument();
+    });
+  });
+
+  it('renders a custom title', async () => {
+    catalogApi.getEntities.mockResolvedValue({ items: [] });
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <CatalogKindExploreContent kind="domain" title="Our Areas" />
+      </Wrapper>,
+      mountedRoutes,
+    );
+
+    await waitFor(() => expect(getByText('Our Areas')).toBeInTheDocument());
+  });
+
+  it('renders empty state', async () => {
+    catalogApi.getEntities.mockResolvedValue({ items: [] });
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <CatalogKindExploreContent kind="domain" />
+      </Wrapper>,
+      mountedRoutes,
+    );
+
+    await waitFor(() =>
+      expect(getByText('No domains to display')).toBeInTheDocument(),
+    );
+  });
+
+  it('renders a friendly error if it cannot collect domains', async () => {
+    const catalogError = new Error('Network timeout');
+    catalogApi.getEntities.mockRejectedValueOnce(catalogError);
+
+    const { getByText } = await renderInTestApp(
+      <Wrapper>
+        <CatalogKindExploreContent kind="domain" />
+      </Wrapper>,
+      mountedRoutes,
+    );
+
+    await waitFor(() =>
+      expect(getByText(/Could not load domains/)).toBeInTheDocument(),
+    );
+  });
+});
diff --git a/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.tsx b/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.tsx
new file mode 100644
index 0000000000..f6f76ce1e0
--- /dev/null
+++ b/plugins/explore/src/components/CatalogKindExploreContent/CatalogKindExploreContent.tsx
@@ -0,0 +1,108 @@
+/*
+ * 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 { Entity } from '@backstage/catalog-model';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { Button } from '@material-ui/core';
+import React from 'react';
+import useAsync from 'react-use/lib/useAsync';
+import { EntityCard } from '../EntityCard';
+import {
+  Content,
+  ContentHeader,
+  EmptyState,
+  ItemCardGrid,
+  Progress,
+  SupportButton,
+  WarningPanel,
+} from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+import pluralize from 'pluralize';
+
+const Body = (props: { kind: string }) => {
+  const { kind } = props;
+  const kindPlural = pluralize(kind);
+  const catalogApi = useApi(catalogApiRef);
+  const {
+    value: entities,
+    loading,
+    error,
+  } = useAsync(async () => {
+    const response = await catalogApi.getEntities({
+      filter: { kind },
+    });
+    return response.items as Entity[];
+  }, [kind]);
+
+  if (loading) {
+    return <Progress />;
+  }
+
+  if (error) {
+    return (
+      <WarningPanel severity="error" title={`Could not load ${kindPlural}.`}>
+        {error.message}
+      </WarningPanel>
+    );
+  }
+
+  if (!entities?.length) {
+    return (
+      <EmptyState
+        missing="info"
+        title={`No ${kindPlural} to display`}
+        description={`You haven't added any ${kindPlural} yet.`}
+        action={
+          <Button
+            variant="contained"
+            color="primary"
+            href={`https://backstage.io/docs/features/software-catalog/descriptor-format#kind-${kind}`}
+          >
+            Read more
+          </Button>
+        }
+      />
+    );
+  }
+
+  return (
+    <ItemCardGrid>
+      {entities.map((entity, index) => (
+        <EntityCard key={index} entity={entity} />
+      ))}
+    </ItemCardGrid>
+  );
+};
+
+/** @public */
+export const CatalogKindExploreContent = (props: {
+  title?: string;
+  kind: string;
+}) => {
+  const { kind, title } = props;
+  const kindLowercase = kind.toLocaleLowerCase();
+  const kindCapitalized = `${kind[0].toLocaleUpperCase()}${kind.substring(1)}`;
+  return (
+    <Content noPadding>
+      <ContentHeader title={title || `${pluralize(kindCapitalized)}`}>
+        <SupportButton>
+          Discover the {pluralize(kindLowercase)} in your ecosystem.
+        </SupportButton>
+      </ContentHeader>
+      <Body kind={kindLowercase} />
+    </Content>
+  );
+};
diff --git a/plugins/explore/src/components/CatalogKindExploreContent/index.ts b/plugins/explore/src/components/CatalogKindExploreContent/index.ts
new file mode 100644
index 0000000000..af4cafae62
--- /dev/null
+++ b/plugins/explore/src/components/CatalogKindExploreContent/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { CatalogKindExploreContent } from './CatalogKindExploreContent';
diff --git a/plugins/explore/src/components/DefaultExplorePage/DefaultExplorePage.tsx b/plugins/explore/src/components/DefaultExplorePage/DefaultExplorePage.tsx
index 54beb59619..098f73be2e 100644
--- a/plugins/explore/src/components/DefaultExplorePage/DefaultExplorePage.tsx
+++ b/plugins/explore/src/components/DefaultExplorePage/DefaultExplorePage.tsx
@@ -15,11 +15,11 @@
  */
 
 import React from 'react';
-import { DomainExplorerContent } from '../DomainExplorerContent';
 import { ExploreLayout } from '../ExploreLayout';
 import { GroupsExplorerContent } from '../GroupsExplorerContent';
 import { ToolExplorerContent } from '../ToolExplorerContent';
 import { configApiRef, useApi } from '@backstage/core-plugin-api';
+import { CatalogKindExploreContent } from '../CatalogKindExploreContent';
 
 export const DefaultExplorePage = () => {
   const configApi = useApi(configApiRef);
@@ -32,7 +32,7 @@ export const DefaultExplorePage = () => {
       subtitle="Discover solutions available in your ecosystem"
     >
       <ExploreLayout.Route path="domains" title="Domains">
-        <DomainExplorerContent />
+        <CatalogKindExploreContent kind="domain" />
       </ExploreLayout.Route>
       <ExploreLayout.Route path="groups" title="Groups">
         <GroupsExplorerContent />
diff --git a/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx b/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
index 3cfed5b12b..15c0d650cc 100644
--- a/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
+++ b/plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.tsx
@@ -19,7 +19,6 @@ import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Button } from '@material-ui/core';
 import React from 'react';
 import useAsync from 'react-use/lib/useAsync';
-import { DomainCard } from '../DomainCard';
 import {
   Content,
   ContentHeader,
@@ -30,6 +29,7 @@ import {
   WarningPanel,
 } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
+import { EntityCard } from '../EntityCard';
 
 const Body = () => {
   const catalogApi = useApi(catalogApiRef);
@@ -78,7 +78,7 @@ const Body = () => {
   return (
     <ItemCardGrid>
       {entities.map((entity, index) => (
-        <DomainCard key={index} entity={entity} />
+        <EntityCard key={index} entity={entity} />
       ))}
     </ItemCardGrid>
   );
diff --git a/plugins/explore/src/components/EntityCard/EntityCard.test.tsx b/plugins/explore/src/components/EntityCard/EntityCard.test.tsx
new file mode 100644
index 0000000000..4b006e347f
--- /dev/null
+++ b/plugins/explore/src/components/EntityCard/EntityCard.test.tsx
@@ -0,0 +1,54 @@
+/*
+ * 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 { Entity } from '@backstage/catalog-model';
+import { entityRouteRef } from '@backstage/plugin-catalog-react';
+import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
+import { EntityCard } from './EntityCard';
+
+describe('<EntityCard />', () => {
+  it('renders an entity card', async () => {
+    const entity: Entity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Domain',
+      metadata: {
+        name: 'artists',
+        description: 'Everything about artists',
+        tags: ['a-tag'],
+      },
+      spec: {
+        owner: 'guest',
+      },
+    };
+    const { getByText } = await renderInTestApp(
+      <EntityCard entity={entity} />,
+      {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      },
+    );
+
+    expect(getByText('artists')).toBeInTheDocument();
+    expect(getByText('Everything about artists')).toBeInTheDocument();
+    expect(getByText('a-tag')).toBeInTheDocument();
+    expect(getByText('Explore').parentElement).toHaveAttribute(
+      'href',
+      '/catalog/default/domain/artists',
+    );
+  });
+});
diff --git a/plugins/explore/src/components/EntityCard/EntityCard.tsx b/plugins/explore/src/components/EntityCard/EntityCard.tsx
new file mode 100644
index 0000000000..0a5908df38
--- /dev/null
+++ b/plugins/explore/src/components/EntityCard/EntityCard.tsx
@@ -0,0 +1,75 @@
+/*
+ * 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 { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  EntityRefLinks,
+  entityRouteParams,
+  getEntityRelations,
+  entityRouteRef,
+} from '@backstage/plugin-catalog-react';
+import {
+  Box,
+  Card,
+  CardActions,
+  CardContent,
+  CardMedia,
+  Chip,
+} from '@material-ui/core';
+import React from 'react';
+
+import { LinkButton, ItemCardHeader } from '@backstage/core-components';
+import { useRouteRef } from '@backstage/core-plugin-api';
+
+/** @public */
+export const EntityCard = (props: { entity: Entity }) => {
+  const { entity } = props;
+
+  const catalogEntityRoute = useRouteRef(entityRouteRef);
+  const ownedByRelations = getEntityRelations(entity, RELATION_OWNED_BY);
+  const url = catalogEntityRoute(entityRouteParams(entity));
+
+  const owner = (
+    <EntityRefLinks
+      entityRefs={ownedByRelations}
+      defaultKind="group"
+      color="inherit"
+    />
+  );
+
+  return (
+    <Card>
+      <CardMedia>
+        <ItemCardHeader title={entity.metadata.name} subtitle={owner} />
+      </CardMedia>
+      <CardContent>
+        {entity.metadata.tags?.length ? (
+          <Box>
+            {entity.metadata.tags.map(tag => (
+              <Chip size="small" label={tag} key={tag} />
+            ))}
+          </Box>
+        ) : null}
+        {entity.metadata.description}
+      </CardContent>
+      <CardActions>
+        <LinkButton to={url} color="primary">
+          Explore
+        </LinkButton>
+      </CardActions>
+    </Card>
+  );
+};
diff --git a/plugins/explore/src/components/EntityCard/index.ts b/plugins/explore/src/components/EntityCard/index.ts
new file mode 100644
index 0000000000..be80fb3f8f
--- /dev/null
+++ b/plugins/explore/src/components/EntityCard/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { EntityCard } from './EntityCard';
diff --git a/plugins/explore/src/components/index.ts b/plugins/explore/src/components/index.ts
index f8fba16910..b3aa82bc79 100644
--- a/plugins/explore/src/components/index.ts
+++ b/plugins/explore/src/components/index.ts
@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 
-export * from './DomainCard';
+export * from './CatalogKindExploreContent';
 export * from './ExploreLayout';
+export * from './DomainCard';
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
index 3ef1962aa5..19bbe2e95d 100644
--- a/plugins/firehydrant/CHANGELOG.md
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-firehydrant
 
+## 0.2.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 8f101e1714..55256798d1 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.1-next.1",
+  "version": "0.2.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index bef45dc38d..27d9063bd0 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-fossa
 
+## 0.2.49-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.49-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.49-next.1
 
 ### Patch Changes
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 2a73c2b5fe..9bb88987e7 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.49-next.1",
+  "version": "0.2.49-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gcalendar/CHANGELOG.md b/plugins/gcalendar/CHANGELOG.md
index a5f62ebb36..462a1fb875 100644
--- a/plugins/gcalendar/CHANGELOG.md
+++ b/plugins/gcalendar/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-gcalendar
 
+## 0.3.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.13-next.1
 
 ### Patch Changes
diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json
index 05068811f4..04b9908a60 100644
--- a/plugins/gcalendar/package.json
+++ b/plugins/gcalendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcalendar",
-  "version": "0.3.13-next.1",
+  "version": "0.3.13-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index da05668e49..9440fda217 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.36-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.36-next.1
 
 ### Patch Changes
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 664223f889..1aa6138443 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.36-next.1",
+  "version": "0.3.36-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index f40a99c48b..5fe34c2436 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-git-release-manager
 
+## 0.3.30-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.30-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.30-next.1
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index 7f3da60f83..765006831a 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.30-next.1",
+  "version": "0.3.30-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 69bf5c3bf8..46316f30c0 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-github-actions
 
+## 0.5.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## 0.5.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.5.17-next.1
 
 ### Patch Changes
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 5b5138ff8f..1e2520cfd6 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-github-actions",
   "description": "A Backstage plugin that integrates towards GitHub Actions",
-  "version": "0.5.17-next.1",
+  "version": "0.5.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index 52a77bb304..cc613afc5e 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.48-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.48-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.48-next.1
 
 ### Patch Changes
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index fc1f7ef0e1..3eb27b61f3 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.48-next.1",
+  "version": "0.1.48-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-issues/CHANGELOG.md b/plugins/github-issues/CHANGELOG.md
index 393b8c25ab..4df2aa1a3f 100644
--- a/plugins/github-issues/CHANGELOG.md
+++ b/plugins/github-issues/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-github-issues
 
+## 0.2.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.6-next.1
 
 ### Patch Changes
diff --git a/plugins/github-issues/package.json b/plugins/github-issues/package.json
index fba982ee8a..f610225c73 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.6-next.1",
+  "version": "0.2.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-pull-requests-board/CHANGELOG.md b/plugins/github-pull-requests-board/CHANGELOG.md
index 2b663022e7..cb251e1e25 100644
--- a/plugins/github-pull-requests-board/CHANGELOG.md
+++ b/plugins/github-pull-requests-board/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-github-pull-requests-board
 
+## 0.1.11-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.11-next.1
 
 ### Patch Changes
diff --git a/plugins/github-pull-requests-board/package.json b/plugins/github-pull-requests-board/package.json
index 33a64284dd..e5b1be7894 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.11-next.1",
+  "version": "0.1.11-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index 2073bfce85..8ae8345004 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.35-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.35-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.35-next.1
 
 ### Patch Changes
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index b2ae200d75..2a7d03e923 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.35-next.1",
+  "version": "0.3.35-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gocd/CHANGELOG.md b/plugins/gocd/CHANGELOG.md
index ddff5b627b..6fe25887fd 100644
--- a/plugins/gocd/CHANGELOG.md
+++ b/plugins/gocd/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-gocd
 
+## 0.1.23-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.23-next.1
 
 ### Patch Changes
diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json
index 006d364697..71efc88be1 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.23-next.1",
+  "version": "0.1.23-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index e487e394d5..60e33187ed 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-graphiql
 
+## 0.2.49-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.49-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.49-next.1
 
 ### Patch Changes
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index c90afdb3ca..8bc495b553 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.49-next.1",
+  "version": "0.2.49-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/graphql-backend/CHANGELOG.md b/plugins/graphql-backend/CHANGELOG.md
index 9d0491b79a..7d37f28ec7 100644
--- a/plugins/graphql-backend/CHANGELOG.md
+++ b/plugins/graphql-backend/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-graphql-backend
 
+## 0.1.34-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-graphql@0.3.20-next.2
+
+## 0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-graphql@0.3.20-next.1
+
 ## 0.1.34-next.1
 
 ### Patch Changes
diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json
index ccf0799f6a..0a29db7992 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.34-next.1",
+  "version": "0.1.34-next.3",
   "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 c8aef4d31f..67954dbb13 100644
--- a/plugins/graphql-voyager/CHANGELOG.md
+++ b/plugins/graphql-voyager/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-graphql-voyager
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/graphql-voyager/package.json b/plugins/graphql-voyager/package.json
index 6524dbb3ec..afac9340ed 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.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 425cf97609..28b84ab179 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-home
 
+## 0.4.33-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.4.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.4.33-next.1
 
 ### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 1daaccb28e..03330baab5 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-home",
   "description": "A Backstage plugin that helps you build a home page",
-  "version": "0.4.33-next.1",
+  "version": "0.4.33-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index 77d12474ea..6bbc21baa3 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-ilert
 
+## 0.2.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.6-next.1
 
 ### Patch Changes
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 486410fbf0..6b9bb928fa 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.6-next.1",
+  "version": "0.2.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins-backend/CHANGELOG.md b/plugins/jenkins-backend/CHANGELOG.md
index 7d34f4d73b..ca78a50aae 100644
--- a/plugins/jenkins-backend/CHANGELOG.md
+++ b/plugins/jenkins-backend/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-jenkins-backend
 
+## 0.1.34-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-jenkins-common@0.1.15-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
+## 0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-jenkins-common@0.1.15-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.1.34-next.1
 
 ### Patch Changes
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
index 4063634193..ec0c69ab71 100644
--- a/plugins/jenkins-backend/package.json
+++ b/plugins/jenkins-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-jenkins-backend",
   "description": "A Backstage backend plugin that integrates towards Jenkins",
-  "version": "0.1.34-next.1",
+  "version": "0.1.34-next.3",
   "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 c8703352b8..2c3d2f03cb 100644
--- a/plugins/jenkins-common/CHANGELOG.md
+++ b/plugins/jenkins-common/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-jenkins-common
 
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.1.15-next.0
 
 ### Patch Changes
diff --git a/plugins/jenkins-common/package.json b/plugins/jenkins-common/package.json
index 07e1f1958d..6fe6d9b9ab 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.15-next.0",
+  "version": "0.1.15-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index a7a2176e5a..7047b2672d 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-jenkins
 
+## 0.7.16-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-jenkins-common@0.1.15-next.1
+
+## 0.7.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-jenkins-common@0.1.15-next.0
+
 ## 0.7.16-next.1
 
 ### Patch Changes
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 9721f471b5..6f93a38a88 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-jenkins",
   "description": "A Backstage plugin that integrates towards Jenkins",
-  "version": "0.7.16-next.1",
+  "version": "0.7.16-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kafka-backend/CHANGELOG.md b/plugins/kafka-backend/CHANGELOG.md
index d4ec7156e7..d7e33c8e91 100644
--- a/plugins/kafka-backend/CHANGELOG.md
+++ b/plugins/kafka-backend/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-kafka-backend
 
+## 0.2.37-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
+## 0.2.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.2.37-next.1
 
 ### Patch Changes
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index 99f5e5c06a..4542d5110b 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.37-next.1",
+  "version": "0.2.37-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index 5d9b8cbe1b..ad89541b9e 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-kafka
 
+## 0.3.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.17-next.1
 
 ### Patch Changes
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index a7607be706..779f0151f9 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.17-next.1",
+  "version": "0.3.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index cd3900ec36..7e7e42afca 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.10.0-next.3
+
+### Patch Changes
+
+- 56a28b559e5: Updated kubernetes config schema to match available options
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+
+## 0.10.0-next.2
+
+### Minor Changes
+
+- e6c7c850129: Plugins that instantiate the `KubernetesProxy` must now provide a parameter of the type `KubernetesProxyOptions` which includes providing a `KubernetesAuthTranslator`. The `KubernetesBuilder` now builds its own `KubernetesAuthTranslatorMap` that it provides to the `KubernetesProxy`. The `DispatchingKubernetesAuthTranslator` expects a `KubernetesTranslatorMap` to be provided as a parameter. The `KubernetesBuilder` now has a method called `setAuthTranslatorMap` which allows integrators to bring their own `KubernetesAuthTranslator's` to the `KubernetesPlugin`.
+
+### Patch Changes
+
+- 76e8f08fa24: fix localKubectlProxy auth provider fetching
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.10.0-next.1
 
 ### Minor Changes
diff --git a/plugins/kubernetes-backend/api-report.md b/plugins/kubernetes-backend/api-report.md
index 449131a26e..bc51d504de 100644
--- a/plugins/kubernetes-backend/api-report.md
+++ b/plugins/kubernetes-backend/api-report.md
@@ -110,6 +110,25 @@ export interface CustomResourcesByEntity extends KubernetesObjectsByEntity {
 // @public (undocumented)
 export const DEFAULT_OBJECTS: ObjectToFetch[];
 
+// @public
+export class DispatchingKubernetesAuthTranslator
+  implements KubernetesAuthTranslator
+{
+  constructor(options: DispatchingKubernetesAuthTranslatorOptions);
+  // (undocumented)
+  decorateClusterDetailsWithAuth(
+    clusterDetails: ClusterDetails,
+    auth: KubernetesRequestAuth,
+  ): Promise<ClusterDetails>;
+}
+
+// @public (undocumented)
+export type DispatchingKubernetesAuthTranslatorOptions = {
+  authTranslatorMap: {
+    [key: string]: KubernetesAuthTranslator;
+  };
+};
+
 // @public (undocumented)
 export interface FetchResponseWrapper {
   // (undocumented)
@@ -157,23 +176,16 @@ export interface KubernetesAuthTranslator {
   ): Promise<ClusterDetails>;
 }
 
-// @public (undocumented)
-export class KubernetesAuthTranslatorGenerator {
-  // (undocumented)
-  static getKubernetesAuthTranslatorInstance(
-    authProvider: string,
-    options: {
-      logger: Logger;
-    },
-  ): KubernetesAuthTranslator;
-}
-
 // @public (undocumented)
 export class KubernetesBuilder {
   constructor(env: KubernetesEnvironment);
   // (undocumented)
   build(): KubernetesBuilderReturn;
   // (undocumented)
+  protected buildAuthTranslatorMap(): {
+    [key: string]: KubernetesAuthTranslator;
+  };
+  // (undocumented)
   protected buildClusterSupplier(
     refreshInterval: Duration,
   ): KubernetesClustersSupplier;
@@ -220,6 +232,10 @@ export class KubernetesBuilder {
     clusterSupplier: KubernetesClustersSupplier,
   ): Promise<ClusterDetails[]>;
   // (undocumented)
+  protected getAuthTranslatorMap(): {
+    [key: string]: KubernetesAuthTranslator;
+  };
+  // (undocumented)
   protected getClusterSupplier(): KubernetesClustersSupplier;
   // (undocumented)
   protected getFetcher(): KubernetesFetcher;
@@ -239,6 +255,10 @@ export class KubernetesBuilder {
   // (undocumented)
   protected getServiceLocatorMethod(): ServiceLocatorMethod;
   // (undocumented)
+  setAuthTranslatorMap(authTranslatorMap: {
+    [key: string]: KubernetesAuthTranslator;
+  }): void;
+  // (undocumented)
   setClusterSupplier(clusterSupplier?: KubernetesClustersSupplier): this;
   // (undocumented)
   setDefaultClusterRefreshInterval(refreshInterval: Duration): this;
@@ -261,6 +281,9 @@ export type KubernetesBuilderReturn = Promise<{
   proxy: KubernetesProxy;
   objectsProvider: KubernetesObjectsProvider;
   serviceLocator: KubernetesServiceLocator;
+  authTranslatorMap: {
+    [key: string]: KubernetesAuthTranslator;
+  };
 }>;
 
 // @public
@@ -345,7 +368,7 @@ export type KubernetesObjectTypes =
 
 // @public
 export class KubernetesProxy {
-  constructor(logger: Logger, clusterSupplier: KubernetesClustersSupplier);
+  constructor(options: KubernetesProxyOptions);
   // (undocumented)
   createRequestHandler(
     options: KubernetesProxyCreateRequestHandlerOptions,
@@ -357,6 +380,13 @@ export type KubernetesProxyCreateRequestHandlerOptions = {
   permissionApi: PermissionEvaluator;
 };
 
+// @public
+export type KubernetesProxyOptions = {
+  logger: Logger;
+  clusterSupplier: KubernetesClustersSupplier;
+  authTranslator: KubernetesAuthTranslator;
+};
+
 // @public
 export interface KubernetesServiceLocator {
   // (undocumented)
diff --git a/plugins/kubernetes-backend/config.d.ts b/plugins/kubernetes-backend/config.d.ts
index d3f197c21e..e9b5878920 100644
--- a/plugins/kubernetes-backend/config.d.ts
+++ b/plugins/kubernetes-backend/config.d.ts
@@ -21,11 +21,15 @@ export interface Config {
       | 'services'
       | 'configmaps'
       | 'deployments'
+      | 'limitranges'
       | 'replicasets'
       | 'horizontalpodautoscalers'
       | 'jobs'
       | 'cronjobs'
       | 'ingresses'
+      | 'customresources'
+      | 'statefulsets'
+      | 'daemonsets'
     >;
     serviceLocatorMethod: {
       type: 'multiTenant';
@@ -99,11 +103,15 @@ export interface Config {
       services?: string;
       configmaps?: string;
       deployments?: string;
+      limitranges?: string;
       replicasets?: string;
       horizontalpodautoscalers?: string;
-      cronjobs?: string;
       jobs?: string;
+      cronjobs?: string;
       ingresses?: string;
+      customresources?: string;
+      statefulsets?: string;
+      daemonsets?: string;
     } & { [pluralKind: string]: string };
   };
 }
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 791273af7d..3edaf3d8ae 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.test.ts
new file mode 100644
index 0000000000..3132bdef76
--- /dev/null
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.test.ts
@@ -0,0 +1,72 @@
+/*
+ * 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 { DispatchingKubernetesAuthTranslator } from './DispatchingKubernetesAuthTranslator';
+import { ClusterDetails } from '../types';
+import { KubernetesRequestAuth } from '@backstage/plugin-kubernetes-common';
+import { KubernetesAuthTranslator } from './types';
+
+describe('decorateClusterDetailsWithAuth', () => {
+  let authTranslator: DispatchingKubernetesAuthTranslator;
+  let mockTranslator: jest.Mocked<KubernetesAuthTranslator>;
+  const authObject: KubernetesRequestAuth = {};
+
+  beforeEach(() => {
+    mockTranslator = { decorateClusterDetailsWithAuth: jest.fn() };
+    authTranslator = new DispatchingKubernetesAuthTranslator({
+      authTranslatorMap: { google: mockTranslator },
+    });
+  });
+
+  it('can decorate cluster details if the auth provider is in the translator map', async () => {
+    const expectedClusterDetails: ClusterDetails = {
+      url: 'notanything.com',
+      name: 'randomName',
+      authProvider: 'google',
+      serviceAccountToken: 'added by mock translator',
+    };
+
+    mockTranslator.decorateClusterDetailsWithAuth.mockResolvedValue(
+      expectedClusterDetails,
+    );
+
+    const returnedValue = await authTranslator.decorateClusterDetailsWithAuth(
+      { name: 'googleCluster', url: 'anything.com', authProvider: 'google' },
+      authObject,
+    );
+
+    expect(mockTranslator.decorateClusterDetailsWithAuth).toHaveBeenCalledWith(
+      { name: 'googleCluster', url: 'anything.com', authProvider: 'google' },
+      authObject,
+    );
+    expect(returnedValue).toBe(expectedClusterDetails);
+  });
+
+  it('throws an error when asked for an auth translator for an unsupported auth type', () => {
+    expect(() =>
+      authTranslator.decorateClusterDetailsWithAuth(
+        {
+          name: 'test-cluster',
+          url: 'anything.com',
+          authProvider: 'linode',
+        },
+        authObject,
+      ),
+    ).toThrow(
+      'authProvider "linode" has no KubernetesAuthTranslator associated with it',
+    );
+  });
+});
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.ts
new file mode 100644
index 0000000000..82d9538cac
--- /dev/null
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/DispatchingKubernetesAuthTranslator.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { KubernetesAuthTranslator } from './types';
+import { ClusterDetails } from '../types';
+import { KubernetesRequestAuth } from '@backstage/plugin-kubernetes-common';
+
+/**
+ *
+ * @public
+ */
+export type DispatchingKubernetesAuthTranslatorOptions = {
+  authTranslatorMap: {
+    [key: string]: KubernetesAuthTranslator;
+  };
+};
+/**
+ * used to direct a KubernetesAuthProvider to its corresponding KubernetesAuthTranslator
+ * @public
+ */
+export class DispatchingKubernetesAuthTranslator
+  implements KubernetesAuthTranslator
+{
+  private readonly translatorMap: { [key: string]: KubernetesAuthTranslator };
+
+  constructor(options: DispatchingKubernetesAuthTranslatorOptions) {
+    this.translatorMap = options.authTranslatorMap;
+  }
+
+  public decorateClusterDetailsWithAuth(
+    clusterDetails: ClusterDetails,
+    auth: KubernetesRequestAuth,
+  ) {
+    if (this.translatorMap[clusterDetails.authProvider]) {
+      return this.translatorMap[
+        clusterDetails.authProvider
+      ].decorateClusterDetailsWithAuth(clusterDetails, auth);
+    }
+    throw new Error(
+      `authProvider "${clusterDetails.authProvider}" has no KubernetesAuthTranslator associated with it`,
+    );
+  }
+}
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts
deleted file mode 100644
index f8abdde9cf..0000000000
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.test.ts
+++ /dev/null
@@ -1,61 +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 { KubernetesAuthTranslator } from './types';
-import { GoogleKubernetesAuthTranslator } from './GoogleKubernetesAuthTranslator';
-import { KubernetesAuthTranslatorGenerator } from './KubernetesAuthTranslatorGenerator';
-import { NoopKubernetesAuthTranslator } from './NoopKubernetesAuthTranslator';
-import { AwsIamKubernetesAuthTranslator } from './AwsIamKubernetesAuthTranslator';
-import { OidcKubernetesAuthTranslator } from './OidcKubernetesAuthTranslator';
-import { getVoidLogger } from '@backstage/backend-common';
-
-const logger = getVoidLogger();
-
-describe('getKubernetesAuthTranslatorInstance', () => {
-  const sut = KubernetesAuthTranslatorGenerator;
-
-  it('can return an auth translator for google auth', () => {
-    const authTranslator: KubernetesAuthTranslator =
-      sut.getKubernetesAuthTranslatorInstance('google', { logger });
-    expect(authTranslator instanceof GoogleKubernetesAuthTranslator).toBe(true);
-  });
-
-  it('can return an auth translator for aws auth', () => {
-    const authTranslator: KubernetesAuthTranslator =
-      sut.getKubernetesAuthTranslatorInstance('aws', { logger });
-    expect(authTranslator instanceof AwsIamKubernetesAuthTranslator).toBe(true);
-  });
-
-  it('can return an auth translator for serviceAccount auth', () => {
-    const authTranslator: KubernetesAuthTranslator =
-      sut.getKubernetesAuthTranslatorInstance('serviceAccount', { logger });
-    expect(authTranslator instanceof NoopKubernetesAuthTranslator).toBe(true);
-  });
-
-  it('can return an auth translator for oidc auth', () => {
-    const authTranslator: KubernetesAuthTranslator =
-      sut.getKubernetesAuthTranslatorInstance('oidc', { logger });
-    expect(authTranslator instanceof OidcKubernetesAuthTranslator).toBe(true);
-  });
-
-  it('throws an error when asked for an auth translator for an unsupported auth type', () => {
-    expect(() =>
-      sut.getKubernetesAuthTranslatorInstance('linode', { logger }),
-    ).toThrow(
-      'authProvider "linode" has no KubernetesAuthTranslator associated with it',
-    );
-  });
-});
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.ts
deleted file mode 100644
index f54e46efab..0000000000
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/KubernetesAuthTranslatorGenerator.ts
+++ /dev/null
@@ -1,66 +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 { Logger } from 'winston';
-import { KubernetesAuthTranslator } from './types';
-import { GoogleKubernetesAuthTranslator } from './GoogleKubernetesAuthTranslator';
-import { NoopKubernetesAuthTranslator } from './NoopKubernetesAuthTranslator';
-import { AwsIamKubernetesAuthTranslator } from './AwsIamKubernetesAuthTranslator';
-import { GoogleServiceAccountAuthTranslator } from './GoogleServiceAccountAuthProvider';
-import { AzureIdentityKubernetesAuthTranslator } from './AzureIdentityKubernetesAuthTranslator';
-import { OidcKubernetesAuthTranslator } from './OidcKubernetesAuthTranslator';
-
-/**
- *
- * @public
- */
-export class KubernetesAuthTranslatorGenerator {
-  static getKubernetesAuthTranslatorInstance(
-    authProvider: string,
-    options: {
-      logger: Logger;
-    },
-  ): KubernetesAuthTranslator {
-    switch (authProvider) {
-      case 'google': {
-        return new GoogleKubernetesAuthTranslator();
-      }
-      case 'aws': {
-        return new AwsIamKubernetesAuthTranslator();
-      }
-      case 'azure': {
-        return new AzureIdentityKubernetesAuthTranslator(options.logger);
-      }
-      case 'serviceAccount': {
-        return new NoopKubernetesAuthTranslator();
-      }
-      case 'googleServiceAccount': {
-        return new GoogleServiceAccountAuthTranslator();
-      }
-      case 'oidc': {
-        return new OidcKubernetesAuthTranslator();
-      }
-      case 'localKubectlProxy': {
-        return new NoopKubernetesAuthTranslator();
-      }
-      default: {
-        throw new Error(
-          `authProvider "${authProvider}" has no KubernetesAuthTranslator associated with it`,
-        );
-      }
-    }
-  }
-}
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/index.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/index.ts
index 19f6dd80eb..4ee83b0da0 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/index.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/index.ts
@@ -18,7 +18,7 @@ export * from './AwsIamKubernetesAuthTranslator';
 export * from './AzureIdentityKubernetesAuthTranslator';
 export * from './GoogleKubernetesAuthTranslator';
 export * from './GoogleServiceAccountAuthProvider';
-export * from './KubernetesAuthTranslatorGenerator';
+export * from './DispatchingKubernetesAuthTranslator';
 export * from './NoopKubernetesAuthTranslator';
 export * from './OidcKubernetesAuthTranslator';
 export * from './types';
diff --git a/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts b/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts
index 367e5edef3..5e885512f7 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesBuilder.ts
@@ -24,6 +24,17 @@ import { Duration } from 'luxon';
 import { Logger } from 'winston';
 
 import { getCombinedClusterSupplier } from '../cluster-locator';
+import {
+  KubernetesAuthTranslator,
+  DispatchingKubernetesAuthTranslator,
+  GoogleKubernetesAuthTranslator,
+  NoopKubernetesAuthTranslator,
+  AwsIamKubernetesAuthTranslator,
+  GoogleServiceAccountAuthTranslator,
+  AzureIdentityKubernetesAuthTranslator,
+  OidcKubernetesAuthTranslator,
+} from '../kubernetes-auth-translator';
+
 import { addResourceRoutesToRouter } from '../routes/resourcesRoutes';
 import { MultiTenantServiceLocator } from '../service-locator/MultiTenantServiceLocator';
 import {
@@ -68,6 +79,7 @@ export type KubernetesBuilderReturn = Promise<{
   proxy: KubernetesProxy;
   objectsProvider: KubernetesObjectsProvider;
   serviceLocator: KubernetesServiceLocator;
+  authTranslatorMap: { [key: string]: KubernetesAuthTranslator };
 }>;
 
 /**
@@ -83,6 +95,7 @@ export class KubernetesBuilder {
   private fetcher?: KubernetesFetcher;
   private serviceLocator?: KubernetesServiceLocator;
   private proxy?: KubernetesProxy;
+  private authTranslatorMap?: { [key: string]: KubernetesAuthTranslator };
 
   static createBuilder(env: KubernetesEnvironment) {
     return new KubernetesBuilder(env);
@@ -114,6 +127,8 @@ export class KubernetesBuilder {
 
     const clusterSupplier = this.getClusterSupplier();
 
+    const authTranslatorMap = this.getAuthTranslatorMap();
+
     const proxy = this.getProxy(logger, clusterSupplier);
 
     const serviceLocator = this.getServiceLocator();
@@ -142,6 +157,7 @@ export class KubernetesBuilder {
       objectsProvider,
       router,
       serviceLocator,
+      authTranslatorMap,
     };
   }
 
@@ -175,6 +191,12 @@ export class KubernetesBuilder {
     return this;
   }
 
+  public setAuthTranslatorMap(authTranslatorMap: {
+    [key: string]: KubernetesAuthTranslator;
+  }) {
+    this.authTranslatorMap = authTranslatorMap;
+  }
+
   protected buildCustomResources() {
     const customResources: CustomResource[] = (
       this.env.config.getOptionalConfigArray('kubernetes.customResources') ?? []
@@ -210,7 +232,14 @@ export class KubernetesBuilder {
   protected buildObjectsProvider(
     options: KubernetesObjectsProviderOptions,
   ): KubernetesObjectsProvider {
-    this.objectsProvider = new KubernetesFanOutHandler(options);
+    const authTranslatorMap = this.getAuthTranslatorMap();
+    this.objectsProvider = new KubernetesFanOutHandler({
+      ...options,
+      authTranslator: new DispatchingKubernetesAuthTranslator({
+        authTranslatorMap,
+      }),
+    });
+
     return this.objectsProvider;
   }
 
@@ -259,7 +288,15 @@ export class KubernetesBuilder {
     logger: Logger,
     clusterSupplier: KubernetesClustersSupplier,
   ): KubernetesProxy {
-    this.proxy = new KubernetesProxy(logger, clusterSupplier);
+    const authTranslatorMap = this.getAuthTranslatorMap();
+    const authTranslator = new DispatchingKubernetesAuthTranslator({
+      authTranslatorMap,
+    });
+    this.proxy = new KubernetesProxy({
+      logger,
+      clusterSupplier,
+      authTranslator,
+    });
     return this.proxy;
   }
 
@@ -314,6 +351,19 @@ export class KubernetesBuilder {
     return router;
   }
 
+  protected buildAuthTranslatorMap() {
+    this.authTranslatorMap = {
+      google: new GoogleKubernetesAuthTranslator(),
+      aws: new AwsIamKubernetesAuthTranslator(),
+      azure: new AzureIdentityKubernetesAuthTranslator(this.env.logger),
+      serviceAccount: new NoopKubernetesAuthTranslator(),
+      googleServiceAccount: new GoogleServiceAccountAuthTranslator(),
+      oidc: new OidcKubernetesAuthTranslator(),
+      localKubectlProxy: new NoopKubernetesAuthTranslator(),
+    };
+    return this.authTranslatorMap;
+  }
+
   protected async fetchClusterDetails(
     clusterSupplier: KubernetesClustersSupplier,
   ) {
@@ -393,4 +443,8 @@ export class KubernetesBuilder {
   ) {
     return this.proxy ?? this.buildProxy(logger, clusterSupplier);
   }
+
+  protected getAuthTranslatorMap() {
+    return this.authTranslatorMap ?? this.buildAuthTranslatorMap();
+  }
 }
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
index 53aaa1ad3a..de6035b48e 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts
@@ -166,6 +166,11 @@ function getKubernetesFanOutHandler(customResources: CustomResource[]) {
       getClustersByEntity,
     },
     customResources: customResources,
+    authTranslator: {
+      decorateClusterDetailsWithAuth: async (clusterDetails, _) => {
+        return clusterDetails;
+      },
+    },
   });
 }
 
@@ -879,6 +884,11 @@ describe('getKubernetesObjectsByEntity', () => {
             objectType: 'services',
           },
         ],
+        authTranslator: {
+          decorateClusterDetailsWithAuth: async (clusterDetails, _) => {
+            return clusterDetails;
+          },
+        },
       });
 
       const result = await sut.getKubernetesObjectsByEntity({
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
index f71c6506bd..8441effabd 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.ts
@@ -30,7 +30,6 @@ import {
   ServiceLocatorRequestContext,
 } from '../types/types';
 import { KubernetesAuthTranslator } from '../kubernetes-auth-translator/types';
-import { KubernetesAuthTranslatorGenerator } from '../kubernetes-auth-translator/KubernetesAuthTranslatorGenerator';
 import {
   ClientContainerStatus,
   ClientCurrentResourceUsage,
@@ -137,7 +136,9 @@ export const DEFAULT_OBJECTS: ObjectToFetch[] = [
 ];
 
 export interface KubernetesFanOutHandlerOptions
-  extends KubernetesObjectsProviderOptions {}
+  extends KubernetesObjectsProviderOptions {
+  authTranslator: KubernetesAuthTranslator;
+}
 
 export interface KubernetesRequestBody extends ObjectsByEntityRequest {}
 
@@ -195,7 +196,7 @@ export class KubernetesFanOutHandler {
   private readonly serviceLocator: KubernetesServiceLocator;
   private readonly customResources: CustomResource[];
   private readonly objectTypesToFetch: Set<ObjectToFetch>;
-  private readonly authTranslators: Record<string, KubernetesAuthTranslator>;
+  private readonly authTranslator: KubernetesAuthTranslator;
 
   constructor({
     logger,
@@ -203,13 +204,14 @@ export class KubernetesFanOutHandler {
     serviceLocator,
     customResources,
     objectTypesToFetch = DEFAULT_OBJECTS,
+    authTranslator,
   }: KubernetesFanOutHandlerOptions) {
     this.logger = logger;
     this.fetcher = fetcher;
     this.serviceLocator = serviceLocator;
     this.customResources = customResources;
     this.objectTypesToFetch = new Set(objectTypesToFetch);
-    this.authTranslators = {};
+    this.authTranslator = authTranslator;
   }
 
   async getCustomResourcesByEntity({
@@ -313,12 +315,7 @@ export class KubernetesFanOutHandler {
     // Execute all of these async actions simultaneously/without blocking sequentially as no common object is modified by them
     const promiseResults = await Promise.allSettled(
       clusterDetails.map(cd => {
-        const kubernetesAuthTranslator: KubernetesAuthTranslator =
-          this.getAuthTranslator(cd.authProvider);
-        return kubernetesAuthTranslator.decorateClusterDetailsWithAuth(
-          cd,
-          auth,
-        );
+        return this.authTranslator.decorateClusterDetailsWithAuth(cd, auth);
       }),
     );
 
@@ -393,19 +390,4 @@ export class KubernetesFanOutHandler {
     result.errors.push(...podMetrics.errors);
     return [result, podMetrics.responses as PodStatusFetchResponse[]];
   }
-
-  private getAuthTranslator(provider: string): KubernetesAuthTranslator {
-    if (this.authTranslators[provider]) {
-      return this.authTranslators[provider];
-    }
-
-    this.authTranslators[provider] =
-      KubernetesAuthTranslatorGenerator.getKubernetesAuthTranslatorInstance(
-        provider,
-        {
-          logger: this.logger,
-        },
-      );
-    return this.authTranslators[provider];
-  }
 }
diff --git a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
index d2404af839..57eb29f0a7 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
@@ -28,16 +28,19 @@ import { ClusterDetails, KubernetesClustersSupplier } from '../types/types';
 import {
   APPLICATION_JSON,
   HEADER_KUBERNETES_CLUSTER,
+  HEADER_KUBERNETES_AUTH,
   KubernetesProxy,
 } from './KubernetesProxy';
 import {
   AuthorizeResult,
   PermissionEvaluator,
 } from '@backstage/plugin-permission-common';
+import { KubernetesAuthTranslator } from '../kubernetes-auth-translator';
 
 describe('KubernetesProxy', () => {
   let proxy: KubernetesProxy;
   const worker = setupServer();
+  const logger = getVoidLogger();
 
   setupRequestMockHandlers(worker);
 
@@ -73,9 +76,13 @@ describe('KubernetesProxy', () => {
     authorizeConditional: jest.fn(),
   };
 
+  const authTranslator: jest.Mocked<KubernetesAuthTranslator> = {
+    decorateClusterDetailsWithAuth: jest.fn(),
+  };
+
   beforeEach(() => {
     jest.resetAllMocks();
-    proxy = new KubernetesProxy(getVoidLogger(), clusterSupplier);
+    proxy = new KubernetesProxy({ logger, clusterSupplier, authTranslator });
   });
 
   it('should return a ERROR_NOT_FOUND if no clusters are found', async () => {
@@ -112,21 +119,30 @@ describe('KubernetesProxy', () => {
         authProvider: 'serviceAccount',
       },
     ] as ClusterDetails[]);
+
+    permissionApi.authorize.mockReturnValue(
+      Promise.resolve([{ result: AuthorizeResult.ALLOW }]),
+    );
+
+    authTranslator.decorateClusterDetailsWithAuth.mockResolvedValue({
+      name: 'cluster1',
+      url: 'https://localhost:9999',
+      serviceAccountToken: '',
+      authProvider: 'serviceAccount',
+    } as ClusterDetails);
+
     const app = express().use(
       '/mountpath',
       proxy.createRequestHandler({ permissionApi }),
     );
-    permissionApi.authorize.mockReturnValue(
-      Promise.resolve([{ result: AuthorizeResult.ALLOW }]),
-    );
     const requestPromise = request(app)
       .get('/mountpath/api')
       .set(HEADER_KUBERNETES_CLUSTER, 'cluster1');
     worker.use(
-      rest.get('https://localhost:9999/api', (_, res, ctx) =>
+      rest.get('https://localhost:9999/api', (_: any, res: any, ctx: any) =>
         res(ctx.status(299), ctx.json(apiResponse)),
       ),
-      rest.all(requestPromise.url, (req, _res, _ctx) => req.passthrough()),
+      rest.all(requestPromise.url, (req: any) => req.passthrough()),
     );
 
     const response = await requestPromise;
@@ -134,4 +150,188 @@ describe('KubernetesProxy', () => {
     expect(response.status).toEqual(299);
     expect(response.body).toStrictEqual(apiResponse);
   });
+
+  it('should default to using a provided authorization header', async () => {
+    worker.use(
+      rest.get(
+        'https://localhost:9999/api/v1/namespaces',
+        (req: any, res: any, ctx: any) => {
+          if (!req.headers.get('Authorization')) {
+            return res(ctx.status(401));
+          }
+
+          if (req.headers.get('Authorization') !== 'my-token') {
+            return res(ctx.status(403));
+          }
+
+          return res(
+            ctx.status(200),
+            ctx.json({
+              kind: 'NamespaceList',
+              apiVersion: 'v1',
+              items: [],
+            }),
+          );
+        },
+      ),
+    );
+
+    permissionApi.authorize.mockReturnValue(
+      Promise.resolve([{ result: AuthorizeResult.ALLOW }]),
+    );
+
+    clusterSupplier.getClusters.mockResolvedValue([
+      {
+        name: 'cluster1',
+        url: 'https://localhost:9999',
+        serviceAccountToken: '',
+        authProvider: 'serviceAccount',
+      },
+    ] as ClusterDetails[]);
+
+    authTranslator.decorateClusterDetailsWithAuth.mockResolvedValue({
+      name: 'cluster1',
+      url: 'https://localhost:9999',
+      serviceAccountToken: 'random-token',
+      authProvider: 'serviceAccount',
+    } as ClusterDetails);
+
+    const app = express().use(
+      '/mountpath',
+      proxy.createRequestHandler({ permissionApi }),
+    );
+    const requestPromise = request(app)
+      .get('/mountpath/api/v1/namespaces')
+      .set(HEADER_KUBERNETES_CLUSTER, 'cluster1')
+      .set('Authorization', 'my-token');
+
+    worker.use(rest.all(requestPromise.url, (req: any) => req.passthrough()));
+
+    const response = await requestPromise;
+
+    expect(response.status).toEqual(200);
+  });
+
+  it('should add a serviceAccountToken to the request headers if one isnt provided in request and one isnt set up in cluster details', async () => {
+    worker.use(
+      rest.get('https://localhost:9999/api/v1/namespaces', (req, res, ctx) => {
+        if (!req.headers.get('Authorization')) {
+          return res(ctx.status(401));
+        }
+
+        if (req.headers.get('Authorization') !== 'Bearer my-token') {
+          return res(ctx.status(403));
+        }
+
+        return res(
+          ctx.status(200),
+          ctx.json({
+            kind: 'NamespaceList',
+            apiVersion: 'v1',
+            items: [],
+          }),
+        );
+      }),
+    );
+
+    permissionApi.authorize.mockReturnValue(
+      Promise.resolve([{ result: AuthorizeResult.ALLOW }]),
+    );
+
+    clusterSupplier.getClusters.mockResolvedValue([
+      {
+        name: 'cluster1',
+        url: 'https://localhost:9999',
+        authProvider: 'googleServiceAccount',
+      },
+    ] as ClusterDetails[]);
+
+    authTranslator.decorateClusterDetailsWithAuth.mockResolvedValue({
+      name: 'cluster1',
+      url: 'https://localhost:9999',
+      serviceAccountToken: 'my-token',
+      authProvider: 'googleServiceAccount',
+    } as ClusterDetails);
+
+    const app = express().use(
+      '/mountpath',
+      proxy.createRequestHandler({ permissionApi }),
+    );
+    const requestPromise = request(app)
+      .get('/mountpath/api/v1/namespaces')
+      .set(HEADER_KUBERNETES_CLUSTER, 'cluster1');
+
+    worker.use(rest.all(requestPromise.url, (req: any) => req.passthrough()));
+
+    const response = await requestPromise;
+
+    expect(response.status).toEqual(200);
+    expect(response.body).toStrictEqual({
+      kind: 'NamespaceList',
+      apiVersion: 'v1',
+      items: [],
+    });
+  });
+
+  it('should append the Backstage-Kubernetes-Auth field to the requests authorization header if one is provided', async () => {
+    worker.use(
+      rest.get('https://localhost:9999/api/v1/namespaces', (req, res, ctx) => {
+        if (!req.headers.get('Authorization')) {
+          return res(ctx.status(401));
+        }
+
+        if (req.headers.get('Authorization') !== 'tokenB') {
+          return res(ctx.status(403));
+        }
+
+        return res(
+          ctx.status(200),
+          ctx.json({
+            kind: 'NamespaceList',
+            apiVersion: 'v1',
+            items: [],
+          }),
+        );
+      }),
+    );
+
+    permissionApi.authorize.mockReturnValue(
+      Promise.resolve([{ result: AuthorizeResult.ALLOW }]),
+    );
+
+    clusterSupplier.getClusters.mockResolvedValue([
+      {
+        name: 'cluster1',
+        url: 'https://localhost:9999',
+        authProvider: 'googleServiceAccount',
+      },
+    ] as ClusterDetails[]);
+
+    authTranslator.decorateClusterDetailsWithAuth.mockResolvedValue({
+      name: 'cluster1',
+      url: 'https://localhost:9999',
+      serviceAccountToken: 'tokenA',
+      authProvider: 'googleServiceAccount',
+    } as ClusterDetails);
+
+    const app = express().use(
+      '/mountpath',
+      proxy.createRequestHandler({ permissionApi }),
+    );
+    const requestPromise = request(app)
+      .get('/mountpath/api/v1/namespaces')
+      .set(HEADER_KUBERNETES_CLUSTER, 'cluster1')
+      .set(HEADER_KUBERNETES_AUTH, 'tokenB');
+
+    worker.use(rest.all(requestPromise.url, (req: any) => req.passthrough()));
+
+    const response = await requestPromise;
+
+    expect(response.status).toEqual(200);
+    expect(response.body).toStrictEqual({
+      kind: 'NamespaceList',
+      apiVersion: 'v1',
+      items: [],
+    });
+  });
 });
diff --git a/plugins/kubernetes-backend/src/service/KubernetesProxy.ts b/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
index 49a381b75a..eb6748ffba 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
@@ -32,6 +32,7 @@ import { bufferFromFileOrString } from '@kubernetes/client-node';
 import type { Request, RequestHandler } from 'express';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { Logger } from 'winston';
+import { KubernetesAuthTranslator } from '../kubernetes-auth-translator';
 import { ClusterDetails, KubernetesClustersSupplier } from '../types/types';
 
 export const APPLICATION_JSON: string = 'application/json';
@@ -60,6 +61,17 @@ export type KubernetesProxyCreateRequestHandlerOptions = {
   permissionApi: PermissionEvaluator;
 };
 
+/**
+ * Options accepted as a parameter by the KubernetesProxy
+ *
+ * @public
+ */
+export type KubernetesProxyOptions = {
+  logger: Logger;
+  clusterSupplier: KubernetesClustersSupplier;
+  authTranslator: KubernetesAuthTranslator;
+};
+
 /**
  * A proxy that routes requests to the Kubernetes API.
  *
@@ -67,11 +79,15 @@ export type KubernetesProxyCreateRequestHandlerOptions = {
  */
 export class KubernetesProxy {
   private readonly middlewareForClusterName = new Map<string, RequestHandler>();
+  private readonly logger: Logger;
+  private readonly clusterSupplier: KubernetesClustersSupplier;
+  private readonly authTranslator: KubernetesAuthTranslator;
 
-  constructor(
-    private readonly logger: Logger,
-    private readonly clusterSupplier: KubernetesClustersSupplier,
-  ) {}
+  constructor(options: KubernetesProxyOptions) {
+    this.logger = options.logger;
+    this.clusterSupplier = options.clusterSupplier;
+    this.authTranslator = options.authTranslator;
+  }
 
   public createRequestHandler(
     options: KubernetesProxyCreateRequestHandlerOptions,
@@ -96,6 +112,12 @@ export class KubernetesProxy {
         return;
       }
 
+      const cluster = await this.getClusterForRequest(req).then(cd =>
+        this.authTranslator.decorateClusterDetailsWithAuth(cd, {}),
+      );
+      if (!req.headers.authorization) {
+        req.headers.authorization = `Bearer ${cluster.serviceAccountToken}`;
+      }
       const middleware = await this.getMiddleware(req);
       middleware(req, res, next);
     };
@@ -108,13 +130,6 @@ export class KubernetesProxy {
     const originalCluster = await this.getClusterForRequest(originalReq);
     let middleware = this.middlewareForClusterName.get(originalCluster.name);
     if (!middleware) {
-      // Probably too risky without permissions protecting this endpoint
-      // if (cluster.serviceAccountToken) {
-      //   options.headers = {
-      //     Authorization: `Bearer ${cluster.serviceAccountToken}`,
-      //   };
-      // }
-
       const logger = this.logger.child({ cluster: originalCluster.name });
       middleware = createProxyMiddleware({
         logProvider: () => logger,
@@ -146,19 +161,18 @@ export class KubernetesProxy {
             request: { method: req.method, url: req.originalUrl },
             response: { statusCode: 500 },
           };
-
           res.status(500).json(body);
         },
         onProxyReq: (proxyReq, req) => {
           // the kubernetes proxy endpoint expects a header field labeled `Backstage-Kubernetes-Authorization` that will be used to authenticate with the Kubernetes Api. The token provided as a value should be an bearer token for the target cluster.
-          const token = req.header(HEADER_KUBERNETES_AUTH) ?? '';
-          proxyReq.setHeader('Authorization', token);
+          if (req.header(HEADER_KUBERNETES_AUTH)) {
+            const token = req.header(HEADER_KUBERNETES_AUTH) ?? '';
+            proxyReq.setHeader('Authorization', token);
+          }
         },
       });
-
       this.middlewareForClusterName.set(originalCluster.name, middleware);
     }
-
     return middleware;
   }
 
diff --git a/plugins/kubernetes-backend/src/service/index.ts b/plugins/kubernetes-backend/src/service/index.ts
index 2f3e907879..9c0911de37 100644
--- a/plugins/kubernetes-backend/src/service/index.ts
+++ b/plugins/kubernetes-backend/src/service/index.ts
@@ -21,5 +21,8 @@ export {
   KubernetesProxy,
   HEADER_KUBERNETES_AUTH,
 } from './KubernetesProxy';
-export type { KubernetesProxyCreateRequestHandlerOptions } from './KubernetesProxy';
+export type {
+  KubernetesProxyCreateRequestHandlerOptions,
+  KubernetesProxyOptions,
+} from './KubernetesProxy';
 export * from './router';
diff --git a/plugins/kubernetes-backend/src/types/types.ts b/plugins/kubernetes-backend/src/types/types.ts
index 25c7abfd1f..87011b3bb9 100644
--- a/plugins/kubernetes-backend/src/types/types.ts
+++ b/plugins/kubernetes-backend/src/types/types.ts
@@ -104,6 +104,8 @@ export type KubernetesObjectTypes =
   | 'customresources'
   | 'statefulsets'
   | 'daemonsets';
+// If updating this list, also make sure to update
+// `objectTypes` and `apiVersionOverrides` in config.d.ts!
 
 /**
  * Used to load cluster details from different sources
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 0f6b540c23..39942d08a8 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-kubernetes-common
 
+## 0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.6.2-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 8f4b4d348d..ca309eb436 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.2-next.1",
+  "version": "0.6.2-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index a1271e0d23..4b24f747d9 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-kubernetes
 
+## 0.8.0-next.3
+
+### Minor Changes
+
+- 754be7c5106: refactor kubernetes error detection to make way for proposed solutions
+
+  **BREAKING**: `DetectedError` now appears once per Kubernetes resource per error instead of for all resources which have that error, `namespace` and `name` fields are now in `sourceRef` object `message` is now a `string` instead of a `string[]`. `ErrorDetectableKind` has been removed.
+
+### Patch Changes
+
+- e7fb0117485: fixes a bug where an empty authorization header was provided to the proxy endpoint when a cluster had a server-side auth provider
+- c159ab64a60: `KubernetesBackendClient` now requires a `kubernetesAuthProvidersApi` value to be provided. `KubernetesApi` interface now has a proxy method requirement.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-kubernetes-common@0.6.2-next.2
+
+## 0.7.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-kubernetes-common@0.6.2-next.1
+
 ## 0.7.10-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 2cc2674a9e..3814bcb4a5 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -104,17 +104,21 @@ export interface DeploymentResources {
 // @public
 export interface DetectedError {
   // (undocumented)
-  cluster: string;
+  message: string;
   // (undocumented)
-  kind: ErrorDetectableKind;
+  occuranceCount: number;
+  // Warning: (ae-forgotten-export) The symbol "ProposedFix" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
-  message: string[];
-  // (undocumented)
-  names: string[];
-  // (undocumented)
-  namespace: string;
+  proposedFix: ProposedFix[];
   // (undocumented)
   severity: ErrorSeverity;
+  // Warning: (ae-forgotten-export) The symbol "ResourceRef" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  sourceRef: ResourceRef;
+  // (undocumented)
+  type: string;
 }
 
 // @public
@@ -137,12 +141,6 @@ export type EntityKubernetesContentProps = {
   refreshIntervalMs?: number;
 };
 
-// @public
-export type ErrorDetectableKind =
-  | 'Pod'
-  | 'Deployment'
-  | 'HorizontalPodAutoscaler';
-
 // Warning: (ae-forgotten-export) The symbol "ErrorPanelProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "ErrorPanel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -184,6 +182,10 @@ export class GoogleKubernetesAuthProvider implements KubernetesAuthProvider {
   decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  // (undocumented)
+  getCredentials(): Promise<{
+    token: string;
+  }>;
 }
 
 // Warning: (ae-missing-release-tag) "GroupedResponses" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -259,6 +261,12 @@ export interface KubernetesApi {
   getWorkloadsByEntity(
     request: WorkloadsByEntityRequest,
   ): Promise<ObjectsByEntityResponse>;
+  // (undocumented)
+  proxy(options: {
+    clusterName: string;
+    path: string;
+    init?: RequestInit;
+  }): Promise<Response>;
 }
 
 // Warning: (ae-missing-release-tag) "kubernetesApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -281,6 +289,10 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
     authProvider: string,
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  // (undocumented)
+  getCredentials(authProvider: string): Promise<{
+    token?: string;
+  }>;
 }
 
 // Warning: (ae-missing-release-tag) "KubernetesAuthProvidersApi" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -292,6 +304,10 @@ export interface KubernetesAuthProvidersApi {
     authProvider: string,
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  // (undocumented)
+  getCredentials(authProvider: string): Promise<{
+    token?: string;
+  }>;
 }
 
 // Warning: (ae-missing-release-tag) "kubernetesAuthProvidersApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -306,6 +322,7 @@ export class KubernetesBackendClient implements KubernetesApi {
   constructor(options: {
     discoveryApi: DiscoveryApi;
     identityApi: IdentityApi;
+    kubernetesAuthProvidersApi: KubernetesAuthProvidersApi;
   });
   // (undocumented)
   getClusters(): Promise<
@@ -326,6 +343,12 @@ export class KubernetesBackendClient implements KubernetesApi {
   getWorkloadsByEntity(
     request: WorkloadsByEntityRequest,
   ): Promise<ObjectsByEntityResponse>;
+  // (undocumented)
+  proxy(options: {
+    clusterName: string;
+    path: string;
+    init?: RequestInit;
+  }): Promise<Response>;
 }
 
 // Warning: (ae-forgotten-export) The symbol "KubernetesContentProps" needs to be exported by the entry point index.d.ts
@@ -416,6 +439,8 @@ export class ServerSideKubernetesAuthProvider
   decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  // (undocumented)
+  getCredentials(): Promise<{}>;
 }
 
 // Warning: (ae-forgotten-export) The symbol "ServicesAccordionsProps" needs to be exported by the entry point index.d.ts
diff --git a/plugins/kubernetes/dev/index.tsx b/plugins/kubernetes/dev/index.tsx
index 77708f1287..5780d649fb 100644
--- a/plugins/kubernetes/dev/index.tsx
+++ b/plugins/kubernetes/dev/index.tsx
@@ -106,6 +106,16 @@ class MockKubernetesClient implements KubernetesApi {
   async getClusters(): Promise<{ name: string; authProvider: string }[]> {
     return [{ name: 'mock-cluster', authProvider: 'serviceAccount' }];
   }
+
+  async proxy(_options: { clusterName: String; path: String }): Promise<any> {
+    return {
+      kind: 'Namespace',
+      apiVersion: 'v1',
+      metadata: {
+        name: 'mock-ns',
+      },
+    };
+  }
 }
 
 createDevApp()
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index ae39da0598..96464fd23a 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes",
   "description": "A Backstage plugin that integrates towards Kubernetes",
-  "version": "0.7.10-next.1",
+  "version": "0.8.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,6 +37,7 @@
     "@backstage/config": "workspace:^",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/errors": "workspace:^",
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/theme": "workspace:^",
@@ -47,6 +48,7 @@
     "@types/react": "^16.13.1 || ^17.0.0",
     "cronstrue": "^2.2.0",
     "js-yaml": "^4.0.0",
+    "kubernetes-models": "^4.1.0",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
     "react-use": "^17.2.4"
diff --git a/plugins/kubernetes/src/api/KubernetesBackendClient.test.ts b/plugins/kubernetes/src/api/KubernetesBackendClient.test.ts
new file mode 100644
index 0000000000..7d2ef36602
--- /dev/null
+++ b/plugins/kubernetes/src/api/KubernetesBackendClient.test.ts
@@ -0,0 +1,563 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { KubernetesAuthProvidersApi } from '../kubernetes-auth-provider';
+import { KubernetesBackendClient } from './KubernetesBackendClient';
+import { rest } from 'msw';
+import { UrlPatternDiscovery } from '@backstage/core-app-api';
+import { setupServer } from 'msw/node';
+import { setupRequestMockHandlers } from '@backstage/test-utils';
+import {
+  CustomObjectsByEntityRequest,
+  KubernetesRequestBody,
+  ObjectsByEntityResponse,
+  WorkloadsByEntityRequest,
+} from '@backstage/plugin-kubernetes-common';
+import { NotFoundError } from '@backstage/errors';
+
+describe('KubernetesBackendClient', () => {
+  let backendClient: KubernetesBackendClient;
+  const kubernetesAuthProvidersApi: jest.Mocked<KubernetesAuthProvidersApi> = {
+    decorateRequestBodyForAuth: jest.fn(),
+    getCredentials: jest.fn(),
+  };
+  let mockResponse: ObjectsByEntityResponse;
+  const worker = setupServer();
+  setupRequestMockHandlers(worker);
+
+  const identityApi = {
+    getCredentials: jest.fn(),
+    getProfileInfo: jest.fn(),
+    getBackstageIdentity: jest.fn(),
+    signOut: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    backendClient = new KubernetesBackendClient({
+      discoveryApi: UrlPatternDiscovery.compile(
+        'http://localhost:1234/api/{{ pluginId }}',
+      ),
+      identityApi,
+      kubernetesAuthProvidersApi,
+    });
+    mockResponse = {
+      items: [
+        {
+          cluster: {
+            name: 'cluster-a',
+          },
+          resources: [{ type: 'pods', resources: [] }],
+          podMetrics: [
+            {
+              pod: {},
+              cpu: { currentUsage: 8, requestTotal: 2, limitTotal: 1 },
+              memory: { currentUsage: 8, requestTotal: 2, limitTotal: 1 },
+              containers: [
+                {
+                  container: 'test',
+                  cpuUsage: { currentUsage: 8, requestTotal: 2, limitTotal: 1 },
+                  memoryUsage: {
+                    currentUsage: 8,
+                    requestTotal: 2,
+                    limitTotal: 1,
+                  },
+                },
+              ],
+            },
+          ],
+          errors: [],
+        },
+      ],
+    };
+  });
+
+  it('hits the /clusters API', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
+        res(ctx.json({ items: [{ name: 'cluster-a', authProvider: 'aws' }] })),
+      ),
+    );
+
+    const clusters = await backendClient.getClusters();
+
+    expect(clusters).toStrictEqual([
+      { name: 'cluster-a', authProvider: 'aws' },
+    ]);
+  });
+
+  it('/clusters API throws a 404 Error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
+        res(ctx.status(404)),
+      ),
+    );
+
+    await expect(backendClient.getClusters()).rejects.toThrow(
+      'Could not find the Kubernetes Backend (HTTP 404). Make sure the plugin has been fully installed.',
+    );
+  });
+
+  it('/clusters API throws a 500 Error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
+        res(ctx.status(500)),
+      ),
+    );
+
+    await expect(backendClient.getClusters()).rejects.toThrow(
+      'Request failed with 500 Internal Server Error, ',
+    );
+  });
+
+  it('hits the /resources/custom/query API', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/custom/query',
+        (_, res, ctx) => res(ctx.json(mockResponse)),
+      ),
+    );
+
+    const request: CustomObjectsByEntityRequest = {
+      auth: {},
+      customResources: [
+        {
+          group: 'test-group',
+          apiVersion: 'v1',
+          plural: 'none',
+        },
+      ],
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const customObject: ObjectsByEntityResponse =
+      await backendClient.getCustomObjectsByEntity(request);
+
+    expect(customObject).toStrictEqual(mockResponse);
+  });
+
+  it('/resources/custom/query API throws a 404 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/custom/query',
+        (_, res, ctx) => res(ctx.status(404)),
+      ),
+    );
+
+    const request: CustomObjectsByEntityRequest = {
+      auth: {},
+      customResources: [
+        {
+          group: 'test-group',
+          apiVersion: 'v1',
+          plural: 'none',
+        },
+      ],
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getCustomObjectsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Could not find the Kubernetes Backend (HTTP 404). Make sure the plugin has been fully installed.',
+    );
+  });
+
+  it('/resources/custom/query API throws a 500 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/custom/query',
+        (_, res, ctx) => res(ctx.status(500)),
+      ),
+    );
+
+    const request: CustomObjectsByEntityRequest = {
+      auth: {},
+      customResources: [
+        {
+          group: 'test-group',
+          apiVersion: 'v1',
+          plural: 'none',
+        },
+      ],
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getCustomObjectsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Request failed with 500 Internal Server Error, ',
+    );
+  });
+
+  it('hits the /services/{entityName} API', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/services/test-name',
+        (_, res, ctx) => res(ctx.json(mockResponse)),
+      ),
+    );
+
+    const request: KubernetesRequestBody = {
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const entityObject: ObjectsByEntityResponse =
+      await backendClient.getObjectsByEntity(request);
+
+    expect(entityObject).toStrictEqual(mockResponse);
+  });
+
+  it('services/{entityName} API throws a 404 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/services/test-name',
+        (_, res, ctx) => res(ctx.status(404)),
+      ),
+    );
+
+    const request: KubernetesRequestBody = {
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getObjectsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Could not find the Kubernetes Backend (HTTP 404). Make sure the plugin has been fully installed.',
+    );
+  });
+
+  it('services/{entityName} API throws a 500 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/services/test-name',
+        (_, res, ctx) => res(ctx.status(500)),
+      ),
+    );
+
+    const request: KubernetesRequestBody = {
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getObjectsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Request failed with 500 Internal Server Error, ',
+    );
+  });
+
+  it('hits the /resources/workloads/query API', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/workloads/query',
+        (_, res, ctx) => res(ctx.json(mockResponse)),
+      ),
+    );
+
+    const request: WorkloadsByEntityRequest = {
+      auth: {},
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response: ObjectsByEntityResponse =
+      await backendClient.getWorkloadsByEntity(request);
+
+    expect(response).toStrictEqual(mockResponse);
+  });
+
+  it('/resources/workloads/query API throws a 404 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/workloads/query',
+        (_, res, ctx) => res(ctx.status(404)),
+      ),
+    );
+
+    const request: WorkloadsByEntityRequest = {
+      auth: {},
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getWorkloadsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Could not find the Kubernetes Backend (HTTP 404). Make sure the plugin has been fully installed.',
+    );
+  });
+
+  it('/resources/workloads/query API throws a 500 error', async () => {
+    identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    worker.use(
+      rest.post(
+        'http://localhost:1234/api/kubernetes/resources/workloads/query',
+        (_, res, ctx) => res(ctx.status(500)),
+      ),
+    );
+
+    const request: WorkloadsByEntityRequest = {
+      auth: {},
+      entity: {
+        apiVersion: 'v1',
+        kind: 'pod',
+        metadata: {
+          name: 'test-name',
+        },
+      },
+    };
+
+    const response = backendClient.getWorkloadsByEntity(request);
+
+    await expect(response).rejects.toThrow(
+      'Request failed with 500 Internal Server Error, ',
+    );
+  });
+
+  describe('proxy', () => {
+    beforeEach(() => {
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/clusters',
+          (_, res, ctx) =>
+            res(
+              ctx.json({ items: [{ name: 'cluster-a', authProvider: 'aws' }] }),
+            ),
+        ),
+      );
+      identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
+    });
+
+    it('hits the /proxy API', async () => {
+      kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({
+        token: 'k8-token',
+      });
+      const nsResponse = {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: 'new-ns',
+        },
+      };
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
+          (req, res, ctx) =>
+            res(
+              req.headers.get('Backstage-Kubernetes-Authorization') ===
+                'Bearer k8-token'
+                ? ctx.json(nsResponse)
+                : ctx.status(403),
+            ),
+        ),
+      );
+
+      const request = {
+        clusterName: 'cluster-a',
+        path: '/api/v1/namespaces',
+      };
+
+      const response = await backendClient.proxy(request);
+
+      await expect(response.json()).resolves.toStrictEqual(nsResponse);
+    });
+
+    it('hits /proxy api when signed in as a guest', async () => {
+      // when a user is signed in as a guest the result of the getCredentials() method resolves to the {} value.
+      identityApi.getCredentials.mockResolvedValue({});
+      kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({
+        token: 'k8-token',
+      });
+      const nsResponse = {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: 'new-ns',
+        },
+      };
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
+          (req, res, ctx) =>
+            res(
+              req.headers.get('Backstage-Kubernetes-Authorization') ===
+                'Bearer k8-token'
+                ? ctx.json(nsResponse)
+                : ctx.status(403),
+            ),
+        ),
+      );
+
+      const request = {
+        clusterName: 'cluster-a',
+        path: '/api/v1/namespaces',
+      };
+
+      const response = await backendClient.proxy(request);
+      await expect(response.json()).resolves.toStrictEqual(nsResponse);
+    });
+
+    it('/proxy API throws a 404 error', async () => {
+      kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({
+        token: 'k8-token',
+      });
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
+          (_, res, ctx) => res(ctx.status(404)),
+        ),
+      );
+
+      const request = {
+        clusterName: 'cluster-a',
+        path: '/api/v1/namespaces',
+      };
+
+      const response = await backendClient.proxy(request);
+
+      expect(response.status).toEqual(404);
+    });
+
+    it('throws a ERROR_NOT_FOUND if the cluster in the request is not found', async () => {
+      const request = {
+        clusterName: 'cluster-b',
+        path: '/api/v1/namespaces',
+      };
+
+      await expect(backendClient.proxy(request)).rejects.toThrow(NotFoundError);
+    });
+
+    it('responds with an 403 error when invalid k8 token is provided', async () => {
+      kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({
+        token: 'wrong-token',
+      });
+
+      const nsResponse = {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: 'new-ns',
+        },
+      };
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
+          (req, res, ctx) =>
+            res(
+              req.headers.get('Backstage-Kubernetes-Authorization') ===
+                'Bearer k8-token'
+                ? ctx.json(nsResponse)
+                : ctx.status(403),
+            ),
+        ),
+      );
+
+      const request = {
+        clusterName: 'cluster-a',
+        path: '/api/v1/namespaces',
+      };
+
+      const response = await backendClient.proxy(request);
+      expect(response.status).toEqual(403);
+    });
+
+    it('skips authorization header when auth provider returns no creds', async () => {
+      const nsResponse = {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: 'new-ns',
+        },
+      };
+      worker.use(
+        rest.get(
+          'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces/new-ns',
+          (req, res, ctx) =>
+            res(
+              req.headers.get('Backstage-Kubernetes-Authorization')
+                ? ctx.status(403)
+                : ctx.json(nsResponse),
+            ),
+        ),
+      );
+      kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({});
+
+      const response = await backendClient.proxy({
+        clusterName: 'cluster-a',
+        path: '/api/v1/namespaces/new-ns',
+      });
+
+      await expect(response.json()).resolves.toStrictEqual(nsResponse);
+    });
+  });
+});
diff --git a/plugins/kubernetes/src/api/KubernetesBackendClient.ts b/plugins/kubernetes/src/api/KubernetesBackendClient.ts
index bffc966333..681daa0ac0 100644
--- a/plugins/kubernetes/src/api/KubernetesBackendClient.ts
+++ b/plugins/kubernetes/src/api/KubernetesBackendClient.ts
@@ -23,17 +23,22 @@ import {
 } from '@backstage/plugin-kubernetes-common';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 import { stringifyEntityRef } from '@backstage/catalog-model';
+import { KubernetesAuthProvidersApi } from '../kubernetes-auth-provider';
+import { NotFoundError } from '@backstage/errors';
 
 export class KubernetesBackendClient implements KubernetesApi {
   private readonly discoveryApi: DiscoveryApi;
   private readonly identityApi: IdentityApi;
+  private readonly kubernetesAuthProvidersApi: KubernetesAuthProvidersApi;
 
   constructor(options: {
     discoveryApi: DiscoveryApi;
     identityApi: IdentityApi;
+    kubernetesAuthProvidersApi: KubernetesAuthProvidersApi;
   }) {
     this.discoveryApi = options.discoveryApi;
     this.identityApi = options.identityApi;
+    this.kubernetesAuthProvidersApi = options.kubernetesAuthProvidersApi;
   }
 
   private async handleResponse(response: Response): Promise<any> {
@@ -69,6 +74,25 @@ export class KubernetesBackendClient implements KubernetesApi {
     return this.handleResponse(response);
   }
 
+  private async getCluster(
+    clusterName: string,
+  ): Promise<{ name: string; authProvider: string }> {
+    const cluster = await this.getClusters().then(clusters =>
+      clusters.find(c => c.name === clusterName),
+    );
+    if (!cluster) {
+      throw new NotFoundError(`Cluster ${clusterName} not found`);
+    }
+
+    return cluster;
+  }
+
+  private async getCredentials(
+    authProvider: string,
+  ): Promise<{ token?: string }> {
+    return await this.kubernetesAuthProvidersApi.getCredentials(authProvider);
+  }
+
   async getObjectsByEntity(
     requestBody: KubernetesRequestBody,
   ): Promise<ObjectsByEntityResponse> {
@@ -100,7 +124,6 @@ export class KubernetesBackendClient implements KubernetesApi {
   async getClusters(): Promise<{ name: string; authProvider: string }[]> {
     const { token: idToken } = await this.identityApi.getCredentials();
     const url = `${await this.discoveryApi.getBaseUrl('kubernetes')}/clusters`;
-
     const response = await fetch(url, {
       method: 'GET',
       headers: {
@@ -110,4 +133,29 @@ export class KubernetesBackendClient implements KubernetesApi {
 
     return (await this.handleResponse(response)).items;
   }
+
+  async proxy(options: {
+    clusterName: string;
+    path: string;
+    init?: RequestInit;
+  }): Promise<Response> {
+    const { authProvider } = await this.getCluster(options.clusterName);
+    const { token: k8sToken } = await this.getCredentials(authProvider);
+    const url = `${await this.discoveryApi.getBaseUrl('kubernetes')}/proxy${
+      options.path
+    }`;
+    const identityResponse = await this.identityApi.getCredentials();
+    const headers = {
+      ...options.init?.headers,
+      [`Backstage-Kubernetes-Cluster`]: options.clusterName,
+      ...(k8sToken && {
+        [`Backstage-Kubernetes-Authorization`]: `Bearer ${k8sToken}`,
+      }),
+      ...(identityResponse.token && {
+        Authorization: `Bearer ${identityResponse.token}`,
+      }),
+    };
+
+    return await fetch(url, { ...options.init, headers });
+  }
 }
diff --git a/plugins/kubernetes/src/api/types.ts b/plugins/kubernetes/src/api/types.ts
index 0005a8d069..02f2fd3521 100644
--- a/plugins/kubernetes/src/api/types.ts
+++ b/plugins/kubernetes/src/api/types.ts
@@ -43,4 +43,9 @@ export interface KubernetesApi {
   getCustomObjectsByEntity(
     request: CustomObjectsByEntityRequest,
   ): Promise<ObjectsByEntityResponse>;
+  proxy(options: {
+    clusterName: string;
+    path: string;
+    init?: RequestInit;
+  }): Promise<Response>;
 }
diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
index a99fc21902..367e791067 100644
--- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
+++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
@@ -15,84 +15,64 @@
  */
 import * as React from 'react';
 import { DetectedError, DetectedErrorsByCluster } from '../../error-detection';
-import { Chip } from '@material-ui/core';
 import { Table, TableColumn } from '@backstage/core-components';
 
 type ErrorReportingProps = {
   detectedErrors: DetectedErrorsByCluster;
 };
 
-const columns: TableColumn<DetectedError>[] = [
+const columns: TableColumn<Row>[] = [
   {
     title: 'cluster',
     width: '10%',
-    render: (detectedError: DetectedError) => detectedError.cluster,
+    render: (row: Row) => row.clusterName,
   },
   {
     title: 'namespace',
     width: '10%',
-    render: (detectedError: DetectedError) => detectedError.namespace,
+    render: (row: Row) => row.error.sourceRef.namespace,
   },
   {
     title: 'kind',
     width: '10%',
-    render: (detectedError: DetectedError) => detectedError.kind,
+    render: (row: Row) => row.error.sourceRef.kind,
   },
   {
     title: 'name',
     width: '30%',
-    render: (detectedError: DetectedError) => {
-      const errorCount = detectedError.names.length;
-
-      if (errorCount === 0) {
-        // This shouldn't happen
-        return null;
-      }
-
-      const displayName = detectedError.names[0];
-
-      const otherErrorCount = errorCount - 1;
-
-      return (
-        <>
-          {displayName}{' '}
-          {otherErrorCount > 0 && (
-            <Chip
-              label={`+ ${otherErrorCount} other${
-                otherErrorCount > 1 ? 's' : ''
-              }`}
-              size="small"
-            />
-          )}
-        </>
-      );
+    render: (row: Row) => {
+      return <>{row.error.sourceRef.name} </>;
     },
   },
   {
     title: 'messages',
     width: '40%',
-    render: (detectedError: DetectedError) => (
-      <>
-        {detectedError.message.map((m, i) => (
-          <div key={i}>{m}</div>
-        ))}
-      </>
-    ),
+    render: (row: Row) => row.error.message,
   },
 ];
 
-const sortBySeverity = (a: DetectedError, b: DetectedError) => {
-  if (a.severity < b.severity) {
+interface Row {
+  clusterName: string;
+  error: DetectedError;
+}
+
+const sortBySeverity = (a: Row, b: Row) => {
+  if (a.error.severity < b.error.severity) {
     return 1;
-  } else if (b.severity < a.severity) {
+  } else if (b.error.severity < a.error.severity) {
     return -1;
   }
   return 0;
 };
 
 export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => {
-  const errors = Array.from(detectedErrors.values())
-    .flat()
+  const errors = Array.from(detectedErrors.entries())
+    .flatMap(([clusterName, resourceErrors]) => {
+      return resourceErrors.map(e => ({
+        clusterName,
+        error: e,
+      }));
+    })
     .sort(sortBySeverity);
 
   return (
diff --git a/plugins/kubernetes/src/components/KubernetesContent.tsx b/plugins/kubernetes/src/components/KubernetesContent.tsx
index a42e9fbb0b..63aa52f1ba 100644
--- a/plugins/kubernetes/src/components/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent.tsx
@@ -114,9 +114,8 @@ export const KubernetesContent = ({
                   const podsWithErrors = new Set<string>(
                     detectedErrors
                       .get(item.cluster.name)
-                      ?.filter(de => de.kind === 'Pod')
-                      .map(de => de.names)
-                      .flat() ?? [],
+                      ?.filter(de => de.sourceRef.kind === 'Pod')
+                      .map(de => de.sourceRef.name),
                   );
 
                   return (
diff --git a/plugins/kubernetes/src/error-detection/__fixtures__/pod-crashing.json b/plugins/kubernetes/src/error-detection/__fixtures__/pod-crashing.json
index 79acd2900d..bff3347813 100644
--- a/plugins/kubernetes/src/error-detection/__fixtures__/pod-crashing.json
+++ b/plugins/kubernetes/src/error-detection/__fixtures__/pod-crashing.json
@@ -185,7 +185,7 @@
         },
         "name": "other-side-car",
         "ready": false,
-        "restartCount": 38,
+        "restartCount": 123,
         "started": false,
         "state": {
           "waiting": {
diff --git a/plugins/kubernetes/src/error-detection/common.ts b/plugins/kubernetes/src/error-detection/common.ts
index bc5fd2fc40..381f57b71a 100644
--- a/plugins/kubernetes/src/error-detection/common.ts
+++ b/plugins/kubernetes/src/error-detection/common.ts
@@ -14,59 +14,15 @@
  * limitations under the License.
  */
 
-import {
-  DetectedError,
-  ErrorDetectable,
-  ErrorDetectableKind,
-  ErrorMapper,
-} from './types';
+import { DetectedError, ErrorMapper } from './types';
 
 // Run through the each error mapper for each object
 // returning a deduplicated (mostly) result
-export const detectErrorsInObjects = <T extends ErrorDetectable>(
+export const detectErrorsInObjects = <T>(
   objects: T[],
-  kind: ErrorDetectableKind,
-  clusterName: string,
   errorMappers: ErrorMapper<T>[],
 ): DetectedError[] => {
-  // Build up a map of errors
-  // key: the joined message produced by an error
-  // value: the error
-  const errors = new Map<string, DetectedError>();
-
-  for (const object of objects) {
-    for (const errorMapper of errorMappers) {
-      if (errorMapper.errorExists(object)) {
-        const message = errorMapper.messageAccessor(object);
-
-        // TODO This is not perfect as errors with uuid/hashes/date/times will not be caught by this
-        const dedupKey = message.join('');
-
-        const value = errors.get(dedupKey);
-
-        const name = object.metadata?.name ?? 'unknown';
-        const namespace = object.metadata?.namespace ?? 'unknown';
-
-        if (value !== undefined) {
-          // This gets translated into the Chip "+5 others"
-          // in the ErrorReporting component
-          // but we need to keep the names so we can easily
-          // find which objects owns the error later
-          value.names.push(name);
-          errors.set(dedupKey, value);
-        } else {
-          errors.set(dedupKey, {
-            cluster: clusterName,
-            kind: kind,
-            names: [name],
-            message: message,
-            severity: errorMapper.severity,
-            namespace,
-          });
-        }
-      }
-    }
-  }
-
-  return Array.from(errors.values());
+  return objects.flatMap(o => {
+    return errorMappers.flatMap(em => em.detectErrors(o));
+  });
 };
diff --git a/plugins/kubernetes/src/error-detection/deployments.ts b/plugins/kubernetes/src/error-detection/deployments.ts
index 896cd231ff..7807110224 100644
--- a/plugins/kubernetes/src/error-detection/deployments.ts
+++ b/plugins/kubernetes/src/error-detection/deployments.ts
@@ -15,35 +15,33 @@
  */
 
 import { DetectedError, ErrorMapper } from './types';
-import { V1Deployment } from '@kubernetes/client-node';
+import { Deployment } from 'kubernetes-models/apps/v1';
 import { detectErrorsInObjects } from './common';
 
-const deploymentErrorMappers: ErrorMapper<V1Deployment>[] = [
+const deploymentErrorMappers: ErrorMapper<Deployment>[] = [
   {
-    // this is probably important
-    severity: 6,
-    errorExplanation: 'condition-message-present',
-    errorExists: deployment => {
-      return (deployment.status?.conditions ?? [])
-        .filter(c => c.status === 'False')
-        .some(c => c.message !== undefined);
-    },
-    messageAccessor: deployment => {
+    detectErrors: deployment => {
       return (deployment.status?.conditions ?? [])
         .filter(c => c.status === 'False')
         .filter(c => c.message !== undefined)
-        .map(c => c.message ?? '');
+        .map(c => ({
+          type: 'condition-message-present',
+          message: c.message ?? '',
+          severity: 6,
+          proposedFix: [], // TODO next PR
+          sourceRef: {
+            name: deployment.metadata?.name ?? 'unknown hpa',
+            namespace: deployment.metadata?.namespace ?? 'unknown namespace',
+            kind: 'Deployment',
+            apiGroup: 'apps/v1',
+          },
+          occuranceCount: 1,
+        }));
     },
   },
 ];
 
 export const detectErrorsInDeployments = (
-  deployments: V1Deployment[],
-  clusterName: string,
+  deployments: Deployment[],
 ): DetectedError[] =>
-  detectErrorsInObjects(
-    deployments,
-    'Deployment',
-    clusterName,
-    deploymentErrorMappers,
-  );
+  detectErrorsInObjects(deployments, deploymentErrorMappers);
diff --git a/plugins/kubernetes/src/error-detection/error-detection.test.ts b/plugins/kubernetes/src/error-detection/error-detection.test.ts
index 2c6373f32d..e3b9e91f6b 100644
--- a/plugins/kubernetes/src/error-detection/error-detection.test.ts
+++ b/plugins/kubernetes/src/error-detection/error-detection.test.ts
@@ -147,51 +147,61 @@ describe('detectErrors', () => {
     const [err1, err2, err3, err4] = errors ?? [];
 
     expect(err1).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: [
-        'container=other-side-car restarted 38 times',
-        'container=side-car restarted 38 times',
-      ],
-      names: ['dice-roller-canary-7d64cd756c-55rfq'],
-      namespace: 'default',
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'dice-roller-canary-7d64cd756c-55rfq',
+        namespace: 'default',
+      },
+      message:
+        'back-off 5m0s restarting failed container=other-side-car pod=dice-roller-canary-7d64cd756c-55rfq_default(65ad28e3-5d51-4b4b-9bf8-4cb069803034)',
       severity: 4,
+      occuranceCount: 1,
+      proposedFix: [],
+      type: 'container-waiting',
     });
 
     expect(err2).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: [
-        'containers with unready status: [side-car other-side-car]',
-        'containers with unready status: [side-car other-side-car]',
-      ],
-      names: ['dice-roller-canary-7d64cd756c-55rfq'],
-      namespace: 'default',
-      severity: 5,
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'dice-roller-canary-7d64cd756c-55rfq',
+        namespace: 'default',
+      },
+      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,
+      proposedFix: [],
+      type: 'container-waiting',
     });
 
     expect(err3).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: [
-        'back-off 5m0s restarting failed container=other-side-car pod=dice-roller-canary-7d64cd756c-55rfq_default(65ad28e3-5d51-4b4b-9bf8-4cb069803034)',
-        'back-off 5m0s restarting failed container=side-car pod=dice-roller-canary-7d64cd756c-55rfq_default(65ad28e3-5d51-4b4b-9bf8-4cb069803034)',
-      ],
-      names: ['dice-roller-canary-7d64cd756c-55rfq'],
-      namespace: 'default',
-      severity: 6,
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'dice-roller-canary-7d64cd756c-55rfq',
+        namespace: 'default',
+      },
+      message: 'container=other-side-car restarted 123 times',
+      severity: 4,
+      occuranceCount: 123,
+      proposedFix: [],
+      type: 'containers-restarting',
     });
 
     expect(err4).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: [
-        'container=other-side-car exited with error code (1)',
-        'container=side-car exited with error code (1)',
-      ],
-      names: ['dice-roller-canary-7d64cd756c-55rfq'],
-      namespace: 'default',
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'dice-roller-canary-7d64cd756c-55rfq',
+        namespace: 'default',
+      },
+      message: 'container=side-car restarted 38 times',
       severity: 4,
+      occuranceCount: 38,
+      proposedFix: [],
+      type: 'containers-restarting',
     });
   });
   it('should detect errors in pod with missing Config Map', () => {
@@ -202,29 +212,22 @@ describe('detectErrors', () => {
     const errors = result.get(CLUSTER_NAME);
 
     expect(errors).toBeDefined();
-    expect(errors).toHaveLength(2);
+    expect(errors).toHaveLength(1);
 
-    const [err1, err2] = errors ?? [];
+    const [err1] = errors ?? [];
 
     expect(err1).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: [
-        'containers with unready status: [nginx]',
-        'containers with unready status: [nginx]',
-      ],
-      names: ['dice-roller-bad-cm-855bf85464-mg6xb'],
-      namespace: 'default',
-      severity: 5,
-    });
-
-    expect(err2).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Pod',
-      message: ['configmap "some-cm" not found'],
-      names: ['dice-roller-bad-cm-855bf85464-mg6xb'],
-      namespace: 'default',
-      severity: 6,
+      message: 'configmap "some-cm" not found',
+      occuranceCount: 1,
+      proposedFix: [],
+      severity: 4,
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'dice-roller-bad-cm-855bf85464-mg6xb',
+        namespace: 'default',
+      },
+      type: 'container-waiting',
     });
   });
   it('should detect no errors in healthy deployment', () => {
@@ -250,12 +253,17 @@ describe('detectErrors', () => {
     const [err1] = errors ?? [];
 
     expect(err1).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'Deployment',
-      message: ['Deployment does not have minimum availability.'],
-      names: ['dice-roller-canary'],
-      namespace: 'default',
+      sourceRef: {
+        apiGroup: 'apps/v1',
+        kind: 'Deployment',
+        name: 'dice-roller-canary',
+        namespace: 'default',
+      },
+      message: 'Deployment does not have minimum availability.',
       severity: 6,
+      occuranceCount: 1,
+      proposedFix: [],
+      type: 'condition-message-present',
     });
   });
   it('should detect no errors in healthy hpa', () => {
@@ -281,14 +289,159 @@ describe('detectErrors', () => {
     const [err1] = errors ?? [];
 
     expect(err1).toStrictEqual({
-      cluster: 'cluster-a',
-      kind: 'HorizontalPodAutoscaler',
-      message: [
+      sourceRef: {
+        apiGroup: 'autoscaling/v1',
+        kind: 'HorizontalPodAutoscaler',
+        name: 'dice-roller',
+        namespace: 'default',
+      },
+      message:
         'Current number of replicas (10) is equal to the configured max number of replicas (10)',
-      ],
-      names: ['dice-roller'],
-      namespace: 'default',
       severity: 8,
+      occuranceCount: 1,
+      proposedFix: [],
+      type: 'hpa-max-current-replicas',
+    });
+  });
+  it('pending pod is not an error', async () => {
+    const expiredReadiness = new Date();
+    expiredReadiness.setFullYear(expiredReadiness.getFullYear() - 1);
+    const result = await detectErrors(
+      onePod({
+        spec: {
+          containers: [
+            {
+              name: 'some-container',
+              readinessProbe: {
+                initialDelaySeconds: 20000,
+                failureThreshold: 5,
+                periodSeconds: 5,
+              },
+            },
+          ],
+        },
+        status: {
+          containerStatuses: [
+            {
+              name: 'some-container',
+              image: 'some-image',
+              imageID: 'some-image-id',
+              restartCount: 0,
+              containerID: 'running-container',
+              ready: false,
+              state: {
+                running: {
+                  startedAt: new Date().toISOString() as any,
+                },
+              },
+            },
+          ],
+          message: 'Container running',
+        },
+      }),
+    );
+
+    const errors = result.get(CLUSTER_NAME);
+
+    expect(errors).toBeDefined();
+    expect(errors).toHaveLength(0);
+  });
+  it('no probe pod has no errors', async () => {
+    const expiredReadiness = new Date();
+    expiredReadiness.setFullYear(expiredReadiness.getFullYear() - 1);
+    const result = await detectErrors(
+      onePod({
+        spec: {
+          containers: [
+            {
+              name: 'some-container',
+            },
+          ],
+        },
+        status: {
+          containerStatuses: [
+            {
+              name: 'some-container',
+              image: 'some-image',
+              imageID: 'some-image-id',
+              restartCount: 0,
+              containerID: 'running-container',
+              ready: false,
+              state: {
+                running: {
+                  startedAt: new Date().toISOString() as any,
+                },
+              },
+            },
+          ],
+          message: 'Container running',
+        },
+      }),
+    );
+
+    const errors = result.get(CLUSTER_NAME);
+
+    expect(errors).toBeDefined();
+    expect(errors).toHaveLength(0);
+  });
+  it('readiness probe failure results in error', async () => {
+    const expiredReadiness = new Date();
+    expiredReadiness.setFullYear(expiredReadiness.getFullYear() - 1);
+    const result = await detectErrors(
+      onePod({
+        spec: {
+          containers: [
+            {
+              name: 'some-container',
+              readinessProbe: {
+                initialDelaySeconds: 20,
+                failureThreshold: 5,
+                periodSeconds: 5,
+              },
+            },
+          ],
+        },
+        status: {
+          containerStatuses: [
+            {
+              name: 'some-container',
+              image: 'some-image',
+              imageID: 'some-image-id',
+              restartCount: 0,
+              containerID: 'running-container',
+              ready: false,
+              state: {
+                running: {
+                  startedAt: expiredReadiness.toISOString() as any,
+                },
+              },
+            },
+          ],
+          message: 'Container running',
+        },
+      }),
+    );
+
+    const errors = result.get(CLUSTER_NAME);
+
+    expect(errors).toBeDefined();
+    expect(errors).toHaveLength(1);
+
+    const [err1] = errors ?? [];
+
+    expect(err1).toStrictEqual({
+      message:
+        'The container some-container failed to start properly, but is not crashing',
+      occuranceCount: 1,
+      proposedFix: [],
+      severity: 4,
+      sourceRef: {
+        apiGroup: 'v1',
+        kind: 'Pod',
+        name: 'unknown pod',
+        namespace: 'unknown namespace',
+      },
+      type: 'readiness-probe-taking-too-long',
     });
   });
 });
diff --git a/plugins/kubernetes/src/error-detection/error-detection.ts b/plugins/kubernetes/src/error-detection/error-detection.ts
index fddd4d838a..c33de18b80 100644
--- a/plugins/kubernetes/src/error-detection/error-detection.ts
+++ b/plugins/kubernetes/src/error-detection/error-detection.ts
@@ -20,6 +20,9 @@ import { groupResponses } from '../utils/response';
 import { detectErrorsInPods } from './pods';
 import { detectErrorsInDeployments } from './deployments';
 import { detectErrorsInHpa } from './hpas';
+import { Deployment } from 'kubernetes-models/apps/v1';
+import { HorizontalPodAutoscaler } from 'kubernetes-models/autoscaling/v1';
+import { Pod } from 'kubernetes-models/v1';
 
 /**
  * For each cluster try to find errors in each of the object types provided
@@ -38,20 +41,16 @@ export const detectErrors = (
     const groupedResponses = groupResponses(clusterResponse.resources);
 
     clusterErrors = clusterErrors.concat(
-      detectErrorsInPods(groupedResponses.pods, clusterResponse.cluster.name),
+      detectErrorsInPods(groupedResponses.pods as Pod[]),
     );
 
     clusterErrors = clusterErrors.concat(
-      detectErrorsInDeployments(
-        groupedResponses.deployments,
-        clusterResponse.cluster.name,
-      ),
+      detectErrorsInDeployments(groupedResponses.deployments as Deployment[]),
     );
 
     clusterErrors = clusterErrors.concat(
       detectErrorsInHpa(
-        groupedResponses.horizontalPodAutoscalers,
-        clusterResponse.cluster.name,
+        groupedResponses.horizontalPodAutoscalers as HorizontalPodAutoscaler[],
       ),
     );
 
diff --git a/plugins/kubernetes/src/error-detection/hpas.ts b/plugins/kubernetes/src/error-detection/hpas.ts
index dd4674a7d0..2dc5e30ce6 100644
--- a/plugins/kubernetes/src/error-detection/hpas.ts
+++ b/plugins/kubernetes/src/error-detection/hpas.ts
@@ -14,37 +14,39 @@
  * limitations under the License.
  */
 
-import { V1HorizontalPodAutoscaler } from '@kubernetes/client-node';
+import { HorizontalPodAutoscaler } from 'kubernetes-models/autoscaling/v1';
 import { DetectedError, ErrorMapper } from './types';
 import { detectErrorsInObjects } from './common';
 
-const hpaErrorMappers: ErrorMapper<V1HorizontalPodAutoscaler>[] = [
+const hpaErrorMappers: ErrorMapper<HorizontalPodAutoscaler>[] = [
   {
-    // this is probably important
-    severity: 8,
-    errorExplanation: 'hpa-max-current-replicas',
-    errorExists: hpa => {
-      return (hpa.spec?.maxReplicas ?? -1) === hpa.status?.currentReplicas;
-    },
-    messageAccessor: hpa => {
-      return [
-        `Current number of replicas (${
-          hpa.status?.currentReplicas
-        }) is equal to the configured max number of replicas (${
-          hpa.spec?.maxReplicas ?? -1
-        })`,
-      ];
+    detectErrors: hpa => {
+      if ((hpa.spec?.maxReplicas ?? -1) === hpa.status?.currentReplicas) {
+        return [
+          {
+            type: 'hpa-max-current-replicas',
+            message: `Current number of replicas (${
+              hpa.status?.currentReplicas
+            }) is equal to the configured max number of replicas (${
+              hpa.spec?.maxReplicas ?? -1
+            })`,
+            severity: 8,
+            proposedFix: [], // TODO next PR
+            sourceRef: {
+              name: hpa.metadata?.name ?? 'unknown hpa',
+              namespace: hpa.metadata?.namespace ?? 'unknown namespace',
+              kind: 'HorizontalPodAutoscaler',
+              apiGroup: 'autoscaling/v1',
+            },
+            occuranceCount: 1,
+          },
+        ];
+      }
+      return [];
     },
   },
 ];
 
 export const detectErrorsInHpa = (
-  hpas: V1HorizontalPodAutoscaler[],
-  clusterName: string,
-): DetectedError[] =>
-  detectErrorsInObjects(
-    hpas,
-    'HorizontalPodAutoscaler',
-    clusterName,
-    hpaErrorMappers,
-  );
+  hpas: HorizontalPodAutoscaler[],
+): DetectedError[] => detectErrorsInObjects(hpas, hpaErrorMappers);
diff --git a/plugins/kubernetes/src/error-detection/index.ts b/plugins/kubernetes/src/error-detection/index.ts
index ced03066a7..67bfb70f3b 100644
--- a/plugins/kubernetes/src/error-detection/index.ts
+++ b/plugins/kubernetes/src/error-detection/index.ts
@@ -15,7 +15,6 @@
  */
 
 export type {
-  ErrorDetectableKind,
   DetectedError,
   DetectedErrorsByCluster,
   ErrorSeverity,
diff --git a/plugins/kubernetes/src/error-detection/pods.ts b/plugins/kubernetes/src/error-detection/pods.ts
index 1ad6e3485f..a85276eaa2 100644
--- a/plugins/kubernetes/src/error-detection/pods.ts
+++ b/plugins/kubernetes/src/error-detection/pods.ts
@@ -14,82 +14,121 @@
  * limitations under the License.
  */
 
-import { V1Pod } from '@kubernetes/client-node';
-import { totalRestarts } from '../utils/pod';
+import { Pod, IContainerStatus, IContainer } from 'kubernetes-models/v1';
 import { DetectedError, ErrorMapper } from './types';
 import { detectErrorsInObjects } from './common';
+import lodash from 'lodash';
+import { DateTime } from 'luxon';
 
-const podErrorMappers: ErrorMapper<V1Pod>[] = [
+function isPodReadinessProbeUnready({
+  container,
+  containerStatus,
+}: ContainerSpecAndStatus): boolean {
+  if (
+    containerStatus.ready ||
+    containerStatus.state?.running?.startedAt === undefined ||
+    !container.readinessProbe
+  ) {
+    return false;
+  }
+  const startDateTime = DateTime.fromISO(
+    containerStatus.state?.running?.startedAt,
+  )
+    // Add initial delay
+    .plus({
+      seconds: container.readinessProbe?.initialDelaySeconds ?? 0,
+    })
+    // Add failure threshold
+    .plus({
+      seconds:
+        (container.readinessProbe?.periodSeconds ?? 0) *
+        (container.readinessProbe?.failureThreshold ?? 0),
+    });
+  return startDateTime < DateTime.now();
+}
+
+interface ContainerSpecAndStatus {
+  container: IContainer;
+  containerStatus: IContainerStatus;
+}
+
+const podToContainerSpecsAndStatuses = (pod: Pod): ContainerSpecAndStatus[] => {
+  const specs = lodash.groupBy(pod.spec?.containers ?? [], value => value.name);
+
+  const result: ContainerSpecAndStatus[] = [];
+
+  for (const cs of pod.status?.containerStatuses ?? []) {
+    const spec = specs[cs.name];
+    if (spec.length > 0) {
+      result.push({
+        container: spec[0],
+        containerStatus: cs,
+      });
+    }
+  }
+
+  return result;
+};
+
+const podErrorMappers: ErrorMapper<Pod>[] = [
   {
-    severity: 5,
-    errorExplanation: 'status-message',
-    errorExists: pod => {
-      return pod.status?.message !== undefined;
-    },
-    messageAccessor: pod => {
-      return [pod.status?.message ?? ''];
+    detectErrors: pod => {
+      return podToContainerSpecsAndStatuses(pod)
+        .filter(isPodReadinessProbeUnready)
+        .map(cs => ({
+          type: 'readiness-probe-taking-too-long',
+          message: `The container ${cs.container.name} failed to start properly, but is not crashing`,
+          severity: 4,
+          proposedFix: [], // TODO next PR
+          sourceRef: {
+            name: pod.metadata?.name ?? 'unknown pod',
+            namespace: pod.metadata?.namespace ?? 'unknown namespace',
+            kind: 'Pod',
+            apiGroup: 'v1',
+          },
+          occuranceCount: 1,
+        }));
     },
   },
   {
-    severity: 4,
-    errorExplanation: 'containers-restarting',
-    errorExists: pod => {
-      // TODO magic number
-      return totalRestarts(pod) > 3;
-    },
-    messageAccessor: pod => {
-      return (pod.status?.containerStatuses ?? [])
-        .filter(cs => cs.restartCount > 0)
-        .map(cs => `container=${cs.name} restarted ${cs.restartCount} times`);
-    },
-  },
-  {
-    severity: 5,
-    errorExplanation: 'condition-message-present',
-    errorExists: pod => {
-      return (pod.status?.conditions ?? []).some(c => c.message !== undefined);
-    },
-    messageAccessor: pod => {
-      return (pod.status?.conditions ?? [])
-        .filter(c => c.message !== undefined)
-        .map(c => c.message ?? '');
-    },
-  },
-  {
-    severity: 6,
-    errorExplanation: 'container-waiting',
-    errorExists: pod => {
-      return (pod.status?.containerStatuses ?? []).some(
-        cs => cs.state?.waiting?.message !== undefined,
-      );
-    },
-    messageAccessor: pod => {
+    detectErrors: pod => {
       return (pod.status?.containerStatuses ?? [])
         .filter(cs => cs.state?.waiting?.message !== undefined)
-        .map(cs => cs.state?.waiting?.message ?? '');
+        .map(cs => ({
+          type: 'container-waiting',
+          message: cs.state?.waiting?.message ?? 'container waiting',
+          severity: 4,
+          proposedFix: [], // TODO next PR
+          sourceRef: {
+            name: pod.metadata?.name ?? 'unknown pod',
+            namespace: pod.metadata?.namespace ?? 'unknown namespace',
+            kind: 'Pod',
+            apiGroup: 'v1',
+          },
+          occuranceCount: 1,
+        }));
     },
   },
   {
-    severity: 4,
-    errorExplanation: 'container-last-state-error',
-    errorExists: pod => {
-      return (pod.status?.containerStatuses ?? []).some(
-        cs => (cs.lastState?.terminated?.reason ?? '') === 'Error',
-      );
-    },
-    messageAccessor: pod => {
+    detectErrors: pod => {
       return (pod.status?.containerStatuses ?? [])
-        .filter(cs => (cs.lastState?.terminated?.reason ?? '') === 'Error')
-        .map(
-          cs =>
-            `container=${cs.name} exited with error code (${cs.lastState?.terminated?.exitCode})`,
-        );
+        .filter(cs => cs.restartCount > 0)
+        .map(cs => ({
+          type: 'containers-restarting',
+          message: `container=${cs.name} restarted ${cs.restartCount} times`,
+          severity: 4,
+          proposedFix: [], // TODO next PR
+          sourceRef: {
+            name: pod.metadata?.name ?? 'unknown pod',
+            namespace: pod.metadata?.namespace ?? 'unknown namespace',
+            kind: 'Pod',
+            apiGroup: 'v1',
+          },
+          occuranceCount: cs.restartCount,
+        }));
     },
   },
 ];
 
-export const detectErrorsInPods = (
-  pods: V1Pod[],
-  clusterName: string,
-): DetectedError[] =>
-  detectErrorsInObjects(pods, 'Pod', clusterName, podErrorMappers);
+export const detectErrorsInPods = (pods: Pod[]): DetectedError[] =>
+  detectErrorsInObjects(pods, podErrorMappers);
diff --git a/plugins/kubernetes/src/error-detection/types.ts b/plugins/kubernetes/src/error-detection/types.ts
index 4bc7ae164d..3698d9bc68 100644
--- a/plugins/kubernetes/src/error-detection/types.ts
+++ b/plugins/kubernetes/src/error-detection/types.ts
@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-// Higher is more sever, but it's relative
-import {
-  V1Deployment,
-  V1HorizontalPodAutoscaler,
-  V1Pod,
-} from '@kubernetes/client-node';
-
 /**
  * Severity of the error, where 10 is critical and 0 is very low.
  *
@@ -28,18 +21,6 @@ import {
  */
 export type ErrorSeverity = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
 
-export type ErrorDetectable = V1Pod | V1Deployment | V1HorizontalPodAutoscaler;
-
-/**
- * Kubernetes kinds that errors might be reported by the plugin
- *
- * @public
- */
-export type ErrorDetectableKind =
-  | 'Pod'
-  | 'Deployment'
-  | 'HorizontalPodAutoscaler';
-
 /**
  * A list of errors keyed by Cluster name
  *
@@ -47,23 +28,51 @@ export type ErrorDetectableKind =
  */
 export type DetectedErrorsByCluster = Map<string, DetectedError[]>;
 
+export interface ResourceRef {
+  name: string;
+  namespace: string;
+  kind: string;
+  apiGroup: string;
+}
+
 /**
  * Represents an error found on a Kubernetes object
  *
  * @public
  */
 export interface DetectedError {
+  type: string;
   severity: ErrorSeverity;
-  cluster: string;
-  namespace: string;
-  kind: ErrorDetectableKind;
-  names: string[];
-  message: string[];
+  message: string;
+  proposedFix: ProposedFix[];
+  sourceRef: ResourceRef;
+  occuranceCount: number;
 }
 
-export interface ErrorMapper<T extends ErrorDetectable> {
-  severity: ErrorSeverity;
-  errorExplanation: string;
-  errorExists: (object: T) => boolean;
-  messageAccessor: (object: T) => string[];
+type ProposedFix = LogSolution | DocsSolution | EventsSolution;
+
+interface ProposedFixBase {
+  errorType: string;
+  rootCauseExplanation: string;
+  possibleFixes: string[];
+}
+
+export interface LogSolution extends ProposedFixBase {
+  type: 'logs';
+  container: string;
+}
+
+export interface DocsSolution extends ProposedFixBase {
+  type: 'docs';
+  docsLink: string;
+}
+
+export interface EventsSolution extends ProposedFixBase {
+  type: 'events';
+  docsLink: string;
+  podName: string;
+}
+
+export interface ErrorMapper<T> {
+  detectErrors: (resource: T) => DetectedError[];
 }
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.ts b/plugins/kubernetes/src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.ts
index 058ecf07a3..5652549b8a 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.ts
@@ -28,9 +28,7 @@ export class GoogleKubernetesAuthProvider implements KubernetesAuthProvider {
   async decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody> {
-    const googleAuthToken: string = await this.authProvider.getAccessToken(
-      'https://www.googleapis.com/auth/cloud-platform',
-    );
+    const googleAuthToken: string = (await this.getCredentials()).token;
     if ('auth' in requestBody) {
       requestBody.auth!.google = googleAuthToken;
     } else {
@@ -38,4 +36,11 @@ export class GoogleKubernetesAuthProvider implements KubernetesAuthProvider {
     }
     return requestBody;
   }
+  async getCredentials(): Promise<{ token: string }> {
+    return {
+      token: await this.authProvider.getAccessToken(
+        'https://www.googleapis.com/auth/cloud-platform',
+      ),
+    };
+  }
 }
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
index eb3ea456ea..836641f1ed 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts
@@ -91,4 +91,22 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
       `authProvider "${authProvider}" has no KubernetesAuthProvider defined for it`,
     );
   }
+
+  async getCredentials(authProvider: string): Promise<{ token?: string }> {
+    const kubernetesAuthProvider: KubernetesAuthProvider | undefined =
+      this.kubernetesAuthProviderMap.get(authProvider);
+
+    if (kubernetesAuthProvider) {
+      return await kubernetesAuthProvider.getCredentials();
+    }
+
+    if (authProvider.startsWith('oidc.')) {
+      throw new Error(
+        `KubernetesAuthProviders has no oidcProvider configured for ${authProvider}`,
+      );
+    }
+    throw new Error(
+      `authProvider "${authProvider}" has no KubernetesAuthProvider defined for it`,
+    );
+  }
 }
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/OidcKubernetesAuthProvider.ts b/plugins/kubernetes/src/kubernetes-auth-provider/OidcKubernetesAuthProvider.ts
index f86df5e73e..bd5760bde2 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/OidcKubernetesAuthProvider.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/OidcKubernetesAuthProvider.ts
@@ -30,7 +30,7 @@ export class OidcKubernetesAuthProvider implements KubernetesAuthProvider {
   async decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody> {
-    const authToken: string = await this.authProvider.getIdToken();
+    const authToken: string = (await this.getCredentials()).token;
     const auth = { ...requestBody.auth };
     if (auth.oidc) {
       auth.oidc[this.providerName] = authToken;
@@ -40,4 +40,10 @@ export class OidcKubernetesAuthProvider implements KubernetesAuthProvider {
     requestBody.auth = auth;
     return requestBody;
   }
+
+  async getCredentials(): Promise<{ token: string }> {
+    return {
+      token: await this.authProvider.getIdToken(),
+    };
+  }
 }
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/ServerSideAuthProvider.ts b/plugins/kubernetes/src/kubernetes-auth-provider/ServerSideAuthProvider.ts
index 1c475b9568..f71809f6a6 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/ServerSideAuthProvider.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/ServerSideAuthProvider.ts
@@ -31,4 +31,8 @@ export class ServerSideKubernetesAuthProvider
     // No-op, auth will be taken care of on the server-side
     return requestBody;
   }
+
+  async getCredentials(): Promise<{}> {
+    return {};
+  }
 }
diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/types.ts b/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
index ffa0fd5961..418758dd31 100644
--- a/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
+++ b/plugins/kubernetes/src/kubernetes-auth-provider/types.ts
@@ -21,6 +21,7 @@ export interface KubernetesAuthProvider {
   decorateRequestBodyForAuth(
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  getCredentials(): Promise<{ token?: string }>;
 }
 
 export const kubernetesAuthProvidersApiRef =
@@ -33,4 +34,5 @@ export interface KubernetesAuthProvidersApi {
     authProvider: string,
     requestBody: KubernetesRequestBody,
   ): Promise<KubernetesRequestBody>;
+  getCredentials(authProvider: string): Promise<{ token?: string }>;
 }
diff --git a/plugins/kubernetes/src/plugin.ts b/plugins/kubernetes/src/plugin.ts
index e2b13f43fe..cb85cf06fb 100644
--- a/plugins/kubernetes/src/plugin.ts
+++ b/plugins/kubernetes/src/plugin.ts
@@ -43,9 +43,14 @@ export const kubernetesPlugin = createPlugin({
       deps: {
         discoveryApi: discoveryApiRef,
         identityApi: identityApiRef,
+        kubernetesAuthProvidersApi: kubernetesAuthProvidersApiRef,
       },
-      factory: ({ discoveryApi, identityApi }) =>
-        new KubernetesBackendClient({ discoveryApi, identityApi }),
+      factory: ({ discoveryApi, identityApi, kubernetesAuthProvidersApi }) =>
+        new KubernetesBackendClient({
+          discoveryApi,
+          identityApi,
+          kubernetesAuthProvidersApi,
+        }),
     }),
     createApiFactory({
       api: kubernetesAuthProvidersApiRef,
diff --git a/plugins/kubernetes/src/setupTests.ts b/plugins/kubernetes/src/setupTests.ts
index a373310a1a..f7752030ed 100644
--- a/plugins/kubernetes/src/setupTests.ts
+++ b/plugins/kubernetes/src/setupTests.ts
@@ -16,6 +16,7 @@
 import '@testing-library/jest-dom';
 // eslint-disable-next-line no-restricted-imports
 import { TextDecoder, TextEncoder } from 'util';
+import 'cross-fetch/polyfill';
 
 // These are missing from jest-node, so not available on global.
 Object.defineProperty(global, 'TextEncoder', {
diff --git a/plugins/lighthouse-backend/CHANGELOG.md b/plugins/lighthouse-backend/CHANGELOG.md
index 36cd9f849b..b81976794d 100644
--- a/plugins/lighthouse-backend/CHANGELOG.md
+++ b/plugins/lighthouse-backend/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-lighthouse-backend
 
+## 0.2.0-next.3
+
+### Minor Changes
+
+- 7a89555e73d: Lighthouse backend plugin can now use an authenticated catalog backend API.
+
+  - Breaking \* You must now pass the `tokenManager` to the lighthouse `createScheduler`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-lighthouse-common@0.1.1
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/lighthouse-backend/api-report.md b/plugins/lighthouse-backend/api-report.md
index a91e47dfc5..b8c028f3dc 100644
--- a/plugins/lighthouse-backend/api-report.md
+++ b/plugins/lighthouse-backend/api-report.md
@@ -7,6 +7,7 @@ import { CatalogClient } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { Logger } from 'winston';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
+import { TokenManager } from '@backstage/backend-common';
 
 // @public (undocumented)
 export interface CreateLighthouseSchedulerOptions {
@@ -18,6 +19,8 @@ export interface CreateLighthouseSchedulerOptions {
   logger: Logger;
   // (undocumented)
   scheduler?: PluginTaskScheduler;
+  // (undocumented)
+  tokenManager: TokenManager;
 }
 
 // @public (undocumented)
diff --git a/plugins/lighthouse-backend/package.json b/plugins/lighthouse-backend/package.json
index 8f8d6ba3d0..cdef24b08c 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.1.2-next.1",
+  "version": "0.2.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/lighthouse-backend/src/service/EntitiesLoader.ts b/plugins/lighthouse-backend/src/service/EntitiesLoader.ts
index fe9aab48cc..c20b95beae 100644
--- a/plugins/lighthouse-backend/src/service/EntitiesLoader.ts
+++ b/plugins/lighthouse-backend/src/service/EntitiesLoader.ts
@@ -18,15 +18,24 @@ import {
   CatalogClient,
   CATALOG_FILTER_EXISTS,
 } from '@backstage/catalog-client';
+import { TokenManager } from '@backstage/backend-common';
 
-export async function loadLighthouseEntities(catalogClient: CatalogClient) {
+export async function loadLighthouseEntities(
+  catalogClient: CatalogClient,
+  tokenManager: TokenManager,
+) {
   const filter: Record<string, symbol | string> = {
     kind: 'Component',
     'spec.type': 'website',
     ['lighthouse.com/website-url']: CATALOG_FILTER_EXISTS,
   };
 
-  return await catalogClient.getEntities({
-    filter: [filter],
-  });
+  const { token } = await tokenManager.getToken();
+
+  return await catalogClient.getEntities(
+    {
+      filter: [filter],
+    },
+    { token },
+  );
 }
diff --git a/plugins/lighthouse-backend/src/service/plugin.ts b/plugins/lighthouse-backend/src/service/plugin.ts
index 8e8952a3d6..089f20f4ed 100644
--- a/plugins/lighthouse-backend/src/service/plugin.ts
+++ b/plugins/lighthouse-backend/src/service/plugin.ts
@@ -24,6 +24,7 @@ import { Config } from '@backstage/config';
 import { LighthouseRestApi } from '@backstage/plugin-lighthouse-common';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import { LighthouseAuditScheduleImpl } from '../config';
+import { TokenManager } from '@backstage/backend-common';
 
 /** @public **/
 export interface CreateLighthouseSchedulerOptions {
@@ -31,13 +32,14 @@ export interface CreateLighthouseSchedulerOptions {
   config: Config;
   scheduler?: PluginTaskScheduler;
   catalogClient: CatalogClient;
+  tokenManager: TokenManager;
 }
 
 /** @public **/
 export async function createScheduler(
   options: CreateLighthouseSchedulerOptions,
 ) {
-  const { logger, scheduler, catalogClient, config } = options;
+  const { logger, scheduler, catalogClient, config, tokenManager } = options;
   const lighthouseApi = LighthouseRestApi.fromConfig(config);
 
   const lighthouseAuditConfig = LighthouseAuditScheduleImpl.fromConfig(config);
@@ -77,9 +79,13 @@ export async function createScheduler(
 
         logger.info('Running Lighthouse Audit Task');
 
-        const websitesWithUrl = await catalogClient.getEntities({
-          filter: [filter],
-        });
+        const { token } = await tokenManager.getToken();
+        const websitesWithUrl = await catalogClient.getEntities(
+          {
+            filter: [filter],
+          },
+          { token },
+        );
 
         let index = 0;
         for (const entity of websitesWithUrl.items) {
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index dd360eaed6..2ec9f48db9 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-lighthouse
 
+## 0.4.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-lighthouse-common@0.1.1
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-lighthouse-common@0.1.1
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 8447d09fa3..eb760e3b54 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.2-next.1",
+  "version": "0.4.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/linguist-backend/CHANGELOG.md b/plugins/linguist-backend/CHANGELOG.md
index eb5126e41e..264bd17528 100644
--- a/plugins/linguist-backend/CHANGELOG.md
+++ b/plugins/linguist-backend/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-linguist-backend
 
+## 0.2.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-linguist-common@0.1.0
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/linguist-backend/package.json b/plugins/linguist-backend/package.json
index fad77875f2..a70d53274c 100644
--- a/plugins/linguist-backend/package.json
+++ b/plugins/linguist-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-linguist-backend",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/linguist/CHANGELOG.md b/plugins/linguist/CHANGELOG.md
index 80a139fe11..8225416773 100644
--- a/plugins/linguist/CHANGELOG.md
+++ b/plugins/linguist/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-linguist
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-linguist-common@0.1.0
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-linguist-common@0.1.0
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/linguist/package.json b/plugins/linguist/package.json
index cf36485ae8..4c66166a41 100644
--- a/plugins/linguist/package.json
+++ b/plugins/linguist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-linguist",
-  "version": "0.1.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/microsoft-calendar/CHANGELOG.md b/plugins/microsoft-calendar/CHANGELOG.md
index 8a2d3b894f..3d49a963b3 100644
--- a/plugins/microsoft-calendar/CHANGELOG.md
+++ b/plugins/microsoft-calendar/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-microsoft-calendar
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/microsoft-calendar/package.json b/plugins/microsoft-calendar/package.json
index a80135c82e..031a0d1076 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.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/newrelic-dashboard/CHANGELOG.md b/plugins/newrelic-dashboard/CHANGELOG.md
index f15716e74d..134cedf743 100644
--- a/plugins/newrelic-dashboard/CHANGELOG.md
+++ b/plugins/newrelic-dashboard/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-newrelic-dashboard
 
+## 0.2.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+
 ## 0.2.10-next.1
 
 ### Patch Changes
diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json
index 2771719ec4..3035688c41 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.10-next.1",
+  "version": "0.2.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index 2dedb044cb..479d05a8fa 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-newrelic
 
+## 0.3.35-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.3.35-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.3.35-next.1
 
 ### Patch Changes
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 498a3e5d17..9d8313b721 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.35-next.1",
+  "version": "0.3.35-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/octopus-deploy/CHANGELOG.md b/plugins/octopus-deploy/CHANGELOG.md
index c247e33fd2..b578e70c66 100644
--- a/plugins/octopus-deploy/CHANGELOG.md
+++ b/plugins/octopus-deploy/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-octopus-deploy
 
+## 0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/plugins/octopus-deploy/package.json b/plugins/octopus-deploy/package.json
index b4ae8d397d..dfafd919ea 100644
--- a/plugins/octopus-deploy/package.json
+++ b/plugins/octopus-deploy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-octopus-deploy",
-  "version": "0.1.1-next.1",
+  "version": "0.1.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index 2a8dcc26e5..3fb7a0799b 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-org-react
 
+## 0.1.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.6-next.1
 
 ### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index f778a1195b..70c7467e5b 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.6-next.1",
+  "version": "0.1.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 95115dbcf2..bf6558c741 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-org
 
+## 0.6.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.6.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.6.7-next.1
 
 ### Patch Changes
diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md
index e950b1bc8b..1111253119 100644
--- a/plugins/org/api-report.md
+++ b/plugins/org/api-report.md
@@ -28,6 +28,7 @@ export const EntityOwnershipCard: (props: {
   entityFilterKind?: string[] | undefined;
   hideRelationsToggle?: boolean | undefined;
   relationsType?: string | undefined;
+  entityLimit?: number | undefined;
 }) => JSX.Element;
 
 // @public (undocumented)
@@ -73,6 +74,7 @@ export const OwnershipCard: (props: {
   entityFilterKind?: string[];
   hideRelationsToggle?: boolean;
   relationsType?: string;
+  entityLimit?: number;
 }) => JSX.Element;
 
 // @public (undocumented)
diff --git a/plugins/org/package.json b/plugins/org/package.json
index a432e25edf..c7926397af 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.7-next.1",
+  "version": "0.6.7-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx b/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
index dbd569abff..b0b4abc1a5 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/ComponentsGrid.tsx
@@ -110,11 +110,13 @@ export const ComponentsGrid = ({
   relationsType,
   isGroup,
   entityFilterKind,
+  entityLimit = 6,
 }: {
   entity: Entity;
   relationsType: string;
   isGroup: boolean;
   entityFilterKind?: string[];
+  entityLimit?: number;
 }) => {
   const catalogLink = useRouteRef(catalogIndexRouteRef);
   const { componentsWithCounters, loading, error } = useGetEntities(
@@ -122,6 +124,7 @@ export const ComponentsGrid = ({
     relationsType,
     isGroup,
     entityFilterKind,
+    entityLimit,
   );
 
   if (loading) {
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
index fc050feb2a..67cd512d72 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx
@@ -79,12 +79,22 @@ const makeComponent = ({ type, name }: { type: string; name: string }) => ({
   ],
 });
 
-const serviceA = makeComponent({ type: 'service', name: 'service-a' });
-const serviceB = makeComponent({ type: 'service', name: 'service-a' });
-const websiteA = makeComponent({ type: 'website', name: 'website-a' });
+const types = [
+  'service',
+  'website',
+  'api',
+  'playlist',
+  'grpc',
+  'trpc',
+  'library',
+];
+
+const components = types.map((type, index) =>
+  makeComponent({ type, name: `${type}-${index}` }),
+);
 
 const catalogApi: Partial<CatalogApi> = {
-  getEntities: () => Promise.resolve({ items: [serviceA, serviceB, websiteA] }),
+  getEntities: () => Promise.resolve({ items: components }),
 };
 
 const apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
@@ -138,3 +148,26 @@ export const Themed = () =>
       mountedRoutes: { '/catalog': catalogIndexRouteRef },
     },
   );
+
+export const WithVariableEntityList = {
+  argTypes: {
+    entityLimit: {
+      control: { type: 'number' },
+    },
+  },
+  render: ({ entityLimit }: { entityLimit: number }) =>
+    wrapInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={defaultEntity}>
+          <Grid container spacing={4}>
+            <Grid item xs={12} md={6}>
+              <OwnershipCard entityLimit={entityLimit} />
+            </Grid>
+          </Grid>
+        </EntityProvider>
+      </ApiProvider>,
+      {
+        mountedRoutes: { '/catalog': catalogIndexRouteRef },
+      },
+    ),
+};
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index 1cb52a4762..d104eb032d 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -57,9 +57,15 @@ export const OwnershipCard = (props: {
   entityFilterKind?: string[];
   hideRelationsToggle?: boolean;
   relationsType?: string;
+  entityLimit?: number;
 }) => {
-  const { variant, entityFilterKind, hideRelationsToggle, relationsType } =
-    props;
+  const {
+    variant,
+    entityFilterKind,
+    hideRelationsToggle,
+    relationsType,
+    entityLimit = 6,
+  } = props;
   const relationsToggle =
     hideRelationsToggle === undefined ? false : hideRelationsToggle;
   const classes = useStyles();
@@ -106,6 +112,7 @@ export const OwnershipCard = (props: {
       )}
       <ComponentsGrid
         entity={entity}
+        entityLimit={entityLimit}
         relationsType={getRelationsType}
         isGroup={isGroup}
         entityFilterKind={entityFilterKind}
diff --git a/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
index c928d9b55f..a59f534300 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
+++ b/plugins/org/src/components/Cards/OwnershipCard/useGetEntities.ts
@@ -130,6 +130,7 @@ export function useGetEntities(
   relationsType: string,
   isGroup: boolean,
   entityFilterKind?: string[],
+  entityLimit = 6,
 ): {
   componentsWithCounters:
     | {
@@ -189,8 +190,8 @@ export function useGetEntities(
       [],
     );
 
-    // Return top N (six) entities to be displayed in ownership boxes
-    const topN = counts.sort((a, b) => b.count - a.count).slice(0, 6);
+    // Return top N (entityLimit) entities to be displayed in ownership boxes
+    const topN = counts.sort((a, b) => b.count - a.count).slice(0, entityLimit);
 
     return topN.map(topOwnedEntity => ({
       counter: topOwnedEntity.count,
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index 10183ec985..d2ab4cfd1a 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-pagerduty
 
+## 0.5.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.5.10-next.1
 
 ### Patch Changes
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 159ad4953e..a587cbfc37 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-pagerduty",
   "description": "A Backstage plugin that integrates towards PagerDuty",
-  "version": "0.5.10-next.1",
+  "version": "0.5.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/periskop-backend/CHANGELOG.md b/plugins/periskop-backend/CHANGELOG.md
index 7030940a58..260f57eb6a 100644
--- a/plugins/periskop-backend/CHANGELOG.md
+++ b/plugins/periskop-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-periskop-backend
 
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+
 ## 0.1.15-next.1
 
 ### Patch Changes
diff --git a/plugins/periskop-backend/package.json b/plugins/periskop-backend/package.json
index 7a3e481a02..83e97b0234 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.15-next.1",
+  "version": "0.1.15-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/periskop/CHANGELOG.md b/plugins/periskop/CHANGELOG.md
index c4970c12ab..5f91824e62 100644
--- a/plugins/periskop/CHANGELOG.md
+++ b/plugins/periskop/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-periskop
 
+## 0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.15-next.1
 
 ### Patch Changes
diff --git a/plugins/periskop/package.json b/plugins/periskop/package.json
index d745bd7d24..738fdca55c 100644
--- a/plugins/periskop/package.json
+++ b/plugins/periskop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-periskop",
-  "version": "0.1.15-next.1",
+  "version": "0.1.15-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index 46ed93642b..3e65f628a5 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.19-next.2
+
+### Patch Changes
+
+- 84946a580c4: Introduced alpha export of the `permissionPlugin` for use in the new backend system, along with a `permissionModuleAllowAllPolicy` that can be used to allow all requests.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.5.19-next.1
 
 ### Patch Changes
diff --git a/plugins/permission-backend/alpha-api-report.md b/plugins/permission-backend/alpha-api-report.md
new file mode 100644
index 0000000000..926691930b
--- /dev/null
+++ b/plugins/permission-backend/alpha-api-report.md
@@ -0,0 +1,15 @@
+## API Report File for "@backstage/plugin-permission-backend"
+
+> 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';
+
+// @alpha
+export const permissionModuleAllowAllPolicy: () => BackendFeature;
+
+// @alpha
+export const permissionPlugin: () => BackendFeature;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 2fcee7ee19..23394e4aa4 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend",
-  "version": "0.5.19-next.1",
+  "version": "0.5.19-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -9,6 +9,21 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "backstage": {
     "role": "backend-plugin"
   },
@@ -23,6 +38,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
diff --git a/plugins/permission-backend/src/alpha.ts b/plugins/permission-backend/src/alpha.ts
new file mode 100644
index 0000000000..f6a2bb4f09
--- /dev/null
+++ b/plugins/permission-backend/src/alpha.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { permissionPlugin, permissionModuleAllowAllPolicy } from './plugin';
diff --git a/plugins/permission-backend/src/plugin.ts b/plugins/permission-backend/src/plugin.ts
new file mode 100644
index 0000000000..5c0a9a87a0
--- /dev/null
+++ b/plugins/permission-backend/src/plugin.ts
@@ -0,0 +1,118 @@
+/*
+ * 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 { 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 {
+  policyExtensionPoint,
+  PolicyExtensionPoint,
+} from '@backstage/plugin-permission-node/alpha';
+import { createRouter } from './service';
+
+class PolicyExtensionPointImpl implements PolicyExtensionPoint {
+  public policy: PermissionPolicy | undefined;
+
+  setPolicy(policy: PermissionPolicy): void {
+    if (this.policy) {
+      throw new Error('Policy already set');
+    }
+    this.policy = policy;
+  }
+}
+
+/**
+ * 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(() => ({
+  pluginId: 'permission',
+  register(env) {
+    const policies = new PolicyExtensionPointImpl();
+
+    env.registerExtensionPoint(policyExtensionPoint, policies);
+
+    env.registerInit({
+      deps: {
+        http: coreServices.httpRouter,
+        config: coreServices.config,
+        logger: coreServices.logger,
+        discovery: coreServices.discovery,
+        identity: coreServices.identity,
+      },
+      async init({ http, config, logger, discovery, identity }) {
+        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',
+          );
+        }
+
+        http.use(
+          await createRouter({
+            config,
+            discovery,
+            identity,
+            logger: winstonLogger,
+            policy: policies.policy,
+          }),
+        );
+      },
+    });
+  },
+}));
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index d34e860efc..654283d4e7 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-permission-node
 
+## 0.7.7-next.2
+
+### Patch Changes
+
+- 788f0f5a152: Introduced alpha export of the `policyExtensionPoint` for use in the new backend system.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.7.7-next.1
 
 ### Patch Changes
diff --git a/plugins/permission-node/alpha-api-report.md b/plugins/permission-node/alpha-api-report.md
new file mode 100644
index 0000000000..1be8e77035
--- /dev/null
+++ b/plugins/permission-node/alpha-api-report.md
@@ -0,0 +1,18 @@
+## API Report File for "@backstage/plugin-permission-node"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { PermissionPolicy } from '@backstage/plugin-permission-node';
+
+// @alpha
+export type PolicyExtensionPoint = {
+  setPolicy(policy: PermissionPolicy): void;
+};
+
+// @alpha
+export const policyExtensionPoint: ExtensionPoint<PolicyExtensionPoint>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index d8adbc08e7..d7170c86a9 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-permission-node",
   "description": "Common permission and authorization utilities for backend plugins",
-  "version": "0.7.7-next.1",
+  "version": "0.7.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -10,6 +10,21 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "backstage": {
     "role": "node-library"
   },
@@ -34,6 +49,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
diff --git a/plugins/permission-node/src/alpha.ts b/plugins/permission-node/src/alpha.ts
new file mode 100644
index 0000000000..1031dc4fe9
--- /dev/null
+++ b/plugins/permission-node/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 { type PolicyExtensionPoint, policyExtensionPoint } from './plugin';
diff --git a/plugins/permission-node/src/plugin.ts b/plugins/permission-node/src/plugin.ts
new file mode 100644
index 0000000000..646223a3ee
--- /dev/null
+++ b/plugins/permission-node/src/plugin.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 { createExtensionPoint } from '@backstage/backend-plugin-api';
+import { PermissionPolicy } from '@backstage/plugin-permission-node';
+
+/**
+ * Allows supplying policies to the permissions backend
+ *
+ * @alpha
+ */
+export type PolicyExtensionPoint = {
+  setPolicy(policy: PermissionPolicy): void;
+};
+
+/**
+ * Allows supplying policies to the permissions backend
+ *
+ * @alpha
+ */
+export const policyExtensionPoint = createExtensionPoint<PolicyExtensionPoint>({
+  id: 'permission.policy',
+});
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index c23f9e0a73..8edff27f2b 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-permission-react
 
+## 0.4.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 0.4.12-next.0
 
 ### Patch Changes
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index 31f475e388..3a8cf8950a 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.12-next.0",
+  "version": "0.4.12-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/permission-react/src/components/RequirePermission.test.tsx b/plugins/permission-react/src/components/RequirePermission.test.tsx
index 31ccc5042d..0749d9b2b3 100644
--- a/plugins/permission-react/src/components/RequirePermission.test.tsx
+++ b/plugins/permission-react/src/components/RequirePermission.test.tsx
@@ -32,6 +32,12 @@ const permission = createPermission({
   attributes: { action: 'read' },
 });
 
+const resourcePermission = createPermission({
+  name: 'access.something',
+  attributes: { action: 'read' },
+  resourceType: 'test-resource',
+});
+
 describe('RequirePermission', () => {
   it('Does not render when loading', async () => {
     mockUsePermission.mockReturnValue({ loading: true, allowed: false });
@@ -85,4 +91,18 @@ describe('RequirePermission', () => {
 
     expect(getByText('Custom Error')).toBeTruthy();
   });
+
+  it('Can authorize with a resource permission', async () => {
+    mockUsePermission.mockReturnValue({ loading: false, allowed: true });
+
+    const { getByText } = await renderInTestApp(
+      <RequirePermission
+        permission={resourcePermission}
+        resourceRef="my-test-resource"
+        children={<div>content</div>}
+      />,
+    );
+
+    expect(getByText('content')).toBeTruthy();
+  });
 });
diff --git a/plugins/playlist-backend/CHANGELOG.md b/plugins/playlist-backend/CHANGELOG.md
index 38e4a26ca8..0276f721db 100644
--- a/plugins/playlist-backend/CHANGELOG.md
+++ b/plugins/playlist-backend/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-playlist-backend
 
+## 0.2.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+
 ## 0.2.7-next.1
 
 ### Patch Changes
diff --git a/plugins/playlist-backend/package.json b/plugins/playlist-backend/package.json
index 8ccc0b2199..3c758ccfca 100644
--- a/plugins/playlist-backend/package.json
+++ b/plugins/playlist-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist-backend",
-  "version": "0.2.7-next.1",
+  "version": "0.2.7-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/playlist/CHANGELOG.md b/plugins/playlist/CHANGELOG.md
index ac791d37e6..27a4767ac9 100644
--- a/plugins/playlist/CHANGELOG.md
+++ b/plugins/playlist/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-playlist
 
+## 0.1.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- 1b3c0546047: Added config properties to change dynamically the group noun for all the components in the UI
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-playlist-common@0.1.6-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 0.1.8-next.1
 
 ### Patch Changes
diff --git a/plugins/playlist/README.md b/plugins/playlist/README.md
index 6ae3fb84ac..e35f94b9e5 100644
--- a/plugins/playlist/README.md
+++ b/plugins/playlist/README.md
@@ -131,6 +131,15 @@ const defaultEntityPage = (
 
 Note: the above only shows an example for the `defaultEntityPage` for a full example of this you can look at [this EntityPage](../../packages/app/src/components/catalog/EntityPage.tsx)
 
+## Custom Title
+
+You can define a custom title to be shown in all the components of this plugin to replace the default term "playlist" in the UI. To do this you just need to add some config in your **app-config.yaml**, here's an example:
+
+```yaml
+playlist:
+  title: Collection
+```
+
 ## Features
 
 ### View All Playlists
diff --git a/plugins/playlist/config.d.ts b/plugins/playlist/config.d.ts
new file mode 100644
index 0000000000..d949cfe73a
--- /dev/null
+++ b/plugins/playlist/config.d.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface Config {
+  playlist?: {
+    /**
+     * (Optional) The title that will shown in the UI; Defaults to`Playlist` if undefined.
+     * @visibility frontend
+     */
+    title?: string | undefined;
+  };
+}
diff --git a/plugins/playlist/package.json b/plugins/playlist/package.json
index ccba981f05..c489cbfa76 100644
--- a/plugins/playlist/package.json
+++ b/plugins/playlist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist",
-  "version": "0.1.8-next.1",
+  "version": "0.1.8-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -42,6 +42,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "lodash": "^4.17.21",
+    "pluralize": "^8.0.0",
     "qs": "^6.9.4",
     "react-hook-form": "^7.13.0",
     "react-use": "^17.2.4"
@@ -68,6 +69,8 @@
     "swr": "^2.0.0"
   },
   "files": [
-    "dist"
-  ]
+    "dist",
+    "config.d.ts"
+  ],
+  "configSchema": "config.d.ts"
 }
diff --git a/plugins/playlist/src/components/CreatePlaylistButton/CreatePlaylistButton.tsx b/plugins/playlist/src/components/CreatePlaylistButton/CreatePlaylistButton.tsx
index c064f28591..7669a48c26 100644
--- a/plugins/playlist/src/components/CreatePlaylistButton/CreatePlaylistButton.tsx
+++ b/plugins/playlist/src/components/CreatePlaylistButton/CreatePlaylistButton.tsx
@@ -29,6 +29,7 @@ import { useNavigate } from 'react-router-dom';
 import { playlistApiRef } from '../../api';
 import { playlistRouteRef } from '../../routes';
 import { PlaylistEditDialog } from '../PlaylistEditDialog';
+import { useTitle } from '../../hooks';
 
 export const CreatePlaylistButton = () => {
   const navigate = useNavigate();
@@ -55,13 +56,18 @@ export const CreatePlaylistButton = () => {
     [errorApi, navigate, playlistApi, playlistRoute],
   );
 
+  const singularTitle = useTitle({
+    pluralize: false,
+    lowerCase: false,
+  });
+
   return (
     <>
       {isXSScreen ? (
         <IconButton
           disabled={!allowed}
           color="primary"
-          title="Create Playlist"
+          title={`Create ${singularTitle}`}
           size="small"
           onClick={() => setOpenDialog(true)}
         >
@@ -74,7 +80,7 @@ export const CreatePlaylistButton = () => {
           color="primary"
           onClick={() => setOpenDialog(true)}
         >
-          Create Playlist
+          Create {singularTitle}
         </Button>
       )}
       <PlaylistEditDialog
diff --git a/plugins/playlist/src/components/EntityPlaylistDialog/EntityPlaylistDialog.tsx b/plugins/playlist/src/components/EntityPlaylistDialog/EntityPlaylistDialog.tsx
index 247f737f3f..150ca6bc56 100644
--- a/plugins/playlist/src/components/EntityPlaylistDialog/EntityPlaylistDialog.tsx
+++ b/plugins/playlist/src/components/EntityPlaylistDialog/EntityPlaylistDialog.tsx
@@ -51,6 +51,7 @@ import { useNavigate } from 'react-router-dom';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { playlistApiRef } from '../../api';
+import { useTitle } from '../../hooks';
 import { playlistRouteRef } from '../../routes';
 import { PlaylistEditDialog } from '../PlaylistEditDialog';
 
@@ -104,6 +105,19 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
     [playlistApi],
   );
 
+  const singularTitle = useTitle({
+    pluralize: true,
+    lowerCase: false,
+  });
+  const singularTitleLowerCase = useTitle({
+    pluralize: false,
+    lowerCase: true,
+  });
+  const pluralTitleLowerCase = useTitle({
+    pluralize: true,
+    lowerCase: true,
+  });
+
   useEffect(() => {
     if (open) {
       loadPlaylists();
@@ -120,12 +134,19 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
         navigate(playlistRoute({ playlistId }));
       } catch (e) {
         alertApi.post({
-          message: `Failed to add entity to playlist: ${e}`,
+          message: `Failed to add entity to ${singularTitleLowerCase}: ${e}`,
           severity: 'error',
         });
       }
     },
-    [alertApi, entity, navigate, playlistApi, playlistRoute],
+    [
+      alertApi,
+      entity,
+      navigate,
+      playlistApi,
+      playlistRoute,
+      singularTitleLowerCase,
+    ],
   );
 
   const [{ loading: addEntityLoading }, addToPlaylist] = useAsyncFn(
@@ -141,12 +162,12 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
         });
       } catch (e) {
         alertApi.post({
-          message: `Failed to add entity to playlist: ${e}`,
+          message: `Failed to add entity to ${singularTitleLowerCase}: ${e}`,
           severity: 'error',
         });
       }
     },
-    [alertApi, closeDialog, entity, playlistApi],
+    [alertApi, closeDialog, entity, playlistApi, singularTitleLowerCase],
   );
 
   return (
@@ -160,7 +181,7 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
       >
         {(loading || addEntityLoading) && <LinearProgress />}
         <DialogTitle className={classes.dialogTitle}>
-          Add to Playlist
+          Add to {singularTitle}
           <TextField
             fullWidth
             data-testid="entity-playlist-dialog-search"
@@ -191,7 +212,10 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
         </DialogTitle>
         <DialogContent className={classes.dialogContent}>
           {error && (
-            <ResponseErrorPanel title="Error loading playlists" error={error} />
+            <ResponseErrorPanel
+              title={`Error loading ${pluralTitleLowerCase}`}
+              error={error}
+            />
           )}
           {playlists && entity && (
             <List>
@@ -205,7 +229,9 @@ export const EntityPlaylistDialog = (props: EntityPlaylistDialogProps) => {
                   <ListItemIcon>
                     <PlaylistAddIcon />
                   </ListItemIcon>
-                  <ListItemText primary="Create new playlist" />
+                  <ListItemText
+                    primary={`Create new ${singularTitleLowerCase}`}
+                  />
                 </ListItem>
               )}
               {playlists
diff --git a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
index 27cc13fede..a213c7c51c 100644
--- a/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
+++ b/plugins/playlist/src/components/PlaylistEditDialog/PlaylistEditDialog.tsx
@@ -39,6 +39,7 @@ import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import useAsync from 'react-use/lib/useAsync';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
+import { useTitle } from '../../hooks';
 
 const useStyles = makeStyles({
   buttonWrapper: {
@@ -105,6 +106,11 @@ export const PlaylistEditDialog = ({
     }
   };
 
+  const titleSingularLowerCase = useTitle({
+    pluralize: false,
+    lowerCase: false,
+  });
+
   return (
     <Dialog fullWidth maxWidth="xs" onClose={closeDialog} open={open}>
       <DialogContent>
@@ -121,7 +127,7 @@ export const PlaylistEditDialog = ({
               fullWidth
               label="Name"
               margin="dense"
-              placeholder="Give your playlist name"
+              placeholder={`Give your ${titleSingularLowerCase} a name`}
               required
               type="text"
             />
@@ -139,7 +145,7 @@ export const PlaylistEditDialog = ({
               label="Description"
               margin="dense"
               multiline
-              placeholder="Describe your playlist"
+              placeholder={`Describe your ${titleSingularLowerCase}`}
               type="text"
             />
           )}
diff --git a/plugins/playlist/src/components/PlaylistIndexPage/PlaylistIndexPage.tsx b/plugins/playlist/src/components/PlaylistIndexPage/PlaylistIndexPage.tsx
index 0ee829018a..f25df19ee7 100644
--- a/plugins/playlist/src/components/PlaylistIndexPage/PlaylistIndexPage.tsx
+++ b/plugins/playlist/src/components/PlaylistIndexPage/PlaylistIndexPage.tsx
@@ -23,7 +23,7 @@ import {
 } from '@backstage/core-components';
 import { CatalogFilterLayout } from '@backstage/plugin-catalog-react';
 
-import { PlaylistListProvider } from '../../hooks';
+import { PlaylistListProvider, useTitle } from '../../hooks';
 import { CreatePlaylistButton } from '../CreatePlaylistButton';
 import { PersonalListPicker } from '../PersonalListPicker';
 import { PlaylistList } from '../PlaylistList';
@@ -31,26 +31,33 @@ import { PlaylistOwnerPicker } from '../PlaylistOwnerPicker';
 import { PlaylistSearchBar } from '../PlaylistSearchBar';
 import { PlaylistSortPicker } from '../PlaylistSortPicker';
 
-export const PlaylistIndexPage = () => (
-  <PageWithHeader themeId="home" title="Playlists">
-    <PlaylistListProvider>
-      <Content>
-        <ContentHeader title="">
-          <PlaylistSortPicker />
-          <CreatePlaylistButton />
-          <SupportButton />
-        </ContentHeader>
-        <CatalogFilterLayout>
-          <CatalogFilterLayout.Filters>
-            <PlaylistSearchBar />
-            <PersonalListPicker />
-            <PlaylistOwnerPicker />
-          </CatalogFilterLayout.Filters>
-          <CatalogFilterLayout.Content>
-            <PlaylistList />
-          </CatalogFilterLayout.Content>
-        </CatalogFilterLayout>
-      </Content>
-    </PlaylistListProvider>
-  </PageWithHeader>
-);
+export const PlaylistIndexPage = () => {
+  const pluralTitle = useTitle({
+    pluralize: true,
+    lowerCase: false,
+  });
+
+  return (
+    <PageWithHeader themeId="home" title={pluralTitle}>
+      <PlaylistListProvider>
+        <Content>
+          <ContentHeader title="">
+            <PlaylistSortPicker />
+            <CreatePlaylistButton />
+            <SupportButton />
+          </ContentHeader>
+          <CatalogFilterLayout>
+            <CatalogFilterLayout.Filters>
+              <PlaylistSearchBar />
+              <PersonalListPicker />
+              <PlaylistOwnerPicker />
+            </CatalogFilterLayout.Filters>
+            <CatalogFilterLayout.Content>
+              <PlaylistList />
+            </CatalogFilterLayout.Content>
+          </CatalogFilterLayout>
+        </Content>
+      </PlaylistListProvider>
+    </PageWithHeader>
+  );
+};
diff --git a/plugins/playlist/src/components/PlaylistList/PlaylistList.test.tsx b/plugins/playlist/src/components/PlaylistList/PlaylistList.test.tsx
index 27030ec1c7..976db99983 100644
--- a/plugins/playlist/src/components/PlaylistList/PlaylistList.test.tsx
+++ b/plugins/playlist/src/components/PlaylistList/PlaylistList.test.tsx
@@ -14,13 +14,19 @@
  * limitations under the License.
  */
 
+import { ConfigApi, configApiRef } from '@backstage/core-plugin-api';
 import { Playlist } from '@backstage/plugin-playlist-common';
+import { TestApiProvider } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import React from 'react';
 
 import { MockPlaylistListProvider } from '../../testUtils';
 import { PlaylistList } from './PlaylistList';
 
+const mockConfigApi = {
+  getOptionalString: () => undefined,
+} as Partial<ConfigApi>;
+
 jest.mock('../PlaylistCard', () => ({
   PlaylistCard: ({ playlist }: { playlist: Playlist }) => (
     <div>{playlist.name}</div>
@@ -30,9 +36,11 @@ jest.mock('../PlaylistCard', () => ({
 describe('<PlaylistList/>', () => {
   it('renders error on error', () => {
     const rendered = render(
-      <MockPlaylistListProvider value={{ error: new Error('Test Error') }}>
-        <PlaylistList />
-      </MockPlaylistListProvider>,
+      <TestApiProvider apis={[[configApiRef, mockConfigApi]]}>
+        <MockPlaylistListProvider value={{ error: new Error('Test Error') }}>
+          <PlaylistList />
+        </MockPlaylistListProvider>
+      </TestApiProvider>,
     );
 
     expect(rendered.getByText('Test Error')).toBeInTheDocument();
@@ -40,9 +48,11 @@ describe('<PlaylistList/>', () => {
 
   it('handles no playlists', () => {
     const rendered = render(
-      <MockPlaylistListProvider value={{ playlists: [] }}>
-        <PlaylistList />
-      </MockPlaylistListProvider>,
+      <TestApiProvider apis={[[configApiRef, mockConfigApi]]}>
+        <MockPlaylistListProvider value={{ playlists: [] }}>
+          <PlaylistList />
+        </MockPlaylistListProvider>
+      </TestApiProvider>,
     );
 
     expect(
@@ -52,32 +62,34 @@ describe('<PlaylistList/>', () => {
 
   it('renders playlists', () => {
     const rendered = render(
-      <MockPlaylistListProvider
-        value={{
-          playlists: [
-            {
-              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,
-            },
-          ],
-        }}
-      >
-        <PlaylistList />
-      </MockPlaylistListProvider>,
+      <TestApiProvider apis={[[configApiRef, mockConfigApi]]}>
+        <MockPlaylistListProvider
+          value={{
+            playlists: [
+              {
+                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,
+              },
+            ],
+          }}
+        >
+          <PlaylistList />
+        </MockPlaylistListProvider>
+      </TestApiProvider>,
     );
 
     expect(rendered.getByText('playlist-1')).toBeInTheDocument();
diff --git a/plugins/playlist/src/components/PlaylistList/PlaylistList.tsx b/plugins/playlist/src/components/PlaylistList/PlaylistList.tsx
index fcc3971542..2f815f07c6 100644
--- a/plugins/playlist/src/components/PlaylistList/PlaylistList.tsx
+++ b/plugins/playlist/src/components/PlaylistList/PlaylistList.tsx
@@ -23,18 +23,24 @@ import {
 } from '@backstage/core-components';
 import { Typography } from '@material-ui/core';
 
-import { usePlaylistList } from '../../hooks';
+import { useTitle, usePlaylistList } from '../../hooks';
 import { PlaylistCard } from '../PlaylistCard';
 
 export const PlaylistList = () => {
   const { loading, error, playlists } = usePlaylistList();
+  const pluralTitleLowerCase = useTitle({
+    pluralize: true,
+    lowerCase: true,
+  });
 
   return (
     <>
       {loading && <Progress />}
 
       {error && (
-        <WarningPanel title="Oops! Something went wrong loading playlists">
+        <WarningPanel
+          title={`Oops! Something went wrong loading ${pluralTitleLowerCase}`}
+        >
           {error.message}
         </WarningPanel>
       )}
diff --git a/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx b/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
index f499f59a61..3d8efe3bc5 100644
--- a/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
+++ b/plugins/playlist/src/components/PlaylistPage/PlaylistEntitiesTable.tsx
@@ -32,6 +32,7 @@ import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { playlistApiRef } from '../../api';
+import { useTitle } from '../../hooks';
 import { AddEntitiesDrawer } from './AddEntitiesDrawer';
 
 export const PlaylistEntitiesTable = ({
@@ -84,16 +85,21 @@ export const PlaylistEntitiesTable = ({
     [errorApi, loadEntities, playlistApi, playlistId],
   );
 
+  const singularTitleLowerCase = useTitle({
+    pluralize: false,
+    lowerCase: true,
+  });
+
   const actions = editAllowed
     ? [
         {
           icon: DeleteIcon,
-          tooltip: 'Remove from playlist',
+          tooltip: `Remove from ${singularTitleLowerCase}`,
           onClick: removeEntity,
         },
         {
           icon: AddBoxIcon,
-          tooltip: 'Add entities to playlist',
+          tooltip: `Add entities to ${singularTitleLowerCase}`,
           isFreeAction: true,
           onClick: () => setOpenAddEntitiesDrawer(true),
         },
diff --git a/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx b/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
index 7f4457062d..621f94f75c 100644
--- a/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
+++ b/plugins/playlist/src/components/PlaylistPage/PlaylistHeader.tsx
@@ -45,6 +45,7 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 import { playlistApiRef } from '../../api';
 import { rootRouteRef } from '../../routes';
 import { PlaylistEditDialog } from '../PlaylistEditDialog';
+import { useTitle } from '../../hooks';
 
 const useStyles = makeStyles({
   buttonWrapper: {
@@ -109,6 +110,11 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
     }
   }, [playlistApi]);
 
+  const singularTitle = useTitle({
+    pluralize: false,
+    lowerCase: false,
+  });
+
   return (
     <Header
       type={!playlist.public ? 'private' : undefined}
@@ -143,7 +149,7 @@ export const PlaylistHeader = ({ playlist, onUpdate }: PlaylistHeaderProps) => {
             onClick: () => setOpenEditDialog(true),
           },
           {
-            label: 'Delete Playlist',
+            label: `Delete ${singularTitle}`,
             icon: <DeleteIcon />,
             disabled: !deleteAllowed,
             onClick: () => setOpenDeleteDialog(true),
diff --git a/plugins/playlist/src/hooks/index.ts b/plugins/playlist/src/hooks/index.ts
index 316121b515..bb164d961c 100644
--- a/plugins/playlist/src/hooks/index.ts
+++ b/plugins/playlist/src/hooks/index.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './usePlaylistList';
+export * from './useTitle';
diff --git a/plugins/playlist/src/hooks/useTitle.ts b/plugins/playlist/src/hooks/useTitle.ts
new file mode 100644
index 0000000000..5f46e027d7
--- /dev/null
+++ b/plugins/playlist/src/hooks/useTitle.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 { configApiRef, useApi } from '@backstage/core-plugin-api';
+import pluralize from 'pluralize';
+
+interface UseTitleOptions {
+  pluralize?: boolean;
+  lowerCase?: boolean;
+}
+
+export function useTitle(opts: UseTitleOptions) {
+  const configApi = useApi(configApiRef);
+  let title = configApi.getOptionalString('playlist.title') ?? 'Playlist';
+
+  if (opts.pluralize) {
+    title = pluralize(title);
+  }
+
+  return opts.lowerCase ? title.toLocaleLowerCase('en-US') : title;
+}
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 2d165e6ea0..fabcaf7be7 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-proxy-backend
 
+## 0.2.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+
 ## 0.2.38-next.1
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index b96d71583c..a2378efce4 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.38-next.1",
+  "version": "0.2.38-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/puppetdb/.eslintrc.js b/plugins/puppetdb/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/puppetdb/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/puppetdb/README.md b/plugins/puppetdb/README.md
new file mode 100644
index 0000000000..c4fa06b874
--- /dev/null
+++ b/plugins/puppetdb/README.md
@@ -0,0 +1,63 @@
+# PuppetDB Plugin
+
+A frontend plugin to integrate PuppetDB with Backstage. When combined with the
+[catalog-backend-module-puppetdb](https://github.com/backstage/backstage/blob/master/plugins/catalog-backend-module-puppetdb/README.md) plugin, this
+frontend plugin allows viewing PuppetDB reports, including their logs and events, of Backstage resource entities.
+
+## Getting started
+
+### Prerequisites
+
+To get started, you need a running instance of PuppetDB. You can find instructions on how to install it
+[here](https://www.puppet.com/docs/puppetdb/7/install_via_module.html).
+The PuppetDB [should be configured](https://www.puppet.com/docs/puppetdb/7/configure.html#host) to allow being accessed from your Backstage instance.
+
+In addition, your Backstage instance need to either have
+[catalog-backend-module-puppetdb](https://github.com/backstage/backstage/blob/master/plugins/catalog-backend-module-puppetdb/README.md) plugin installed
+or you need to ensure your Resource entities have `puppet.com/certname` annotation set to the PuppetDB node name in some other way.
+
+### Installation
+
+1. Install the plugin with `yarn` in the root of your Backstage application directory:
+
+```bash
+yarn --cwd packages/app add @backstage/plugin-puppetdb
+```
+
+1. Import and use the plugin in `packages/app/src/App.tsx`:
+
+```tsx
+import { PuppetDbPage } from '@backstage/plugin-puppetdb';
+
+const routes = (
+  <FlatRoutes>
+    {/* ...other routes */}
+    <Route path="/puppetdb" element={<PuppetDbPage />} />
+  </FlatRoutes>
+);
+```
+
+### Configuration
+
+1. Configure `puppetdb` proxy. As this plugin uses the Backstage proxy to securely communicate with PuppetDB API,
+   add the following to your `app-config.yaml` to enable this configuration:
+
+```yaml
+proxy:
+  '/puppetdb':
+    target: https://your.puppetdb.instance.com
+```
+
+## Screenshots
+
+#### Main page with the reports list:
+
+![Reports list](https://raw.githubusercontent.com/backstage/backstage/42b65232e763d3e39e2e641b105d2ad469db7a59/plugins/puppetdb/assets/Reports.png)
+
+#### Events for the specific report:
+
+![Events](https://raw.githubusercontent.com/backstage/backstage/1b39e86db17f139dc995f02daca4896533e53eb0/plugins/puppetdb/assets/Events.png)
+
+#### Logs of the specific report:
+
+![Logs](https://raw.githubusercontent.com/backstage/backstage/1b39e86db17f139dc995f02daca4896533e53eb0/plugins/puppetdb/assets/Logs.png)
diff --git a/plugins/puppetdb/api-report.md b/plugins/puppetdb/api-report.md
new file mode 100644
index 0000000000..48a3276460
--- /dev/null
+++ b/plugins/puppetdb/api-report.md
@@ -0,0 +1,35 @@
+## API Report File for "@backstage/plugin-puppetdb"
+
+> 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 { PathParams } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+import { SubRouteRef } from '@backstage/core-plugin-api';
+
+// @public
+export const isPuppetDbAvailable: (entity: Entity) => boolean;
+
+// @public
+export const PuppetDbPage: () => JSX.Element;
+
+// @public
+const puppetdbPlugin: BackstagePlugin<{}, {}, {}>;
+export { puppetdbPlugin as plugin };
+export { puppetdbPlugin };
+
+// @public (undocumented)
+export const puppetDbReportRouteRef: SubRouteRef<PathParams<'/:hash'>>;
+
+// @public (undocumented)
+export const puppetDbRouteRef: RouteRef<undefined>;
+
+// @public (undocumented)
+export const Router: () => JSX.Element;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/puppetdb/assets/Events.png b/plugins/puppetdb/assets/Events.png
new file mode 100644
index 0000000000..163ad67813
Binary files /dev/null and b/plugins/puppetdb/assets/Events.png differ
diff --git a/plugins/puppetdb/assets/Logs.png b/plugins/puppetdb/assets/Logs.png
new file mode 100644
index 0000000000..f4e7686764
Binary files /dev/null and b/plugins/puppetdb/assets/Logs.png differ
diff --git a/plugins/puppetdb/assets/Reports.png b/plugins/puppetdb/assets/Reports.png
new file mode 100644
index 0000000000..2bba083fa6
Binary files /dev/null and b/plugins/puppetdb/assets/Reports.png differ
diff --git a/plugins/puppetdb/dev/index.tsx b/plugins/puppetdb/dev/index.tsx
new file mode 100644
index 0000000000..8082afcfe2
--- /dev/null
+++ b/plugins/puppetdb/dev/index.tsx
@@ -0,0 +1,19 @@
+/*
+ * 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 { createDevApp } from '@backstage/dev-utils';
+import { puppetdbPlugin } from '../src';
+
+createDevApp().registerPlugin(puppetdbPlugin).render();
diff --git a/plugins/puppetdb/package.json b/plugins/puppetdb/package.json
new file mode 100644
index 0000000000..9c520ff912
--- /dev/null
+++ b/plugins/puppetdb/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@backstage/plugin-puppetdb",
+  "description": "Backstage plugin to visualize resource information and Puppet facts from PuppetDB.",
+  "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": "frontend-plugin"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "plugins/puppetdb"
+  },
+  "keywords": [
+    "backstage",
+    "puppetdb",
+    "puppet"
+  ],
+  "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/catalog-model": "workspace:^",
+    "@backstage/core-components": "workspace:^",
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-catalog-react": "workspace:^",
+    "@backstage/theme": "workspace:^",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "^4.0.0-alpha.57",
+    "react-use": "^17.2.4"
+  },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  },
+  "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",
+    "@types/node": "*",
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "cross-fetch": "^3.1.5",
+    "msw": "^1.0.1"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/puppetdb/src/api/PupeptDbClient.test.ts b/plugins/puppetdb/src/api/PupeptDbClient.test.ts
new file mode 100644
index 0000000000..8b858e21ca
--- /dev/null
+++ b/plugins/puppetdb/src/api/PupeptDbClient.test.ts
@@ -0,0 +1,206 @@
+/*
+ * 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 { UrlPatternDiscovery } from '@backstage/core-app-api';
+import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { PuppetDbClient } from './PuppetDbClient';
+import {
+  PuppetDbReport,
+  PuppetDbReportEvent,
+  PuppetDbReportLog,
+} from './types';
+
+const server = setupServer();
+
+const reports: PuppetDbReport[] = [
+  {
+    hash: 'hash1',
+    puppet_version: 'version1',
+    report_format: 1,
+    certname: 'node1',
+    start_time: '2021-01-01T00:00:00Z',
+    end_time: '2021-01-01T00:00:00Z',
+    producer_timestamp: '2021-01-01T00:00:00Z',
+    receive_time: '2021-01-01T00:00:00Z',
+    producer: 'producer1',
+    transaction_uuid: 'uuid1',
+    catalog_uuid: 'uuid1',
+    code_id: 'id1',
+    cached_catalog_status: 'status1',
+    type: 'type1',
+    corrective_change: false,
+    configuration_version: 'version1',
+    environment: 'production',
+    noop: false,
+    status: 'changed',
+  },
+  {
+    hash: 'hash2',
+    puppet_version: 'version2',
+    report_format: 2,
+    certname: 'node1',
+    start_time: '2021-01-01T00:00:00Z',
+    end_time: '2021-01-01T00:00:00Z',
+    producer_timestamp: '2021-01-01T00:00:00Z',
+    receive_time: '2021-01-01T00:00:00Z',
+    producer: 'producer2',
+    transaction_uuid: 'uuid2',
+    catalog_uuid: 'uuid2',
+    code_id: 'id2',
+    cached_catalog_status: 'status2',
+    type: 'type2',
+    corrective_change: false,
+    configuration_version: 'version2',
+    environment: 'production',
+    noop: false,
+    status: 'failed',
+  },
+];
+
+const events: PuppetDbReportEvent[] = [
+  {
+    name: 'event1',
+    message: 'message1',
+    file: 'file1',
+    line: 1,
+    certname: 'node1',
+    report: 'hash1',
+    timestamp: '2021-01-01T00:00:00Z',
+    report_receive_time: '2021-01-01T00:00:00Z',
+    run_start_time: '2021-01-01T00:00:00Z',
+    containing_class: 'class1',
+    environment: 'production',
+    configuration_version: 'version1',
+    containment_path: ['path1'],
+    corrective_change: false,
+    run_end_time: '2021-01-01T00:00:00Z',
+    resource_type: 'type1',
+    resource_title: 'title1',
+    property: 'property1',
+    old_value: 'old1',
+    new_value: 'new1',
+    status: 'changed',
+  },
+  {
+    name: 'event2',
+    message: 'message2',
+    file: 'file2',
+    line: 2,
+    certname: 'node1',
+    report: 'hash1',
+    timestamp: '2021-01-01T00:00:00Z',
+    report_receive_time: '2021-01-01T00:00:00Z',
+    run_start_time: '2021-01-01T00:00:00Z',
+    containing_class: 'class2',
+    environment: 'production',
+    configuration_version: 'version2',
+    containment_path: ['path2'],
+    corrective_change: false,
+    run_end_time: '2021-01-01T00:00:00Z',
+    resource_type: 'type2',
+    resource_title: 'title2',
+    property: 'property2',
+    old_value: 'old2',
+    new_value: 'new2',
+    status: 'failed',
+  },
+];
+
+const logs: PuppetDbReportLog[] = [
+  {
+    level: 'level1',
+    file: 'file1',
+    line: 1,
+    time: '2021-01-01T00:00:00Z',
+    message: 'message1',
+    source: 'source1',
+    tags: ['tag1'],
+  },
+  {
+    level: 'level2',
+    file: 'file2',
+    line: 2,
+    time: '2021-01-01T00:00:00Z',
+    message: 'message2',
+    source: 'source2',
+    tags: ['tag2'],
+  },
+];
+
+describe('PuppetDbClient', () => {
+  setupRequestMockHandlers(server);
+
+  const puppetDbCertName = 'node1';
+  const mockBaseUrl = 'http://backstage:9191/api/proxy';
+  const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
+  let client: PuppetDbClient;
+
+  const setupHandlers = () => {
+    server.use(
+      rest.get(
+        `${mockBaseUrl}/puppetdb/pdb/query/v4/reports`,
+        (req, res, ctx) => {
+          if (
+            req.url.searchParams.get('query') !==
+            `["=","certname","${puppetDbCertName}"]`
+          ) {
+            return res(ctx.status(400));
+          }
+
+          return res(ctx.status(200), ctx.json(reports));
+        },
+      ),
+
+      rest.get(
+        `${mockBaseUrl}/puppetdb/pdb/query/v4/reports/hash1/events`,
+        (_, res, ctx) => {
+          return res(ctx.status(200), ctx.json(events));
+        },
+      ),
+
+      rest.get(
+        `${mockBaseUrl}/puppetdb/pdb/query/v4/reports/hash1/logs`,
+        (_, res, ctx) => {
+          return res(ctx.status(200), ctx.json(logs));
+        },
+      ),
+    );
+  };
+
+  beforeEach(() => {
+    setupHandlers();
+    client = new PuppetDbClient({
+      discoveryApi: discoveryApi,
+      fetchApi: new MockFetchApi(),
+    });
+  });
+
+  it('getPuppetDbNodeReports should return reports', async () => {
+    const got = await client.getPuppetDbNodeReports(puppetDbCertName);
+    expect(got).toEqual(reports);
+  });
+
+  it('getPuppetDbReportEvents should return events', async () => {
+    const got = await client.getPuppetDbReportEvents('hash1');
+    expect(got).toEqual(events);
+  });
+
+  it('getPuppetDbReportLogs should return logs', async () => {
+    const got = await client.getPuppetDbReportLogs('hash1');
+    expect(got).toEqual(logs);
+  });
+});
diff --git a/plugins/puppetdb/src/api/PuppetDbClient.ts b/plugins/puppetdb/src/api/PuppetDbClient.ts
new file mode 100644
index 0000000000..b8f3c6e404
--- /dev/null
+++ b/plugins/puppetdb/src/api/PuppetDbClient.ts
@@ -0,0 +1,110 @@
+/*
+ * 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 {
+  PuppetDbApi,
+  PuppetDbReport,
+  PuppetDbReportEvent,
+  PuppetDbReportLog,
+} from './types';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
+import { ResponseError } from '@backstage/errors';
+
+export class PuppetDbClient implements PuppetDbApi {
+  discoveryApi: DiscoveryApi;
+  fetchApi: FetchApi;
+
+  constructor({
+    discoveryApi,
+    fetchApi,
+  }: {
+    discoveryApi: DiscoveryApi;
+    fetchApi: FetchApi;
+  }) {
+    this.discoveryApi = discoveryApi;
+    this.fetchApi = fetchApi;
+  }
+
+  private async callApi<T>(
+    path: string,
+    query: { [key in string]: any },
+  ): Promise<T | undefined> {
+    const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/puppetdb`;
+    const response = await this.fetchApi.fetch(
+      `${apiUrl}${path}?${new URLSearchParams(query).toString()}`,
+      {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+    if (response.ok) {
+      return (await response.json()) as T;
+    }
+    throw await ResponseError.fromResponse(response);
+  }
+
+  async getPuppetDbReportEvents(
+    puppetDbReportHash: string,
+  ): Promise<PuppetDbReportEvent[] | undefined> {
+    if (!puppetDbReportHash) {
+      throw new Error('PuppetDB report hash is required');
+    }
+
+    const events = (await this.callApi(
+      `/pdb/query/v4/reports/${puppetDbReportHash}/events`,
+      {},
+    )) as PuppetDbReportEvent[];
+
+    if (!events || events.length === 0) {
+      return undefined;
+    }
+
+    return events;
+  }
+
+  async getPuppetDbReportLogs(
+    puppetDbReportHash: string,
+  ): Promise<PuppetDbReportLog[] | undefined> {
+    if (!puppetDbReportHash) {
+      throw new Error('PuppetDB report hash is required');
+    }
+
+    const events = (await this.callApi(
+      `/pdb/query/v4/reports/${puppetDbReportHash}/logs`,
+      {},
+    )) as PuppetDbReportLog[];
+
+    if (!events || events.length === 0) {
+      return undefined;
+    }
+
+    return events;
+  }
+
+  async getPuppetDbNodeReports(
+    puppetDbCertName: string,
+  ): Promise<PuppetDbReport[] | undefined> {
+    if (!puppetDbCertName) {
+      throw new Error('PuppetDB certname is required');
+    }
+
+    return this.callApi(`/pdb/query/v4/reports`, {
+      query: `["=","certname","${puppetDbCertName}"]`,
+      order_by: `[{"field": "start_time", "order": "desc"},{"field": "end_time", "order": "desc"}]`,
+      limit: 100,
+    });
+  }
+}
diff --git a/packages/cli/src/lib/monorepo/index.ts b/plugins/puppetdb/src/api/index.ts
similarity index 78%
rename from packages/cli/src/lib/monorepo/index.ts
rename to plugins/puppetdb/src/api/index.ts
index 7156975c07..a21728431d 100644
--- a/packages/cli/src/lib/monorepo/index.ts
+++ b/plugins/puppetdb/src/api/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-export { PackageGraph } from './PackageGraph';
 export type {
-  PackageGraphNode,
-  ExtendedPackage,
-  ExtendedPackageJSON,
-} from './PackageGraph';
+  PuppetDbReport,
+  PuppetDbReportEvent,
+  PuppetDbReportLog,
+} from './types';
+export { puppetDbApiRef } from './types';
+export { PuppetDbClient } from './PuppetDbClient';
diff --git a/plugins/puppetdb/src/api/types.ts b/plugins/puppetdb/src/api/types.ts
new file mode 100644
index 0000000000..8005d0e1de
--- /dev/null
+++ b/plugins/puppetdb/src/api/types.ts
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createApiRef } from '@backstage/core-plugin-api';
+
+/**
+ * Report from a PuppetDB.
+ */
+export type PuppetDbReport = {
+  /** The name of the node that the report was received from. */
+  certname: string;
+  /** The ID of the report. */
+  hash: string;
+  /** The environment assigned to the node that submitted the report. */
+  environment: string;
+  /** The status associated to report's node. */
+  status: string;
+  /** The job id associated with the report. */
+  job_id?: string;
+  /** A flag indicating whether the report was produced by a noop run. */
+  noop: boolean;
+  /** A flag indicating whether the report contains noop events. */
+  noop_pending?: boolean;
+  /** The version of Puppet that generated the report. */
+  puppet_version: string;
+  /** The version number of the report format that Puppet used to generate the original report data. */
+  report_format: number;
+  /** An identifier string that Puppet uses to match a specific catalog for a node to a specific Puppet run. */
+  configuration_version: string;
+  /** The time on the agent at which the Puppet run began. */
+  start_time: string;
+  /** The time on the agent at which the Puppet run ended. */
+  end_time: string;
+  /** The time of catalog submission from the Puppet Server to PuppetDB. */
+  producer_timestamp: string;
+  /** The time at which PuppetDB received the report. */
+  receive_time: string;
+  /** The certname of the Puppet Server that sent the report to PuppetDB. */
+  producer: string;
+  /** A string used to identify a Puppet run. */
+  transaction_uuid: string;
+  /** A string used to tie a catalog to a report to the catalog used from that Puppet run. */
+  catalog_uuid: string;
+  /** A string used to tie a catalog to the Puppet code which generated the catalog. */
+  code_id: string;
+  /** A string used to identify whether the Puppet run used a cached catalogs. */
+  cached_catalog_status: string;
+  /** Either "agent", "plan", or "any" to restrict the results to reports submitted from that source. */
+  type: string;
+  /** A flag indicating whether any of the report's events remediated configuration drift. */
+  corrective_change: boolean;
+  /** Report metrics. */
+  metrics?: {
+    /** Metrics data. */
+    data: PuppetDbReportMetric[];
+    /** Link to the metrics endpoint. */
+    href: string;
+  };
+};
+
+/**
+ * Resource event generated from Puppet report.
+ */
+export type PuppetDbReportEvent = {
+  /** The name of the node on which the event occurred. */
+  certname: string;
+  /** The ID of the report that the event occurred in. */
+  report: string;
+  /** The status of the event. Legal values are success, failure, noop, and skipped. */
+  status: string;
+  /** The timestamp (from the Puppet agent) at which the event occurred. Timestamps are always ISO-8601 compatible date/time strings. */
+  timestamp: string;
+  /** The timestamp (from the Puppet agent) at which the Puppet run began. Timestamps are always ISO-8601 compatible date/time strings. */
+  run_start_time: string;
+  /** The timestamp (from the Puppet agent) at which the Puppet run finished. Timestamps are always ISO-8601 compatible date/time strings. */
+  run_end_time: string;
+  /** The timestamp (from the PuppetDB server) at which the Puppet report was received. Timestamps are always ISO-8601 compatible date/time strings. */
+  report_receive_time: string;
+  /** The type of resource that the event occurred on, such as File, Package, etc. */
+  resource_type: string;
+  /** The title of the resource on which the event occurred. */
+  resource_title: string;
+  /** The property/parameter of the resource on which the event occurred. For example, on a Package resource, this field might have a value of ensure. */
+  property?: string;
+  /** The name of the resource on which the event occurred. */
+  name?: string;
+  /** The new value that Puppet was attempting to set for the specified resource property. Any rich data values will appear as readable strings. */
+  new_value?: string;
+  /** The previous value of the resource property, which Puppet was attempting to change. Any rich data values will appear as readable strings. */
+  old_value?: string;
+  /** A description (supplied by the resource provider) of what happened during the event. */
+  message?: string;
+  /** The manifest file in which the resource definition is located. */
+  file?: string;
+  /** The line (of the containing manifest file) at which the resource definition can be found. */
+  line?: number;
+  /** The Puppet class where this resource is declared. */
+  containing_class?: string;
+  /** Whether the event occurred in the most recent Puppet run (per-node). */
+  latest_report?: boolean;
+  /** The environment associated with the reporting node. */
+  environment: string;
+  /** An identifier string that Puppet uses to match a specific catalog for a node to a specific Puppet run. */
+  configuration_version: string;
+  /** The containment path associated with the event, as an ordered array that ends with the most specific containing element. */
+  containment_path: string[];
+  /** Whether the event represents a "corrective change", meaning the event rectified configuration drift. */
+  corrective_change: boolean;
+};
+
+/**
+ * Resource log generated from Puppet report.
+ */
+export type PuppetDbReportLog = {
+  /** The manifest file in which the resource definition is located. */
+  file?: string;
+  /** The line (of the containing manifest file) at which the resource definition can be found. */
+  line?: number;
+  /** The timestamp (from the Puppet agent) at which the event occurred. Timestamps are always ISO-8601 compatible date/time strings. */
+  time: string;
+  /** A description (supplied by the resource provider) of what happened during the event. */
+  message?: string;
+  /** The log level. */
+  level: string;
+  /** Log source */
+  source: string;
+  /** Resource tags */
+  tags: string[];
+};
+
+/**
+ * A metric from a PuppetDB report.
+ */
+export type PuppetDbReportMetric = {
+  /**
+   * The name of the metric.
+   */
+  name: string;
+  /**
+   * The value of the metric.
+   */
+  value: string;
+  /**
+   * The category of the metric.
+   */
+  category: string;
+};
+
+export const puppetDbApiRef = createApiRef<PuppetDbApi>({
+  id: 'plugin.puppetdb.service',
+});
+
+/**
+ * The API provided by the PuppetDB plugin.
+ */
+export type PuppetDbApi = {
+  /**
+   * Get a list of PuppetDB reports for the specified node.
+   *
+   * @param puppetDbCertName - The name of the node that the report was received from.
+   * @returns A list of PuppetDB reports for the specified node.
+   */
+  getPuppetDbNodeReports(
+    puppetDbCertName: string,
+  ): Promise<PuppetDbReport[] | undefined>;
+
+  /**
+   * Get a specific PuppetDB report events.
+   *
+   * @param puppetDbReportHash - The ID of the report.
+   * @returns Events from a specific PuppetDB report.
+   */
+  getPuppetDbReportEvents(
+    puppetDbReportHash: string,
+  ): Promise<PuppetDbReportEvent[] | undefined>;
+
+  /**
+   * Get a specific PuppetDB report logs.
+   *
+   * @param puppetDbReportHash - The ID of the report.
+   * @returns Logs from a specific PuppetDB report.
+   */
+  getPuppetDbReportLogs(
+    puppetDbReportHash: string,
+  ): Promise<PuppetDbReportLog[] | undefined>;
+};
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.test.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.test.tsx
new file mode 100644
index 0000000000..31775014f2
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.test.tsx
@@ -0,0 +1,105 @@
+/*
+ * 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 { ReportDetailsEventsTable } from './ReportDetailsEventsTable';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { puppetDbApiRef, PuppetDbReportEvent } from '../../api';
+import { PuppetDbClient } from '../../api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { puppetDbRouteRef } from '../../routes';
+
+const events: PuppetDbReportEvent[] = [
+  {
+    name: 'event3',
+    message: 'message1',
+    file: 'file1',
+    line: 1,
+    certname: 'node1',
+    report: 'hash1',
+    timestamp: '2021-01-01T00:00:00Z',
+    report_receive_time: '2021-01-01T00:00:00Z',
+    run_start_time: '2021-01-01T00:00:00Z',
+    containing_class: 'class1',
+    environment: 'production',
+    configuration_version: 'version1',
+    containment_path: ['path1'],
+    corrective_change: false,
+    run_end_time: '2021-01-01T00:00:00Z',
+    resource_type: 'type1',
+    resource_title: 'title1',
+    property: 'property1',
+    old_value: 'old1',
+    new_value: 'new1',
+    status: 'changed',
+  },
+  {
+    name: 'event2',
+    message: 'message2',
+    file: 'file2',
+    line: 2,
+    certname: 'node1',
+    report: 'hash1',
+    timestamp: '2021-01-01T00:00:00Z',
+    report_receive_time: '2021-01-01T00:00:00Z',
+    run_start_time: '2021-01-01T00:00:00Z',
+    containing_class: 'class2',
+    environment: 'production',
+    configuration_version: 'version2',
+    containment_path: ['path2'],
+    corrective_change: false,
+    run_end_time: '2021-01-01T00:00:00Z',
+    resource_type: 'type2',
+    resource_title: 'title2',
+    property: 'property2',
+    old_value: 'old2',
+    new_value: 'new2',
+    status: 'failed',
+  },
+];
+
+const mockPuppetDbApi: Partial<PuppetDbClient> = {
+  getPuppetDbReportEvents: async () => events,
+};
+
+const apis = TestApiRegistry.from([puppetDbApiRef, mockPuppetDbApi]);
+
+const hash = 'hash';
+
+describe('ReportEventsTable', () => {
+  it('should render', async () => {
+    const render = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ReportDetailsEventsTable hash={hash} />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/puppetdb/report/:hash': puppetDbRouteRef,
+        },
+      },
+    );
+
+    expect(render.getByText('Latest events')).toBeInTheDocument();
+    expect(render.getByText('Containing Class')).toBeInTheDocument();
+    expect(render.getByText('Resource')).toBeInTheDocument();
+    expect(render.getByText('Property')).toBeInTheDocument();
+    expect(render.getByText('Old Value')).toBeInTheDocument();
+    expect(render.getByText('New Value')).toBeInTheDocument();
+    expect(render.getByText('Status')).toBeInTheDocument();
+    expect(render.getByText('property2')).toBeInTheDocument();
+    expect(render.getByText('old1')).toBeInTheDocument();
+    expect(render.getByText('old2')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.tsx
new file mode 100644
index 0000000000..b7f5b3c436
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsEventsTable.tsx
@@ -0,0 +1,145 @@
+/*
+ * 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 Typography from '@material-ui/core/Typography';
+import React from 'react';
+import { puppetDbApiRef, PuppetDbReportEvent } from '../../api';
+import {
+  ResponseErrorPanel,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+import useAsync from 'react-use/lib/useAsync';
+import { useApi } from '@backstage/core-plugin-api';
+import { makeStyles } from '@material-ui/core/styles';
+import { StatusField } from '../StatusField';
+
+type ReportEventsTableProps = {
+  hash: string;
+};
+
+const useStyles = makeStyles(theme => ({
+  empty: {
+    padding: theme.spacing(2),
+    display: 'flex',
+    justifyContent: 'center',
+  },
+}));
+
+/**
+ * Component for displaying PuppetDB report events.
+ *
+ * @public
+ */
+export const ReportDetailsEventsTable = (props: ReportEventsTableProps) => {
+  const { hash } = props;
+  const puppetDbApi = useApi(puppetDbApiRef);
+  const classes = useStyles();
+  const { value, loading, error } = useAsync(async () => {
+    return puppetDbApi.getPuppetDbReportEvents(hash);
+  }, [puppetDbApi, hash]);
+
+  if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+
+  const columns: TableColumn<PuppetDbReportEvent>[] = [
+    {
+      title: 'Run Start Time',
+      field: 'run_start_time',
+      align: 'center',
+      width: '300px',
+      render: rowData => (
+        <Typography noWrap>
+          {new Date(Date.parse(rowData.run_start_time)).toLocaleString()}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Run End Time',
+      field: 'run_end_time',
+      align: 'center',
+      width: '300px',
+      render: rowData => (
+        <Typography noWrap>
+          {new Date(Date.parse(rowData.run_end_time)).toLocaleString()}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Containing Class',
+      field: 'containing_class',
+      render: rowData => (
+        <Typography noWrap title={rowData.file || ''}>
+          {rowData.containing_class}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Resource',
+      field: 'resource_title',
+      render: rowData => (
+        <Typography noWrap>
+          {rowData.resource_type}[{rowData.resource_title}]
+        </Typography>
+      ),
+    },
+    {
+      title: 'Property',
+      field: 'property',
+      render: rowData => <Typography noWrap>{rowData.property}</Typography>,
+    },
+    {
+      title: 'Old Value',
+      field: 'old_value',
+      render: rowData => <Typography noWrap>{rowData.old_value}</Typography>,
+    },
+    {
+      title: 'New Value',
+      field: 'new_value',
+      render: rowData => <Typography noWrap>{rowData.new_value}</Typography>,
+    },
+    {
+      title: 'Status',
+      field: 'status',
+      render: rowData => <StatusField status={rowData.status} />,
+    },
+  ];
+
+  return (
+    <Table
+      options={{
+        sorting: true,
+        actionsColumnIndex: -1,
+        loadingType: 'linear',
+        padding: 'dense',
+        showEmptyDataSourceMessage: !loading,
+        showTitle: true,
+        toolbar: true,
+        pageSize: 10,
+        pageSizeOptions: [10],
+      }}
+      emptyContent={
+        <Typography color="textSecondary" className={classes.empty}>
+          No events
+        </Typography>
+      }
+      title="Latest events"
+      columns={columns}
+      data={value || []}
+      isLoading={loading}
+    />
+  );
+};
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.test.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.test.tsx
new file mode 100644
index 0000000000..2d9d973412
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.test.tsx
@@ -0,0 +1,74 @@
+/*
+ * 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 { ReportDetailsLogsTable } from './ReportDetailsLogsTable';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { puppetDbApiRef, PuppetDbReportLog } from '../../api';
+import { PuppetDbClient } from '../../api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { puppetDbRouteRef } from '../../routes';
+
+const logs: PuppetDbReportLog[] = [
+  {
+    level: 'level1',
+    file: 'file1',
+    line: 1,
+    time: '2021-01-01T00:00:00Z',
+    message: 'message1',
+    source: 'source1',
+    tags: ['tag1'],
+  },
+  {
+    level: 'level2',
+    file: 'file2',
+    line: 2,
+    time: '2021-01-01T00:00:00Z',
+    message: 'message2',
+    source: 'source2',
+    tags: ['tag2'],
+  },
+];
+
+const mockPuppetDbApi: Partial<PuppetDbClient> = {
+  getPuppetDbReportLogs: async () => logs,
+};
+
+const apis = TestApiRegistry.from([puppetDbApiRef, mockPuppetDbApi]);
+
+const hash = 'hash';
+
+describe('ReportLogsTable', () => {
+  it('should render', async () => {
+    const render = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ReportDetailsLogsTable hash={hash} />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/puppetdb/report/:hash': puppetDbRouteRef,
+        },
+      },
+    );
+
+    expect(render.getByText('Latest logs')).toBeInTheDocument();
+    expect(render.getByText('Level')).toBeInTheDocument();
+    expect(render.getByText('Timestamp')).toBeInTheDocument();
+    expect(render.getByText('Source')).toBeInTheDocument();
+    expect(render.getByText('Message')).toBeInTheDocument();
+    expect(render.getByText('source1')).toBeInTheDocument();
+    expect(render.getByText('source2')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.tsx
new file mode 100644
index 0000000000..f512fcd935
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsLogsTable.tsx
@@ -0,0 +1,133 @@
+/*
+ * 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 Typography from '@material-ui/core/Typography';
+import React from 'react';
+import { puppetDbApiRef, PuppetDbReportLog } from '../../api';
+import {
+  ResponseErrorPanel,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+import useAsync from 'react-use/lib/useAsync';
+import { useApi } from '@backstage/core-plugin-api';
+import { makeStyles } from '@material-ui/core/styles';
+import { BackstageTheme } from '@backstage/theme';
+
+type ReportLogsTableProps = {
+  hash: string;
+};
+
+const useStyles = makeStyles<BackstageTheme>(theme => ({
+  empty: {
+    padding: theme.spacing(2),
+    display: 'flex',
+    justifyContent: 'center',
+  },
+  level_error: {
+    color: theme.palette.error.light,
+  },
+  level_warning: {
+    color: theme.palette.warning.light,
+  },
+  level_notice: {
+    color: theme.palette.info.light,
+  },
+}));
+
+/**
+ * Component for displaying PuppetDB report logs.
+ *
+ * @public
+ */
+export const ReportDetailsLogsTable = (props: ReportLogsTableProps) => {
+  const { hash } = props;
+  const puppetDbApi = useApi(puppetDbApiRef);
+  const classes = useStyles();
+  const { value, loading, error } = useAsync(async () => {
+    return puppetDbApi.getPuppetDbReportLogs(hash);
+  }, [puppetDbApi, hash]);
+
+  if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+
+  const columns: TableColumn<PuppetDbReportLog>[] = [
+    {
+      title: 'Level',
+      field: 'level',
+      align: 'center',
+      width: '100px',
+      render: rowData => (
+        <Typography
+          noWrap
+          className={
+            (rowData.level === 'warning' && classes.level_warning) ||
+            (rowData.level === 'error' && classes.level_error) ||
+            classes.level_notice
+          }
+        >
+          {rowData.level.toLocaleUpperCase('en-US')}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Timestamp',
+      field: 'time',
+      align: 'center',
+      width: '300px',
+      render: rowData => (
+        <Typography noWrap>
+          {new Date(Date.parse(rowData.time)).toLocaleString()}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Source',
+      field: 'source',
+      render: rowData => <Typography noWrap>{rowData.source}</Typography>,
+    },
+    {
+      title: 'Message',
+      field: 'message',
+      render: rowData => <Typography noWrap>{rowData.message}</Typography>,
+    },
+  ];
+
+  return (
+    <Table
+      options={{
+        sorting: true,
+        actionsColumnIndex: -1,
+        loadingType: 'linear',
+        padding: 'dense',
+        showEmptyDataSourceMessage: !loading,
+        showTitle: true,
+        toolbar: true,
+        pageSize: 10,
+        pageSizeOptions: [10],
+      }}
+      emptyContent={
+        <Typography color="textSecondary" className={classes.empty}>
+          No logs
+        </Typography>
+      }
+      title="Latest logs"
+      columns={columns}
+      data={value || []}
+      isLoading={loading}
+    />
+  );
+};
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.test.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.test.tsx
new file mode 100644
index 0000000000..e6ade0e596
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * 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 { ReportDetailsPage } from './ReportDetailsPage';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { puppetDbRouteRef } from '../../routes';
+import { puppetDbApiRef, PuppetDbClient } from '../../api';
+import { ApiProvider } from '@backstage/core-app-api';
+
+const mockPuppetDbApi: Partial<PuppetDbClient> = {
+  getPuppetDbReportEvents: async () => [],
+};
+
+const apis = TestApiRegistry.from([puppetDbApiRef, mockPuppetDbApi]);
+
+describe('ReportDetailsPage', () => {
+  it('should render', async () => {
+    const render = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ReportDetailsPage />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/puppetdb/report': puppetDbRouteRef,
+        },
+      },
+    );
+    expect(render.getByText('PuppetDB Reports')).toBeInTheDocument();
+    expect(render.getByText('Events')).toBeInTheDocument();
+    expect(render.getByText('Logs')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.tsx b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.tsx
new file mode 100644
index 0000000000..db6536fce4
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/ReportDetailsPage.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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 { Link as RouterLink, useParams } from 'react-router-dom';
+import { Breadcrumbs, Link } from '@backstage/core-components';
+import { makeStyles } from '@material-ui/core/styles';
+import { useRouteRef } from '@backstage/core-plugin-api';
+import { puppetDbRouteRef } from '../../routes';
+import React, { useState } from 'react';
+import {
+  Card,
+  CardContent,
+  Tab,
+  Box,
+  Typography,
+  Tabs,
+} from '@material-ui/core';
+import { BackstageTheme } from '@backstage/theme';
+import { ReportDetailsEventsTable } from './ReportDetailsEventsTable';
+import { ReportDetailsLogsTable } from './ReportDetailsLogsTable';
+
+const useStyles = makeStyles<BackstageTheme>(theme => ({
+  cards: {
+    marginTop: theme.spacing(2),
+  },
+  tabs: {
+    borderBottom: `1px solid ${theme.palette.textVerySubtle}`,
+    backgroundColor: theme.palette.background.default,
+    padding: theme.spacing(0, 4),
+  },
+  default: {
+    padding: theme.spacing(2),
+    fontWeight: theme.typography.fontWeightBold,
+    color: theme.palette.text.secondary,
+    textTransform: 'uppercase',
+  },
+  selected: {
+    color: theme.palette.text.primary,
+  },
+}));
+
+/**
+ * Component for displaying the details of a PuppetDB report.
+ *
+ * @public
+ */
+export const ReportDetailsPage = () => {
+  const { hash = '' } = useParams();
+  const classes = useStyles();
+  const [tabIndex, setTabIndex] = useState(0);
+  const reportsRouteLink = useRouteRef(puppetDbRouteRef);
+  const tabs = [
+    { id: 'events', label: 'Events' },
+    { id: 'logs', label: 'Logs' },
+  ];
+  const safeTabIndex = tabIndex > tabs.length - 1 ? 0 : tabIndex;
+
+  return (
+    <div>
+      <Breadcrumbs aria-label="breadcrumb">
+        <Link component={RouterLink} to={reportsRouteLink()}>
+          PuppetDB Reports
+        </Link>
+        <Typography noWrap>{hash}</Typography>
+      </Breadcrumbs>
+      <Card
+        style={{ position: 'relative', overflow: 'visible' }}
+        className={classes.cards}
+      >
+        <CardContent>
+          <Tabs
+            indicatorColor="primary"
+            onChange={(_, index) => setTabIndex(index)}
+            value={safeTabIndex}
+          >
+            {tabs.map((tab, index) => (
+              <Tab
+                className={classes.default}
+                label={tab.label}
+                key={tab.id}
+                value={index}
+                classes={{ selected: classes.selected }}
+              />
+            ))}
+          </Tabs>
+          <Box ml={2} pt={2} my={1} display="flex" flexDirection="column">
+            {safeTabIndex === 0 && <ReportDetailsEventsTable hash={hash} />}
+            {safeTabIndex === 1 && <ReportDetailsLogsTable hash={hash} />}
+          </Box>
+        </CardContent>
+      </Card>
+    </div>
+  );
+};
diff --git a/plugins/puppetdb/src/components/ReportDetailsPage/index.ts b/plugins/puppetdb/src/components/ReportDetailsPage/index.ts
new file mode 100644
index 0000000000..8c0153c853
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportDetailsPage/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { ReportDetailsPage } from './ReportDetailsPage';
+export { ReportDetailsEventsTable } from './ReportDetailsEventsTable';
+export { ReportDetailsLogsTable } from './ReportDetailsLogsTable';
diff --git a/plugins/puppetdb/src/components/ReportsPage/ReportsPage.test.tsx b/plugins/puppetdb/src/components/ReportsPage/ReportsPage.test.tsx
new file mode 100644
index 0000000000..a4c094f69a
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportsPage/ReportsPage.test.tsx
@@ -0,0 +1,85 @@
+/*
+ * 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 { ReportsPage } from './ReportsPage';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { puppetDbApiRef, PuppetDbClient } from '../../api';
+import { ANNOTATION_PUPPET_CERTNAME } from '../../constants';
+import { Entity } from '@backstage/catalog-model/';
+import { isPuppetDbAvailable } from '../Router';
+import { ApiProvider } from '@backstage/core-app-api';
+import { puppetDbRouteRef } from '../../routes';
+
+const entity: Entity = {
+  apiVersion: 'backstage.io/v1alpha1',
+  kind: 'Resource',
+  metadata: {
+    name: 'test',
+    annotations: {
+      [ANNOTATION_PUPPET_CERTNAME]: 'node1',
+    },
+  },
+};
+
+const entityWithoutAnnotations: Entity = {
+  apiVersion: 'backstage.io/v1alpha1',
+  kind: 'Resource',
+  metadata: {
+    name: 'test',
+    annotations: {},
+  },
+};
+
+const mockPuppetDbApi: Partial<PuppetDbClient> = {
+  getPuppetDbNodeReports: async () => [],
+};
+
+const apis = TestApiRegistry.from([puppetDbApiRef, mockPuppetDbApi]);
+
+describe('isPuppetDbAvailable', () => {
+  describe('when entity has no annotations', () => {
+    it('returns false', () => {
+      expect(isPuppetDbAvailable(entityWithoutAnnotations)).toBe(false);
+    });
+  });
+
+  describe('when entity has the puppet annotation', () => {
+    it('returns true', () => {
+      expect(isPuppetDbAvailable(entity)).toBe(true);
+    });
+  });
+});
+
+describe('ReportsPage', () => {
+  it('should render', async () => {
+    const render = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={entity}>
+          <ReportsPage />
+        </EntityProvider>
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/puppetdb': puppetDbRouteRef,
+        },
+      },
+    );
+    expect(
+      render.getByText('Latest PuppetDB reports from node node1'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/packages/core-components/src/components/Tabs/TabPanel.tsx b/plugins/puppetdb/src/components/ReportsPage/ReportsPage.tsx
similarity index 51%
rename from packages/core-components/src/components/Tabs/TabPanel.tsx
rename to plugins/puppetdb/src/components/ReportsPage/ReportsPage.tsx
index 3ecc1ba046..8c99e590b5 100644
--- a/packages/core-components/src/components/Tabs/TabPanel.tsx
+++ b/plugins/puppetdb/src/components/ReportsPage/ReportsPage.tsx
@@ -13,25 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Box from '@material-ui/core/Box';
-import React, { PropsWithChildren } from 'react';
+import React from 'react';
+import { ReportsTable } from './ReportsTable';
+import { Page, Content } from '@backstage/core-components';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { ANNOTATION_PUPPET_CERTNAME } from '../../constants';
 
-export interface TabPanelProps {
-  value?: any;
-  index?: number;
-}
-
-export const TabPanel = (props: PropsWithChildren<TabPanelProps>) => {
-  const { children, value, index, ...other } = props;
+/**
+ * Component to display PuppetDB reports page.
+ *
+ * @public
+ */
+export const ReportsPage = () => {
+  const { entity } = useEntity();
+  const certName =
+    entity?.metadata?.annotations?.[ANNOTATION_PUPPET_CERTNAME] ?? '';
 
   return (
-    <Box
-      role="tabpanel"
-      hidden={value !== index}
-      aria-labelledby={`scrollable-auto-tab-${index}`}
-      {...other}
-    >
-      {value === index && <Box p={3}>{children}</Box>}
-    </Box>
+    <Page themeId="tool">
+      <Content>
+        <ReportsTable certName={certName} />
+      </Content>
+    </Page>
   );
 };
diff --git a/plugins/puppetdb/src/components/ReportsPage/ReportsTable.test.tsx b/plugins/puppetdb/src/components/ReportsPage/ReportsTable.test.tsx
new file mode 100644
index 0000000000..fadfb1a3f9
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportsPage/ReportsTable.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * 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 { ReportsTable } from './ReportsTable';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { puppetDbApiRef, PuppetDbReport, PuppetDbClient } from '../../api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { puppetDbRouteRef } from '../../routes';
+
+const reports: PuppetDbReport[] = [
+  {
+    hash: 'hash1',
+    puppet_version: 'version1',
+    report_format: 1,
+    certname: 'node1',
+    start_time: '2021-01-01T00:00:00Z',
+    end_time: '2021-01-01T00:00:00Z',
+    producer_timestamp: '2021-01-01T00:00:00Z',
+    receive_time: '2021-01-01T00:00:00Z',
+    producer: 'producer1',
+    transaction_uuid: 'uuid1',
+    catalog_uuid: 'uuid1',
+    code_id: 'id1',
+    cached_catalog_status: 'status1',
+    type: 'type1',
+    corrective_change: false,
+    configuration_version: 'version1',
+    environment: 'production',
+    noop: true,
+    status: 'changed',
+  },
+  {
+    hash: 'hash2',
+    puppet_version: 'version2',
+    report_format: 2,
+    certname: 'node1',
+    start_time: '2021-01-01T00:00:00Z',
+    end_time: '2021-01-01T00:00:00Z',
+    producer_timestamp: '2021-01-01T00:00:00Z',
+    receive_time: '2021-01-01T00:00:00Z',
+    producer: 'producer2',
+    transaction_uuid: 'uuid2',
+    catalog_uuid: 'uuid2',
+    code_id: 'id2',
+    cached_catalog_status: 'status2',
+    type: 'type2',
+    corrective_change: false,
+    configuration_version: 'version2',
+    environment: 'production',
+    noop: false,
+    status: 'failed',
+  },
+];
+
+const mockPuppetDbApi: Partial<PuppetDbClient> = {
+  getPuppetDbNodeReports: async () => reports,
+};
+
+const apis = TestApiRegistry.from([puppetDbApiRef, mockPuppetDbApi]);
+
+const certName = 'node1';
+
+describe('ReportsTable', () => {
+  it('should render', async () => {
+    const render = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <ReportsTable certName={certName} />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/puppetdb': puppetDbRouteRef,
+        },
+      },
+    );
+
+    expect(
+      render.getByText('Latest PuppetDB reports from node node1'),
+    ).toBeInTheDocument();
+    expect(render.getByText('Configuration Version')).toBeInTheDocument();
+    expect(render.getByText('Start Time')).toBeInTheDocument();
+    expect(render.getByText('End Time')).toBeInTheDocument();
+    expect(render.getByText('Run Duration')).toBeInTheDocument();
+    expect(render.getByText('Mode')).toBeInTheDocument();
+    expect(render.getByText('Status')).toBeInTheDocument();
+    expect(render.getByText('NO-NOOP')).toBeInTheDocument();
+    expect(render.getByText('NOOP')).toBeInTheDocument();
+    expect(render.getByText('FAILED')).toBeInTheDocument();
+    expect(render.getByText('CHANGED')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/puppetdb/src/components/ReportsPage/ReportsTable.tsx b/plugins/puppetdb/src/components/ReportsPage/ReportsTable.tsx
new file mode 100644
index 0000000000..3aeecc70b0
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportsPage/ReportsTable.tsx
@@ -0,0 +1,169 @@
+/*
+ * 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 { puppetDbApiRef, PuppetDbReport } from '../../api';
+import useAsync from 'react-use/lib/useAsync';
+import React from 'react';
+import {
+  Link,
+  ResponseErrorPanel,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+import { useApi, useRouteRef } from '@backstage/core-plugin-api';
+import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import { Link as RouterLink } from 'react-router-dom';
+import { puppetDbReportRouteRef } from '../../routes';
+import { StatusField } from '../StatusField';
+
+type ReportsTableProps = {
+  certName: string;
+};
+
+const useStyles = makeStyles(theme => ({
+  empty: {
+    padding: theme.spacing(2),
+    display: 'flex',
+    justifyContent: 'center',
+  },
+}));
+
+/**
+ * Component for displaying a table of PuppetDB reports for a given node.
+ *
+ * @public
+ */
+export const ReportsTable = (props: ReportsTableProps) => {
+  const { certName } = props;
+  const puppetDbApi = useApi(puppetDbApiRef);
+  const reportsRouteLink = useRouteRef(puppetDbReportRouteRef);
+  const classes = useStyles();
+
+  const { value, loading, error } = useAsync(async () => {
+    return puppetDbApi.getPuppetDbNodeReports(certName);
+  }, [puppetDbApi, certName]);
+
+  if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+
+  const columns: TableColumn<PuppetDbReport>[] = [
+    {
+      title: 'Configuration Version',
+      field: 'configuration_version',
+      render: rowData => (
+        <Link
+          component={RouterLink}
+          to={reportsRouteLink({ hash: rowData.hash! })}
+        >
+          {rowData.configuration_version !== '' ? (
+            <Typography noWrap>{rowData.configuration_version}</Typography>
+          ) : (
+            <Typography noWrap>
+              <em>(N/A)</em>
+            </Typography>
+          )}
+        </Link>
+      ),
+    },
+    {
+      title: 'Start Time',
+      field: 'start_time',
+      align: 'center',
+      width: '300px',
+      render: rowData => (
+        <Typography noWrap>
+          {new Date(Date.parse(rowData.start_time)).toLocaleString()}
+        </Typography>
+      ),
+    },
+    {
+      title: 'End Time',
+      field: 'end_time',
+      align: 'center',
+      width: '300px',
+      render: rowData => (
+        <Typography noWrap>
+          {new Date(Date.parse(rowData.end_time)).toLocaleString()}
+        </Typography>
+      ),
+    },
+    {
+      title: 'Run Duration',
+      align: 'center',
+      width: '400px',
+      render: rowData => {
+        const start_date = new Date(Date.parse(rowData.start_time));
+        const end_date = new Date(Date.parse(rowData.end_time));
+        const duration = new Date(end_date.getTime() - start_date.getTime());
+        return (
+          <Typography noWrap>
+            {duration.getUTCHours().toString().padStart(2, '0')}:
+            {duration.getUTCMinutes().toString().padStart(2, '0')}:
+            {duration.getUTCSeconds().toString().padStart(2, '0')}.
+            {duration.getUTCMilliseconds().toString().padStart(4, '0')}
+          </Typography>
+        );
+      },
+    },
+    {
+      title: 'Environment',
+      field: 'environment',
+    },
+    {
+      title: 'Mode',
+      field: 'noop',
+      align: 'center',
+      render: rowData =>
+        rowData.noop ? (
+          <Typography>NOOP</Typography>
+        ) : (
+          <Typography>NO-NOOP</Typography>
+        ),
+    },
+    {
+      title: 'Status',
+      field: 'status',
+      align: 'center',
+      render: rowData => <StatusField status={rowData.status} />,
+    },
+  ];
+
+  return (
+    <Table
+      options={{
+        sorting: true,
+        actionsColumnIndex: -1,
+        loadingType: 'linear',
+        padding: 'dense',
+        showEmptyDataSourceMessage: !loading,
+        showTitle: true,
+        toolbar: true,
+        pageSize: 10,
+        pageSizeOptions: [10],
+      }}
+      emptyContent={
+        <Typography color="textSecondary" className={classes.empty}>
+          No reports
+        </Typography>
+      }
+      title={`Latest PuppetDB reports from node ${certName}`}
+      columns={columns}
+      data={value || []}
+      isLoading={loading}
+    />
+  );
+};
diff --git a/plugins/puppetdb/src/components/ReportsPage/index.ts b/plugins/puppetdb/src/components/ReportsPage/index.ts
new file mode 100644
index 0000000000..60840e5eb5
--- /dev/null
+++ b/plugins/puppetdb/src/components/ReportsPage/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { ReportsPage } from './ReportsPage';
+export { ReportsTable } from './ReportsTable';
diff --git a/plugins/puppetdb/src/components/Router.tsx b/plugins/puppetdb/src/components/Router.tsx
new file mode 100644
index 0000000000..3a8a05911b
--- /dev/null
+++ b/plugins/puppetdb/src/components/Router.tsx
@@ -0,0 +1,55 @@
+/*
+ * 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 { Routes, Route } from 'react-router-dom';
+import { puppetDbReportRouteRef } from '../routes';
+import { ANNOTATION_PUPPET_CERTNAME } from '../constants';
+import { Entity } from '@backstage/catalog-model';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { MissingAnnotationEmptyState } from '@backstage/core-components';
+import { ReportsPage } from './ReportsPage';
+import { ReportDetailsPage } from './ReportDetailsPage';
+
+/**
+ * Checks if the entity has a puppet certname annotation.
+ * @param entity - The entity to check for the puppet certname annotation.
+ *
+ * @public
+ */
+export const isPuppetDbAvailable = (entity: Entity) =>
+  Boolean(entity.metadata.annotations?.[ANNOTATION_PUPPET_CERTNAME]);
+
+/** @public */
+export const Router = () => {
+  const { entity } = useEntity();
+
+  if (!isPuppetDbAvailable(entity)) {
+    return (
+      <MissingAnnotationEmptyState annotation={ANNOTATION_PUPPET_CERTNAME} />
+    );
+  }
+
+  return (
+    <Routes>
+      <Route path="/" element={<ReportsPage />} />
+      <Route
+        path={`${puppetDbReportRouteRef.path}`}
+        element={<ReportDetailsPage />}
+      />
+    </Routes>
+  );
+};
diff --git a/plugins/puppetdb/src/components/StatusField/StatusField.test.tsx b/plugins/puppetdb/src/components/StatusField/StatusField.test.tsx
new file mode 100644
index 0000000000..1aa8c94ce9
--- /dev/null
+++ b/plugins/puppetdb/src/components/StatusField/StatusField.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * 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 { StatusField } from './StatusField';
+import { renderInTestApp } from '@backstage/test-utils';
+
+describe('StatusField', () => {
+  it('should render failed', async () => {
+    const render = await renderInTestApp(<StatusField status="failed" />);
+    expect(render.getByText('FAILED')).toBeInTheDocument();
+    expect(
+      render.container.querySelector('span[aria-label="Status error"]'),
+    ).toBeInTheDocument();
+  });
+
+  it('should render changed', async () => {
+    const render = await renderInTestApp(<StatusField status="changed" />);
+    expect(render.getByText('CHANGED')).toBeInTheDocument();
+    expect(
+      render.container.querySelector('span[aria-label="Status running"]'),
+    ).toBeInTheDocument();
+  });
+
+  it('should render unchanged', async () => {
+    const render = await renderInTestApp(<StatusField status="unchanged" />);
+    expect(render.getByText('UNCHANGED')).toBeInTheDocument();
+    expect(
+      render.container.querySelector('span[aria-label="Status pending"]'),
+    ).toBeInTheDocument();
+  });
+
+  it('should render default', async () => {
+    const render = await renderInTestApp(<StatusField status="successful" />);
+    expect(render.getByText('SUCCESSFUL')).toBeInTheDocument();
+    expect(
+      render.container.querySelector('span[aria-label="Status ok"]'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/puppetdb/src/components/StatusField/StatusField.tsx b/plugins/puppetdb/src/components/StatusField/StatusField.tsx
new file mode 100644
index 0000000000..7c1d1b1efc
--- /dev/null
+++ b/plugins/puppetdb/src/components/StatusField/StatusField.tsx
@@ -0,0 +1,68 @@
+/*
+ * 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 {
+  StatusPending,
+  StatusRunning,
+  StatusOK,
+  StatusError,
+} from '@backstage/core-components';
+
+type StatusCellProps = {
+  status: string;
+};
+
+/**
+ * Component to display status field for Puppet reports and events.
+ *
+ * @public
+ */
+export const StatusField = (props: StatusCellProps) => {
+  const { status } = props;
+
+  const statusUC = status.toLocaleUpperCase('en-US');
+  switch (status) {
+    case 'failed':
+      return (
+        <>
+          <StatusError />
+          {statusUC}
+        </>
+      );
+    case 'changed':
+      return (
+        <>
+          <StatusRunning />
+          {statusUC}
+        </>
+      );
+    case 'unchanged':
+      return (
+        <>
+          <StatusPending />
+          {statusUC}
+        </>
+      );
+    default:
+      return (
+        <>
+          <StatusOK />
+          {statusUC}
+        </>
+      );
+  }
+};
diff --git a/plugins/puppetdb/src/components/StatusField/index.ts b/plugins/puppetdb/src/components/StatusField/index.ts
new file mode 100644
index 0000000000..4f1a8aad1c
--- /dev/null
+++ b/plugins/puppetdb/src/components/StatusField/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { StatusField } from './StatusField';
diff --git a/plugins/puppetdb/src/constants.ts b/plugins/puppetdb/src/constants.ts
new file mode 100644
index 0000000000..57fb4373f4
--- /dev/null
+++ b/plugins/puppetdb/src/constants.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.
+ */
+
+/**
+ * Annotation for specifying the certificate name of a node in PuppetDB.
+ *
+ * @public
+ */
+export const ANNOTATION_PUPPET_CERTNAME = 'puppet.com/certname';
diff --git a/plugins/puppetdb/src/index.ts b/plugins/puppetdb/src/index.ts
new file mode 100644
index 0000000000..2361a44bed
--- /dev/null
+++ b/plugins/puppetdb/src/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 {
+  puppetdbPlugin,
+  puppetdbPlugin as plugin,
+  PuppetDbPage,
+} from './plugin';
+export { Router, isPuppetDbAvailable } from './components/Router';
+export * from './routes';
diff --git a/plugins/puppetdb/src/plugin.test.ts b/plugins/puppetdb/src/plugin.test.ts
new file mode 100644
index 0000000000..947b88d129
--- /dev/null
+++ b/plugins/puppetdb/src/plugin.test.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.
+ */
+import { puppetdbPlugin } from './plugin';
+
+describe('puppetdb', () => {
+  it('should export plugin', () => {
+    expect(puppetdbPlugin).toBeDefined();
+  });
+});
diff --git a/plugins/puppetdb/src/plugin.ts b/plugins/puppetdb/src/plugin.ts
new file mode 100644
index 0000000000..91a2cbf6c6
--- /dev/null
+++ b/plugins/puppetdb/src/plugin.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 {
+  createApiFactory,
+  createPlugin,
+  createRoutableExtension,
+  discoveryApiRef,
+  fetchApiRef,
+} from '@backstage/core-plugin-api';
+
+import { puppetDbApiRef, PuppetDbClient } from './api';
+import { puppetDbRouteRef } from './routes';
+
+/**
+ * Create the PuppetDB frontend plugin.
+ *
+ * @public
+ * */
+export const puppetdbPlugin = createPlugin({
+  id: 'puppetDb',
+  apis: [
+    createApiFactory({
+      api: puppetDbApiRef,
+      deps: { discoveryApi: discoveryApiRef, fetchApi: fetchApiRef },
+      factory: ({ discoveryApi, fetchApi }) =>
+        new PuppetDbClient({ discoveryApi, fetchApi }),
+    }),
+  ],
+});
+
+/**
+ * Creates a routable extension for the PuppetDB plugin content.
+ *
+ * @public
+ */
+export const PuppetDbPage = puppetdbPlugin.provide(
+  createRoutableExtension({
+    name: 'PuppetDbPage',
+    component: () => import('./components/Router').then(m => m.Router),
+    mountPoint: puppetDbRouteRef,
+  }),
+);
diff --git a/plugins/puppetdb/src/routes.ts b/plugins/puppetdb/src/routes.ts
new file mode 100644
index 0000000000..d6812f9f2c
--- /dev/null
+++ b/plugins/puppetdb/src/routes.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 { createRouteRef, createSubRouteRef } from '@backstage/core-plugin-api';
+
+/** @public */
+export const puppetDbRouteRef = createRouteRef({
+  id: 'puppetdb',
+});
+
+/** @public */
+export const puppetDbReportRouteRef = createSubRouteRef({
+  id: 'puppetdb/report',
+  path: '/:hash',
+  parent: puppetDbRouteRef,
+});
diff --git a/plugins/puppetdb/src/setupTests.ts b/plugins/puppetdb/src/setupTests.ts
new file mode 100644
index 0000000000..73dd8dce47
--- /dev/null
+++ b/plugins/puppetdb/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';
+import 'cross-fetch/polyfill';
diff --git a/plugins/rollbar-backend/CHANGELOG.md b/plugins/rollbar-backend/CHANGELOG.md
index 38d24cc574..896d1c6116 100644
--- a/plugins/rollbar-backend/CHANGELOG.md
+++ b/plugins/rollbar-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-rollbar-backend
 
+## 0.1.41-next.2
+
+### Patch Changes
+
+- 66b6cfc5716: Replace `camelcase-keys` dependency with one with better compatibility.
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+
 ## 0.1.41-next.1
 
 ### Patch Changes
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 4ba138d6ca..e400d33ba9 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.41-next.1",
+  "version": "0.1.41-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 4ba47698cd..6aa26f2a0c 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-rollbar
 
+## 0.4.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.4.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.4.17-next.1
 
 ### Patch Changes
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index b2c3159fec..c987308b83 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.17-next.1",
+  "version": "0.4.17-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index 84d7f00322..62e46c4d30 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
 
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.0-next.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index 81357b3158..c614f43c2f 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.1.0-next.0",
+  "version": "0.1.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index 53fce1f10b..faa42cab68 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.2.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.2.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
 ## 0.2.19-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 543e0b1f7a..0b0d7e9487 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.19-next.1",
+  "version": "0.2.19-next.3",
   "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 a063b46465..d275451e68 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-scaffolder-backend-module-gitlab
 
+## 0.1.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+
 ## 0.1.0-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index 632ff0c4f6..8080c8f629 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.1.0-next.1",
+  "version": "0.1.0-next.3",
   "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 2e12f048ef..6150b9dc8b 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.4.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.3
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.4.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/plugin-scaffolder-backend@1.13.0-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+
 ## 0.4.12-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index b47a7535e4..f49b6598dd 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.12-next.1",
+  "version": "0.4.12-next.3",
   "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 7e253a7064..801781b26a 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-scaffolder-backend-module-sentry
 
+## 0.1.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.1.4-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index b57806f136..8549393820 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.4-next.1",
+  "version": "0.1.4-next.3",
   "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 5fb4a87f10..c7a4be33ca 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.2.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+
 ## 0.2.17-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 6cca671d4d..76be28d354 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.17-next.1",
+  "version": "0.2.17-next.3",
   "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 ae69fd3548..9b90ea5ccc 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.13.0-next.3
+
+### Minor Changes
+
+- d7c8c222e25: Allow for a commit message to differ from the PR title when publishing a GitHub pull request.
+
+### Patch Changes
+
+- f37a95adcd8: Stripped entity types and namespace before passing to GitHub API
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 1.13.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
 ## 1.13.0-next.1
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend/alpha-api-report.md b/plugins/scaffolder-backend/alpha-api-report.md
index e762c2be4f..f636ecbb37 100644
--- a/plugins/scaffolder-backend/alpha-api-report.md
+++ b/plugins/scaffolder-backend/alpha-api-report.md
@@ -40,7 +40,7 @@ export const scaffolderConditions: Conditions<{
 
 // @alpha
 export const scaffolderPlugin: (
-  options: ScaffolderPluginOptions,
+  options?: ScaffolderPluginOptions | undefined,
 ) => BackendFeature;
 
 // @alpha
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 2faaeca7cc..5b12455d0f 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -559,6 +559,7 @@ export const createPublishGithubPullRequestAction: (
     token?: string | undefined;
     reviewers?: string[] | undefined;
     teamReviewers?: string[] | undefined;
+    commitMessage?: string | undefined;
   },
   JsonObject
 >;
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 1e234feb37..08d3ab9b5a 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.13.0-next.1",
+  "version": "1.13.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index 97abf41828..379a7394be 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -67,7 +67,7 @@ class ScaffolderActionsExtensionPointImpl
  * @alpha
  */
 export const scaffolderPlugin = createBackendPlugin(
-  (options: ScaffolderPluginOptions) => ({
+  (options?: ScaffolderPluginOptions) => ({
     pluginId: 'scaffolder',
     register(env) {
       const actionsExtensions = new ScaffolderActionsExtensionPointImpl();
@@ -101,10 +101,10 @@ export const scaffolderPlugin = createBackendPlugin(
             taskBroker,
             taskWorkers,
             additionalTemplateGlobals,
-          } = options;
+          } = options ?? {};
           const log = loggerToWinstonLogger(logger);
 
-          const actions = options.actions || [
+          const actions = options?.actions || [
             ...actionsExtensions.actions,
             ...createBuiltinActions({
               integrations: ScmIntegrations.fromConfig(config),
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
index a9ef8c3daa..4f23839fca 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
@@ -28,6 +28,7 @@ import {
 import { when } from 'jest-when';
 import { PassThrough } from 'stream';
 import { createGithubRepoCreateAction } from './githubRepoCreate';
+import { entityRefToName } from '../helpers';
 
 const mockOctokit = {
   rest: {
@@ -83,15 +84,17 @@ describe('github:repo:create', () => {
   };
 
   beforeEach(() => {
-    jest.resetAllMocks();
     githubCredentialsProvider =
       DefaultGithubCredentialsProvider.fromIntegrations(integrations);
     action = createGithubRepoCreateAction({
       integrations,
       githubCredentialsProvider,
     });
+    (entityRefToName as jest.Mock).mockImplementation((s: string) => s);
   });
 
+  afterEach(jest.resetAllMocks);
+
   it('should call the githubApis with the correct values for createInOrg', async () => {
     mockOctokit.rest.users.getByUsername.mockResolvedValue({
       data: { type: 'Organization' },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index c7fd1caf5c..b41beaede8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -29,6 +29,7 @@ import {
   initRepoAndPush,
 } from '../helpers';
 import { getRepoSourceDirectory, parseRepoUrl } from '../publish/util';
+import { entityRefToName } from '../../builtin/helpers';
 
 const DEFAULT_TIMEOUT_MS = 60_000;
 
@@ -218,13 +219,13 @@ export async function createGithubRepoWithCollaboratorsAndTopics(
           await client.rest.repos.addCollaborator({
             owner,
             repo,
-            username: collaborator.user,
+            username: entityRefToName(collaborator.user),
             permission: collaborator.access,
           });
         } else if ('team' in collaborator) {
           await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
             org: owner,
-            team_slug: collaborator.team,
+            team_slug: entityRefToName(collaborator.team),
             owner,
             repo,
             permission: collaborator.access,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts
index 60ab84a964..7362e99892 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.test.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { getVoidLogger, Git } from '@backstage/backend-common';
-import { commitAndPushRepo, initRepoAndPush } from './helpers';
+import { Git, getVoidLogger } from '@backstage/backend-common';
+import { commitAndPushRepo, entityRefToName, initRepoAndPush } from './helpers';
 
 jest.mock('@backstage/backend-common', () => ({
   Git: {
@@ -303,3 +303,17 @@ describe('commitAndPushRepo', () => {
     });
   });
 });
+
+describe('entityRefToName', () => {
+  it.each([
+    'user:default/catpants',
+    'group:default/catpants',
+    'user:catpants',
+    'default/catpants',
+    'user:custom/catpants',
+    'group:custom/catpants',
+    'catpants',
+  ])('should parse: "%s"', (entityName: string) => {
+    expect(entityRefToName(entityName)).toEqual('catpants');
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
index 0ea86000d1..f51ab47f16 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
@@ -299,3 +299,7 @@ export function getGitCommitMessage(
     ? gitCommitMessage
     : config.getOptionalString('scaffolder.defaultCommitMessage');
 }
+
+export function entityRefToName(name: string): string {
+  return name.replace(/^.*[:/]/g, '');
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index 576a207786..50d40f1bd5 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -27,6 +27,7 @@ import { when } from 'jest-when';
 import { PassThrough } from 'stream';
 import {
   enableBranchProtectionOnDefaultRepoBranch,
+  entityRefToName,
   initRepoAndPush,
 } from '../helpers';
 import { createPublishGithubAction } from './github';
@@ -70,6 +71,8 @@ describe('publish:github', () => {
     },
   });
 
+  const { entityRefToName: realFamiliarizeEntityName } =
+    jest.requireActual('../helpers');
   const integrations = ScmIntegrations.fromConfig(config);
   let githubCredentialsProvider: GithubCredentialsProvider;
   let action: TemplateAction<any>;
@@ -89,12 +92,9 @@ describe('publish:github', () => {
   };
 
   beforeEach(() => {
-    jest.resetAllMocks();
-
     initRepoAndPushMocked.mockResolvedValue({
       commitHash: '220f19cc36b551763d157f1b5e4a4b446165dbd6',
     });
-
     githubCredentialsProvider =
       DefaultGithubCredentialsProvider.fromIntegrations(integrations);
     action = createPublishGithubAction({
@@ -102,8 +102,15 @@ describe('publish:github', () => {
       config,
       githubCredentialsProvider,
     });
+
+    // restore real implmentation
+    (entityRefToName as jest.Mock).mockImplementation(
+      realFamiliarizeEntityName,
+    );
   });
 
+  afterEach(jest.resetAllMocks);
+
   it('should fail to create if the team is not found in the org', async () => {
     mockOctokit.rest.users.getByUsername.mockResolvedValue({
       data: { type: 'Organization' },
@@ -658,6 +665,59 @@ describe('publish:github', () => {
     });
   });
 
+  it('should familiarize entity names while adding collaborators', 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: {
+        ...mockContext.input,
+        collaborators: [
+          {
+            access: 'pull',
+            user: 'user:robot-1',
+          },
+          {
+            access: 'push',
+            team: 'group:default/robot-2',
+          },
+        ],
+      },
+    });
+
+    const commonProperties = {
+      owner: 'owner',
+      repo: 'repo',
+    };
+
+    expect(mockOctokit.rest.repos.addCollaborator).toHaveBeenCalledWith({
+      ...commonProperties,
+      username: 'robot-1',
+      permission: 'pull',
+    });
+
+    expect(
+      mockOctokit.rest.teams.addOrUpdateRepoPermissionsInOrg,
+    ).toHaveBeenCalledWith({
+      ...commonProperties,
+      org: 'owner',
+      team_slug: 'robot-2',
+      permission: 'push',
+    });
+
+    expect(entityRefToName).toHaveBeenCalledWith('user:robot-1');
+    expect(entityRefToName).toHaveBeenCalledWith('group:default/robot-2');
+  });
+
   it('should ignore failures when adding multiple collaborators', async () => {
     mockOctokit.rest.users.getByUsername.mockResolvedValue({
       data: { type: 'User' },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
index 70fff20446..7750277728 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
@@ -545,4 +545,56 @@ describe('createPublishGithubPullRequestAction', () => {
       expect(ctx.output).toHaveBeenCalledWith('pullRequestNumber', 123);
     });
   });
+
+  describe('with commit message', () => {
+    let input: GithubPullRequestActionInput;
+    let ctx: ActionContext<GithubPullRequestActionInput>;
+
+    beforeEach(() => {
+      input = {
+        repoUrl: 'github.com?owner=myorg&repo=myrepo',
+        title: 'Create my new app',
+        branchName: 'new-app',
+        description: 'This PR is really good',
+        commitMessage: 'Create my new app, but in the commit message',
+      };
+
+      mockFs({
+        [workspacePath]: { 'file.txt': 'Hello there!' },
+      });
+
+      ctx = {
+        createTemporaryDirectory: jest.fn(),
+        output: jest.fn(),
+        logger: getRootLogger(),
+        logStream: new Writable(),
+        input,
+        workspacePath,
+      };
+    });
+
+    it('creates a pull request', async () => {
+      await instance.handler(ctx);
+
+      expect(fakeClient.createPullRequest).toHaveBeenCalledWith({
+        owner: 'myorg',
+        repo: 'myrepo',
+        title: 'Create my new app',
+        head: 'new-app',
+        body: 'This PR is really good',
+        changes: [
+          {
+            commit: 'Create my new app, but in the commit message',
+            files: {
+              'file.txt': {
+                content: Buffer.from('Hello there!').toString('base64'),
+                encoding: 'base64',
+                mode: '100644',
+              },
+            },
+          },
+        ],
+      });
+    });
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
index b8c0068d70..6706ad9c06 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
@@ -136,6 +136,7 @@ export const createPublishGithubPullRequestAction = (
     token?: string;
     reviewers?: string[];
     teamReviewers?: string[];
+    commitMessage?: string;
   }>({
     id: 'publish:github:pull-request',
     schema: {
@@ -202,6 +203,11 @@ export const createPublishGithubPullRequestAction = (
             description:
               'The teams that will be added as reviewers to the pull request',
           },
+          commitMessage: {
+            type: 'string',
+            title: 'Commit Message',
+            description: 'The commit message for the pull request commit',
+          },
         },
       },
       output: {
@@ -233,6 +239,7 @@ export const createPublishGithubPullRequestAction = (
         token: providedToken,
         reviewers,
         teamReviewers,
+        commitMessage,
       } = ctx.input;
 
       const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
@@ -298,7 +305,7 @@ export const createPublishGithubPullRequestAction = (
           changes: [
             {
               files,
-              commit: title,
+              commit: commitMessage ?? title,
             },
           ],
           body: description,
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
index 5723e7136f..1a2d02736c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
@@ -70,11 +70,13 @@ export type CreateWorkerOptions = {
  * @public
  */
 export class TaskWorker {
-  private constructor(private readonly options: TaskWorkerOptions) {}
+  private taskQueue: PQueue;
 
-  private taskQueue: PQueue = new PQueue({
-    concurrency: this.options.concurrentTasksLimit,
-  });
+  private constructor(private readonly options: TaskWorkerOptions) {
+    this.taskQueue = new PQueue({
+      concurrency: options.concurrentTasksLimit,
+    });
+  }
 
   static async create(options: CreateWorkerOptions): Promise<TaskWorker> {
     const {
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index a598cb3259..3e0852dea6 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-scaffolder-common
 
+## 1.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+
 ## 1.2.7-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index 1d48199262..1a17995025 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-common",
   "description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
-  "version": "1.2.7-next.1",
+  "version": "1.2.7-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index d834e519ac..1bd422aa06 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.1.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 3f19ce8ae0..3c3162993d 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.2-next.1",
+  "version": "0.1.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index dd409c38d2..c9e393eba7 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/plugin-scaffolder-react
 
+## 1.3.0-next.3
+
+### Patch Changes
+
+- d2488f5e54c: Add indication that the validators are running
+- 8c40997df44: Updated dependency `@rjsf/core-v5` to `npm:@rjsf/core@5.5.2`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## 1.3.0-next.2
+
+### Patch Changes
+
+- 90dda42cfd2: bug: Invert `templateFilter` predicate to align with `Array.filter`
+- 34dab7ee7f8: `scaffolder/next`: bump `rjsf` dependencies to `5.5.0`
+- 2898b6c8d52: Minor type tweaks for TypeScript 5.0
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
 ## 1.3.0-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 5546b827f7..304fe569c7 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.3.0-next.1",
+  "version": "1.3.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -60,11 +60,11 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@react-hookz/web": "^20.0.0",
     "@rjsf/core": "^3.2.1",
-    "@rjsf/core-v5": "npm:@rjsf/core@5.3.1",
+    "@rjsf/core-v5": "npm:@rjsf/core@5.5.2",
     "@rjsf/material-ui": "^3.2.1",
-    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.3.1",
-    "@rjsf/utils": "5.3.1",
-    "@rjsf/validator-ajv8": "5.3.1",
+    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.5.2",
+    "@rjsf/utils": "5.5.2",
+    "@rjsf/validator-ajv8": "5.5.2",
     "@types/json-schema": "^7.0.9",
     "@types/react": "^16.13.1 || ^17.0.0",
     "classnames": "^2.2.6",
diff --git a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
index fc3c0249a0..7ccbe4ef8d 100644
--- a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
+++ b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
@@ -68,9 +68,12 @@ export function ScaffolderPageContextMenu(
   return (
     <>
       <IconButton
+        id="long-menu"
         aria-label="more"
         aria-controls="long-menu"
+        aria-expanded={!!anchorEl}
         aria-haspopup="true"
+        role="button"
         onClick={onOpen}
         data-testid="menu-button"
         color="inherit"
@@ -79,6 +82,7 @@ export function ScaffolderPageContextMenu(
         <MoreVert />
       </IconButton>
       <Popover
+        aria-labelledby="long-menu"
         open={Boolean(anchorEl)}
         onClose={onClose}
         anchorEl={anchorEl}
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
index 0b17c550a0..6183f32a6c 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -237,6 +237,50 @@ describe('Stepper', () => {
     expect(getByText('im a custom field extension')).toBeInTheDocument();
   });
 
+  it('should disable the form with progress when async validators are running', async () => {
+    const MockComponent = () => {
+      return <h1>im a custom field extension</h1>;
+    };
+
+    const manifest: TemplateParameterSchema = {
+      title: 'Custom Fields',
+      steps: [
+        {
+          title: 'Test',
+          schema: {
+            properties: {
+              name: {
+                type: 'string',
+                'ui:field': 'Mock',
+              },
+            },
+          },
+        },
+      ],
+    };
+
+    const { getByRole } = await renderInTestApp(
+      <Stepper
+        manifest={manifest}
+        extensions={[
+          {
+            name: 'Mock',
+            component: MockComponent,
+            validation: async () => new Promise(r => setTimeout(r, 1000)),
+          },
+        ]}
+        onCreate={jest.fn()}
+      />,
+    );
+
+    await act(async () => {
+      await fireEvent.click(getByRole('button', { name: 'Review' }));
+
+      expect(getByRole('progressbar')).toBeInTheDocument();
+      expect(getByRole('button', { name: 'Review' })).toBeDisabled();
+    });
+  });
+
   it('should transform default error message', async () => {
     const manifest: TemplateParameterSchema = {
       steps: [
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index 51a00dfa64..946cc583a3 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -21,6 +21,7 @@ import {
   StepLabel as MuiStepLabel,
   Button,
   makeStyles,
+  LinearProgress,
 } from '@material-ui/core';
 import { type IChangeEvent } from '@rjsf/core-v5';
 import { ErrorSchema } from '@rjsf/utils';
@@ -93,6 +94,7 @@ export const Stepper = (stepperProps: StepperProps) => {
   const { steps } = useTemplateSchema(props.manifest);
   const apiHolder = useApiHolder();
   const [activeStep, setActiveStep] = useState(0);
+  const [isValidating, setIsValidating] = useState(false);
   const [formState, setFormState] = useFormDataFromQuery(props.initialState);
 
   const [errors, setErrors] = useState<undefined | FormValidation>();
@@ -133,12 +135,15 @@ export const Stepper = (stepperProps: StepperProps) => {
   }: {
     formData?: Record<string, JsonValue>;
   }) => {
-    // TODO(blam): What do we do about loading states, does each field extension get a chance
-    // to display it's own loading? Or should we grey out the entire form.
+    // The validation should never throw, as the validators are wrapped in a try/catch.
+    // This makes it fine to set and unset state without try/catch.
     setErrors(undefined);
+    setIsValidating(true);
 
     const returnedValidation = await validation(formData);
 
+    setIsValidating(false);
+
     if (hasErrors(returnedValidation)) {
       setErrors(returnedValidation);
     } else {
@@ -154,6 +159,7 @@ export const Stepper = (stepperProps: StepperProps) => {
 
   return (
     <>
+      {isValidating && <LinearProgress variant="indeterminate" />}
       <MuiStepper activeStep={activeStep} alternativeLabel variant="elevation">
         {steps.map((step, index) => (
           <MuiStep key={index}>
@@ -183,11 +189,16 @@ export const Stepper = (stepperProps: StepperProps) => {
               <Button
                 onClick={handleBack}
                 className={styles.backButton}
-                disabled={activeStep < 1}
+                disabled={activeStep < 1 || isValidating}
               >
                 Back
               </Button>
-              <Button variant="contained" color="primary" type="submit">
+              <Button
+                variant="contained"
+                color="primary"
+                type="submit"
+                disabled={isValidating}
+              >
                 {activeStep === steps.length - 1 ? reviewButtonText : 'Next'}
               </Button>
             </div>
diff --git a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx
index 028ce3a701..b850c3bcfe 100644
--- a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx
@@ -58,10 +58,16 @@ export const TemplateCategoryPicker = () => {
 
   return (
     <Box pb={1} pt={1}>
-      <Typography variant="button">Categories</Typography>
+      <Typography
+        variant="button"
+        component="label"
+        htmlFor="categories-picker"
+      >
+        Categories
+      </Typography>
       <Autocomplete
         multiple
-        aria-label="Categories"
+        id="categories-picker"
         options={availableTypes}
         value={selectedTypes}
         onChange={(_: object, value: string[]) => setSelectedTypes(value)}
diff --git a/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.test.tsx
index c03af41f99..894c6ea4d0 100644
--- a/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.test.tsx
@@ -214,7 +214,7 @@ describe('TemplateGroups', () => {
 
     expect(TemplateGroup).toHaveBeenCalledWith(
       expect.objectContaining({
-        templates: [expect.objectContaining({ template: mockEntities[1] })],
+        templates: [expect.objectContaining({ template: mockEntities[0] })],
       }),
       {},
     );
diff --git a/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx b/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx
index 50be7a4bdf..f0f06b3410 100644
--- a/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx
@@ -91,7 +91,7 @@ export const TemplateGroups = (props: TemplateGroupsProps) => {
       {groups.map(({ title, filter }, index) => {
         const templates = entities
           .filter(isTemplateEntityV1beta3)
-          .filter(e => (templateFilter ? !templateFilter(e) : true))
+          .filter(e => (templateFilter ? templateFilter(e) : true))
           .filter(filter)
           .map(template => {
             const additionalLinks =
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index be5ec0e59c..28a2c4cde0 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-scaffolder
 
+## 1.13.0-next.3
+
+### Patch Changes
+
+- 7917cfccfc7: Fix some hard-coded white font colors in scaffolder
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-scaffolder-react@1.3.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
+## 1.13.0-next.2
+
+### Minor Changes
+
+- cf18c32934a: The Installed Actions page now shows details for nested objects and arrays
+
+### Patch Changes
+
+- 90dda42cfd2: bug: Invert `templateFilter` predicate to align with `Array.filter`
+- 34dab7ee7f8: `scaffolder/next`: bump `rjsf` dependencies to `5.5.0`
+- Updated dependencies
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/plugin-scaffolder-react@1.3.0-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
 ## 1.13.0-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 7c397d6761..2b4e667049 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.13.0-next.1",
+  "version": "1.13.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -69,8 +69,8 @@
     "@react-hookz/web": "^20.0.0",
     "@rjsf/core": "^3.2.1",
     "@rjsf/material-ui": "^3.2.1",
-    "@rjsf/utils": "5.3.1",
-    "@rjsf/validator-ajv8": "5.3.1",
+    "@rjsf/utils": "5.5.2",
+    "@rjsf/validator-ajv8": "5.5.2",
     "@types/react": "^16.13.1 || ^17.0.0",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
index 3f21b75322..5e7f9810c5 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
@@ -251,7 +251,9 @@ export const ActionsPage = () => {
 
     return (
       <>
-        <Typography variant="h6">{name}</Typography>
+        <Typography variant="h6" component="h4">
+          {name}
+        </Typography>
         {input.map((i, index) => (
           <div key={index}>
             {renderTable(
@@ -275,13 +277,15 @@ export const ActionsPage = () => {
     );
     return (
       <Box pb={4} key={action.id}>
-        <Typography variant="h4" className={classes.code}>
+        <Typography variant="h4" component="h2" className={classes.code}>
           {action.id}
         </Typography>
         {action.description && <MarkdownContent content={action.description} />}
         {action.schema?.input && (
           <Box pb={2}>
-            <Typography variant="h5">Input</Typography>
+            <Typography variant="h5" component="h3">
+              Input
+            </Typography>
             {renderTable(
               formatRows(`${action.id}.input`, action?.schema?.input),
             )}
@@ -290,7 +294,9 @@ export const ActionsPage = () => {
         )}
         {action.schema?.output && (
           <Box pb={2}>
-            <Typography variant="h5">Output</Typography>
+            <Typography variant="h5" component="h3">
+              Output
+            </Typography>
             {renderTable(
               formatRows(`${action.id}.output`, action?.schema?.output),
             )}
@@ -299,7 +305,9 @@ export const ActionsPage = () => {
         {action.examples && (
           <Accordion>
             <AccordionSummary expandIcon={<ExpandMoreIcon />}>
-              <Typography variant="h5">Examples</Typography>
+              <Typography variant="h5" component="h3">
+                Examples
+              </Typography>
             </AccordionSummary>
             <AccordionDetails>
               <Box pb={2}>
diff --git a/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx b/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
index a9e3917922..ee383569ee 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/OwnerListPicker.tsx
@@ -99,16 +99,21 @@ export const OwnerListPicker = (props: {
     <Card className={classes.root}>
       {filterGroups.map(group => (
         <Fragment key={group.name}>
-          <Typography variant="subtitle2" className={classes.title}>
+          <Typography
+            variant="subtitle2"
+            component="span"
+            className={classes.title}
+          >
             {group.name}
           </Typography>
           <Card className={classes.groupWrapper}>
-            <List disablePadding dense>
+            <List disablePadding dense role="menu">
               {group.items.map(item => (
                 <MenuItem
                   key={item.id}
                   button
                   divider
+                  ContainerProps={{ role: 'menuitem' }}
                   onClick={() => onSelectOwner(item.id as 'owned' | 'all')}
                   selected={item.id === filter}
                   className={classes.menuItem}
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 0924c4f2e6..ec95bad0e5 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -172,7 +172,7 @@ export const MultistepJsonForm = (props: MultistepJsonFormProps) => {
                 aria-disabled="false"
                 tabIndex={0}
               >
-                <Typography variant="h6" component="h3">
+                <Typography variant="h6" component="h2">
                   {title}
                 </Typography>
               </StepLabel>
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx
index ef79eda406..5558b314da 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx
@@ -77,9 +77,12 @@ export function ScaffolderPageContextMenu(
   return (
     <>
       <IconButton
+        id="long-menu"
         aria-label="more"
         aria-controls="long-menu"
+        aria-expanded={!!anchorEl}
         aria-haspopup="true"
+        role="button"
         onClick={onOpen}
         data-testid="menu-button"
         color="inherit"
@@ -88,6 +91,7 @@ export function ScaffolderPageContextMenu(
         <MoreVert />
       </IconButton>
       <Popover
+        aria-labelledby="long-menu"
         open={Boolean(anchorEl)}
         onClose={onClose}
         anchorEl={anchorEl}
diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 825317ef73..d35636f507 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -107,7 +107,7 @@ const useStyles = makeStyles<
     top: theme.spacing(0.5),
     right: theme.spacing(0.5),
     padding: '0.25rem',
-    color: theme.palette.common.white,
+    color: ({ fontColor }) => fontColor,
   },
 }));
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
index c7138efb97..43b3b49bcf 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -144,7 +144,7 @@ export const CustomFieldExplorer = ({
           </Select>
         </FormControl>
 
-        <IconButton size="medium" onClick={onClose}>
+        <IconButton size="medium" onClick={onClose} aria-label="Close">
           <CloseIcon />
         </IconButton>
       </div>
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorIntro.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorIntro.tsx
index 61e6c46964..2a75c1bf2c 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorIntro.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorIntro.tsx
@@ -59,7 +59,8 @@ export function TemplateEditorIntro(props: EditorIntroProps) {
       >
         <CardContent>
           <Typography
-            variant="h5"
+            variant="h4"
+            component="h3"
             gutterBottom
             color={supportsLoad ? undefined : 'textSecondary'}
             style={{ display: 'flex', flexFlow: 'row nowrap' }}
@@ -92,7 +93,7 @@ export function TemplateEditorIntro(props: EditorIntroProps) {
     <Card className={classes.card} elevation={4}>
       <CardActionArea onClick={() => props.onSelect?.('form')}>
         <CardContent>
-          <Typography variant="h5" gutterBottom>
+          <Typography variant="h4" component="h3" gutterBottom>
             Edit Template Form
           </Typography>
           <Typography variant="body1">
@@ -108,7 +109,7 @@ export function TemplateEditorIntro(props: EditorIntroProps) {
     <Card className={classes.card} elevation={4}>
       <CardActionArea onClick={() => props.onSelect?.('field-explorer')}>
         <CardContent>
-          <Typography variant="h5" gutterBottom>
+          <Typography variant="h4" component="h3" gutterBottom>
             Custom Field Explorer
           </Typography>
           <Typography variant="body1">
@@ -122,7 +123,7 @@ export function TemplateEditorIntro(props: EditorIntroProps) {
 
   return (
     <div style={props.style}>
-      <Typography variant="h6" className={classes.introText}>
+      <Typography variant="h4" component="h2" className={classes.introText}>
         Get started by choosing one of the options below
       </Typography>
       <div
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
index a7e3c6a697..69433d5f51 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
@@ -194,7 +194,7 @@ export const TemplateFormPreviewer = ({
             </Select>
           </FormControl>
 
-          <IconButton size="medium" onClick={onClose}>
+          <IconButton size="medium" onClick={onClose} aria-label="Close">
             <CloseIcon />
           </IconButton>
         </div>
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.test.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.test.tsx
index 2ea417ad68..c65613d2f5 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.test.tsx
@@ -77,7 +77,7 @@ describe('TemplateList', () => {
       { mountedRoutes: { '/': rootRouteRef } },
     );
 
-    expect(() => screen.getByTestId('t1')).toThrow();
-    expect(screen.getByTestId('t2')).toBeDefined();
+    expect(() => screen.getByTestId('t2')).toThrow();
+    expect(screen.getByTestId('t1')).toBeDefined();
   });
 });
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index 9a88050d74..c925cdf6ef 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -59,7 +59,7 @@ export const TemplateList = ({
   const templateEntities = entities.filter(isTemplateEntityV1beta3);
   const maybeFilteredEntities = (
     group ? templateEntities.filter(group.filter) : templateEntities
-  ).filter(e => (templateFilter ? !templateFilter(e) : true));
+  ).filter(e => (templateFilter ? templateFilter(e) : true));
 
   const titleComponent: React.ReactNode = (() => {
     if (group && group.title) {
diff --git a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
index e7c2c965f2..88ddef2b92 100644
--- a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
+++ b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.tsx
@@ -58,10 +58,16 @@ export const TemplateTypePicker = () => {
 
   return (
     <Box pb={1} pt={1}>
-      <Typography variant="button">Categories</Typography>
+      <Typography
+        variant="button"
+        component="label"
+        htmlFor="categories-picker"
+      >
+        Categories
+      </Typography>
       <Autocomplete
+        id="categories-picker"
         multiple
-        aria-label="Categories"
         options={availableTypes}
         value={selectedTypes}
         onChange={(_: object, value: string[]) => setSelectedTypes(value)}
diff --git a/plugins/scaffolder/src/next/OngoingTask/ContextMenu.tsx b/plugins/scaffolder/src/next/OngoingTask/ContextMenu.tsx
index 985dd98903..21db9f5b08 100644
--- a/plugins/scaffolder/src/next/OngoingTask/ContextMenu.tsx
+++ b/plugins/scaffolder/src/next/OngoingTask/ContextMenu.tsx
@@ -22,6 +22,7 @@ import {
   MenuItem,
   MenuList,
   Popover,
+  useTheme,
 } from '@material-ui/core';
 import { useAsync } from '@react-hookz/web';
 import Cancel from '@material-ui/icons/Cancel';
@@ -40,16 +41,18 @@ type ContextMenuProps = {
   taskId?: string;
 };
 
-const useStyles = makeStyles((theme: BackstageTheme) => ({
+const useStyles = makeStyles<BackstageTheme, { fontColor: string }>(() => ({
   button: {
-    color: theme.palette.common.white,
+    color: ({ fontColor }) => fontColor,
   },
 }));
 
 export const ContextMenu = (props: ContextMenuProps) => {
   const { cancelEnabled, logsVisible, onStartOver, onToggleLogs, taskId } =
     props;
-  const classes = useStyles();
+  const { getPageTheme } = useTheme<BackstageTheme>();
+  const pageTheme = getPageTheme({ themeId: 'website' });
+  const classes = useStyles({ fontColor: pageTheme.fontColor });
   const scaffolderApi = useApi(scaffolderApiRef);
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement>();
 
@@ -69,7 +72,6 @@ export const ContextMenu = (props: ContextMenuProps) => {
           setAnchorEl(event.currentTarget);
         }}
         data-testid="menu-button"
-        color="inherit"
         className={classes.button}
       >
         <MoreVert />
diff --git a/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
index 823d5b164a..bf5ffe97ea 100644
--- a/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/next/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -140,7 +140,7 @@ export const CustomFieldExplorer = ({
           </Select>
         </FormControl>
 
-        <IconButton size="medium" onClick={onClose}>
+        <IconButton size="medium" onClick={onClose} aria-label="Close">
           <CloseIcon />
         </IconButton>
       </div>
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index 04b775ccca..9318bca637 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-search-backend-module-catalog
 
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.1.0-next.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index c73c416441..c12a006ebf 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.0-next.0",
+  "version": "0.1.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 9d0ff6e853..8de0ce16ad 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.2.0-next.3
+
+### Patch Changes
+
+- 104b6b19487: fix ElasticSearch throwing error when index is missing
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.2.0-next.1
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index f7338303d3..a3cd24381d 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.2.0-next.1",
+  "version": "1.2.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.test.ts
index 2677eb1420..7355daf3b9 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.test.ts
@@ -119,7 +119,12 @@ describe('ElasticSearchClientWrapper', () => {
     it('search', async () => {
       const wrapper = ElasticSearchClientWrapper.fromClientOptions(esOptions);
 
-      const searchInput = { index: 'xyz', body: { eg: 'etc' } };
+      const searchInput = {
+        index: 'xyz',
+        body: { eg: 'etc' },
+        ignore_unavailable: true,
+        allow_no_indices: true,
+      };
       const result = (await wrapper.search(searchInput)) as any;
 
       // Should call the ElasticSearch client's search with expected input.
@@ -241,7 +246,12 @@ describe('ElasticSearchClientWrapper', () => {
     it('search', async () => {
       const wrapper = ElasticSearchClientWrapper.fromClientOptions(osOptions);
 
-      const searchInput = { index: 'xyz', body: { eg: 'etc' } };
+      const searchInput = {
+        index: 'xyz',
+        body: { eg: 'etc' },
+        ignore_unavailable: true,
+        allow_no_indices: true,
+      };
       const result = (await wrapper.search(searchInput)) as any;
 
       // Should call the OpenSearch client's search with expected input.
@@ -350,7 +360,12 @@ describe('ElasticSearchClientWrapper', () => {
       const wrapper = ElasticSearchClientWrapper.fromClientOptions(osOptions);
       expect(OpenSearchClient).toHaveBeenCalledWith(osOptions);
 
-      const searchInput = { index: 'xyz', body: { eg: 'etc' } };
+      const searchInput = {
+        index: 'xyz',
+        body: { eg: 'etc' },
+        ignore_unavailable: true,
+        allow_no_indices: true,
+      };
       const result = (await wrapper.search(searchInput)) as any;
       expect(result.client).toBe('os');
       expect(result.args).toStrictEqual(searchInput);
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.ts
index 395f861223..a7aca3d03f 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchClientWrapper.ts
@@ -91,12 +91,23 @@ export class ElasticSearchClientWrapper {
   }
 
   search(options: { index: string | string[]; body: Object }) {
+    const searchOptions = {
+      ignore_unavailable: true,
+      allow_no_indices: true,
+    };
+
     if (this.openSearchClient) {
-      return this.openSearchClient.search(options);
+      return this.openSearchClient.search({
+        ...options,
+        ...searchOptions,
+      });
     }
 
     if (this.elasticSearchClient) {
-      return this.elasticSearchClient.search(options);
+      return this.elasticSearchClient.search({
+        ...options,
+        ...searchOptions,
+      });
     }
 
     throw new Error('No client defined');
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index aa13a15c75..f1c8c79c3c 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-search-backend-module-explore
 
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.1.0-next.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index 819ddabc76..d448d0ee51 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.0-next.0",
+  "version": "0.1.0-next.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 19c6183fcd..e7e998018c 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.5.5-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index a5c40c8fe4..ce1d5f174a 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.5-next.1",
+  "version": "0.5.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index 4a90c96889..b596877cd4 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-search-backend-module-techdocs
 
+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
 ## 0.1.0-next.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index 22a64b4601..d861d9d57f 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.0-next.0",
+  "version": "0.1.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 5c83ef7771..62b802616f 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-search-backend-node
 
+## 1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.2.0-next.1
 
 ### Minor Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index eeac6e1ba3..178882b4fe 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.0-next.1",
+  "version": "1.2.0-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 cc5926a2f5..f7b920da78 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-backend
 
+## 1.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.2.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.3.0-next.1
 
 ### Minor Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index fbbda5734d..57230dad16 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.3.0-next.1",
+  "version": "1.3.0-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 08079ae7bd..b66d002cf5 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-search-react
 
+## 1.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 1.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.5.2-next.1
 
 ### Patch Changes
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index 1cc2ea03c3..2e3363fdf2 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.5.2-next.1",
+  "version": "1.5.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index f5fd302f8e..5dedaece4f 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-search
 
+## 1.2.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 1.2.0-next.2
+
+### Minor Changes
+
+- d6b73b0380d: Search modal auto closes on location change
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.4-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 1.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 7616a03ffd..037bbc8300 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.1.2-next.1",
+  "version": "1.2.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index 9a98c12752..5ef1cff9c2 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-sentry
 
+## 0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.5.2-next.1
 
 ### Patch Changes
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 2d85a8552c..6e231d725a 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.2-next.1",
+  "version": "0.5.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index 33a2990a15..f97133de2f 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-shortcuts
 
+## 0.3.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## 0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
 ## 0.3.9-next.1
 
 ### Patch Changes
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index a2d1ce578e..5d8f78835f 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.9-next.1",
+  "version": "0.3.9-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/shortcuts/src/AddShortcut.test.tsx b/plugins/shortcuts/src/AddShortcut.test.tsx
index c6d89318b2..a697e02e99 100644
--- a/plugins/shortcuts/src/AddShortcut.test.tsx
+++ b/plugins/shortcuts/src/AddShortcut.test.tsx
@@ -18,8 +18,14 @@ import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { AddShortcut } from './AddShortcut';
 import { LocalStoredShortcuts } from './api';
-import { MockStorageApi, renderInTestApp } from '@backstage/test-utils';
+import {
+  MockAnalyticsApi,
+  MockStorageApi,
+  renderInTestApp,
+} from '@backstage/test-utils';
 import { AlertDisplay } from '@backstage/core-components';
+import { TestApiProvider } from '@backstage/test-utils';
+import { analyticsApiRef } from '@backstage/core-plugin-api';
 
 describe('AddShortcut', () => {
   const api = new LocalStoredShortcuts(MockStorageApi.create());
@@ -67,6 +73,36 @@ describe('AddShortcut', () => {
     });
   });
 
+  it('should capture analytics event', async () => {
+    const analyticsSpy = new MockAnalyticsApi();
+    const spy = jest.spyOn(api, 'add');
+
+    await renderInTestApp(
+      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+        <AddShortcut {...props} />
+      </TestApiProvider>,
+    );
+
+    const urlInput = screen.getByPlaceholderText('Enter a URL');
+    const titleInput = screen.getByPlaceholderText('Enter a display name');
+    fireEvent.change(urlInput, { target: { value: '/some-url' } });
+    fireEvent.change(titleInput, { target: { value: 'some title' } });
+
+    fireEvent.click(screen.getByText('Save'));
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith({
+        title: 'some title',
+        url: '/some-url',
+      });
+    });
+
+    expect(analyticsSpy.getEvents()[0]).toMatchObject({
+      action: 'click',
+      subject: `Clicked 'Save' in AddShortcut`,
+    });
+  });
+
   it('pastes the values', async () => {
     const spy = jest.spyOn(api, 'add');
 
diff --git a/plugins/shortcuts/src/AddShortcut.tsx b/plugins/shortcuts/src/AddShortcut.tsx
index 1e14767531..6cca26d250 100644
--- a/plugins/shortcuts/src/AddShortcut.tsx
+++ b/plugins/shortcuts/src/AddShortcut.tsx
@@ -27,7 +27,7 @@ import {
 import { ShortcutForm } from './ShortcutForm';
 import { FormValues, Shortcut } from './types';
 import { ShortcutApi } from './api';
-import { alertApiRef, useApi } from '@backstage/core-plugin-api';
+import { alertApiRef, useApi, useAnalytics } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   card: {
@@ -60,8 +60,10 @@ export const AddShortcut = ({
   const { pathname } = useLocation();
   const [formValues, setFormValues] = useState<FormValues>();
   const open = Boolean(anchorEl);
+  const analytics = useAnalytics();
 
   const handleSave: SubmitHandler<FormValues> = async ({ url, title }) => {
+    analytics.captureEvent('click', `Clicked 'Save' in AddShortcut`);
     const shortcut: Omit<Shortcut, 'id'> = { url, title };
 
     try {
diff --git a/plugins/shortcuts/src/EditShortcut.test.tsx b/plugins/shortcuts/src/EditShortcut.test.tsx
index 4d5128b0a8..df2ed112ba 100644
--- a/plugins/shortcuts/src/EditShortcut.test.tsx
+++ b/plugins/shortcuts/src/EditShortcut.test.tsx
@@ -19,8 +19,14 @@ import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { EditShortcut } from './EditShortcut';
 import { Shortcut } from './types';
 import { LocalStoredShortcuts } from './api';
-import { MockStorageApi, renderInTestApp } from '@backstage/test-utils';
+import {
+  MockAnalyticsApi,
+  MockStorageApi,
+  TestApiProvider,
+  renderInTestApp,
+} from '@backstage/test-utils';
 import { AlertDisplay } from '@backstage/core-components';
+import { analyticsApiRef } from '@backstage/core-plugin-api';
 
 describe('EditShortcut', () => {
   const shortcut: Shortcut = {
@@ -75,6 +81,37 @@ describe('EditShortcut', () => {
     });
   });
 
+  it('should capture analytics event', async () => {
+    const analyticsSpy = new MockAnalyticsApi();
+    const spy = jest.spyOn(api, 'update');
+
+    await renderInTestApp(
+      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+        <EditShortcut {...props} />
+      </TestApiProvider>,
+    );
+
+    const urlInput = screen.getByPlaceholderText('Enter a URL');
+    const titleInput = screen.getByPlaceholderText('Enter a display name');
+    fireEvent.change(urlInput, { target: { value: '/some-new-url' } });
+    fireEvent.change(titleInput, { target: { value: 'some new title' } });
+
+    fireEvent.click(screen.getByText('Save'));
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith({
+        id: 'id',
+        title: 'some new title',
+        url: '/some-new-url',
+      });
+      expect(props.onClose).toHaveBeenCalledTimes(1);
+    });
+
+    expect(analyticsSpy.getEvents()[0]).toMatchObject({
+      action: 'click',
+      subject: `Clicked 'Save' in Edit Shortcut`,
+    });
+  });
+
   it('removes the shortcut', async () => {
     const spy = jest.spyOn(api, 'remove');
 
diff --git a/plugins/shortcuts/src/EditShortcut.tsx b/plugins/shortcuts/src/EditShortcut.tsx
index 5336841633..a5f801604f 100644
--- a/plugins/shortcuts/src/EditShortcut.tsx
+++ b/plugins/shortcuts/src/EditShortcut.tsx
@@ -27,7 +27,7 @@ import { ShortcutForm } from './ShortcutForm';
 import { FormValues, Shortcut } from './types';
 import DeleteIcon from '@material-ui/icons/Delete';
 import { ShortcutApi } from './api';
-import { alertApiRef, useApi } from '@backstage/core-plugin-api';
+import { alertApiRef, useApi, useAnalytics } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   card: {
@@ -59,8 +59,10 @@ export const EditShortcut = ({
   const classes = useStyles();
   const alertApi = useApi(alertApiRef);
   const open = Boolean(anchorEl);
+  const analytics = useAnalytics();
 
   const handleSave: SubmitHandler<FormValues> = async ({ url, title }) => {
+    analytics.captureEvent('click', `Clicked 'Save' in Edit Shortcut`);
     const newShortcut: Shortcut = {
       ...shortcut,
       url,
diff --git a/plugins/sonarqube-backend/CHANGELOG.md b/plugins/sonarqube-backend/CHANGELOG.md
index 54ac27af07..7a2d2c46ea 100644
--- a/plugins/sonarqube-backend/CHANGELOG.md
+++ b/plugins/sonarqube-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-sonarqube-backend
 
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.1.9-next.1
 
 ### Patch Changes
diff --git a/plugins/sonarqube-backend/package.json b/plugins/sonarqube-backend/package.json
index 3ec1bee0e5..c7417b6b06 100644
--- a/plugins/sonarqube-backend/package.json
+++ b/plugins/sonarqube-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube-backend",
-  "version": "0.1.9-next.1",
+  "version": "0.1.9-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube-react/CHANGELOG.md b/plugins/sonarqube-react/CHANGELOG.md
index 5ce3721423..e67130928c 100644
--- a/plugins/sonarqube-react/CHANGELOG.md
+++ b/plugins/sonarqube-react/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-sonarqube-react
 
+## 0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-plugin-api@1.5.1-next.1
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+
 ## 0.1.5-next.0
 
 ### Patch Changes
diff --git a/plugins/sonarqube-react/package.json b/plugins/sonarqube-react/package.json
index 457a52c65d..6fb68b4890 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.5-next.0",
+  "version": "0.1.5-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index b30e4c51a0..e069c685a9 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-sonarqube
 
+## 0.6.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-sonarqube-react@0.1.5-next.2
+
+## 0.6.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-sonarqube-react@0.1.5-next.1
+
 ## 0.6.6-next.1
 
 ### Patch Changes
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 1e62a91c8d..c242ac2f11 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-sonarqube",
   "description": "",
-  "version": "0.6.6-next.1",
+  "version": "0.6.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.ts b/plugins/sonarqube/src/api/SonarQubeClient.ts
index 90024c37f8..09cfce06cb 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.ts
@@ -127,9 +127,9 @@ export class SonarQubeClient implements SonarQubeApi {
           'en-US',
         )}&resolved=false&view=list`,
       getSecurityHotspotsUrl: () =>
-        `${baseUrl}project/security_hotspots?id=${encodeURIComponent(
-          componentKey,
-        )}`,
+        `${baseUrl}${
+          baseUrl === 'https://sonarcloud.io/' ? 'project/' : ''
+        }security_hotspots?id=${encodeURIComponent(componentKey)}`,
     };
   }
 }
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index 31245febfc..0c91670fa7 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.4.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.4.6-next.1
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 361835bc43..bfc5abe643 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.6-next.1",
+  "version": "0.4.6-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/stack-overflow-backend/CHANGELOG.md b/plugins/stack-overflow-backend/CHANGELOG.md
index 543ac6b9f3..5b227da921 100644
--- a/plugins/stack-overflow-backend/CHANGELOG.md
+++ b/plugins/stack-overflow-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-stack-overflow-backend
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/stack-overflow-backend/README.md b/plugins/stack-overflow-backend/README.md
index 4bcc755404..4575ab58c0 100644
--- a/plugins/stack-overflow-backend/README.md
+++ b/plugins/stack-overflow-backend/README.md
@@ -17,9 +17,9 @@ stackoverflow:
 
 ### Stack Overflow for Teams
 
-If you have a private Stack Overflow instance and/or a private Stack Overflow Team you will need to supply an API key. You can read more about how to set this up by going to [Stack Overflow's Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api).
+If you have a private Stack Overflow instance and/or a private Stack Overflow Team you will need to supply an API key or Personal Access Token. You can read more about how to set this up by going to [Stack Overflow's Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api).
 
-A private Stack Overflow Team requires both an API key and an API Access Token. Step 3 ("Generate an Access Token via OAuth") from the previously mentioned Help Page explains the process for generating an API Access Token with no expiration.
+The existing API key approach remains the default, to support the new v2.3 API and PAT authentication model you need to pass the team name and the new PAT into the existing apiAccessToken parameter to the new URL. See [15770](https://github.com/backstage/backstage/issues/15770) for more details.
 
 ```yaml
 stackoverflow:
@@ -28,6 +28,13 @@ stackoverflow:
   apiAccessToken: $STACK_OVERFLOW_API_ACCESS_TOKEN
 ```
 
+```yaml
+stackoverflow:
+  baseUrl: https://api.stackoverflowteams.com/2.3 # alternative: your internal stack overflow instance
+  teamName: $STACK_OVERFLOW_TEAM_NAME
+  apiAccessToken: $STACK_OVERFLOW_API_ACCESS_TOKEN
+```
+
 ## Areas of Responsibility
 
 This stack overflow backend plugin is primarily responsible for the following:
diff --git a/plugins/stack-overflow-backend/api-report.md b/plugins/stack-overflow-backend/api-report.md
index f6c7530de9..8c601399c1 100644
--- a/plugins/stack-overflow-backend/api-report.md
+++ b/plugins/stack-overflow-backend/api-report.md
@@ -44,6 +44,7 @@ export type StackOverflowQuestionsCollatorFactoryOptions = {
   maxPage?: number;
   apiKey?: string;
   apiAccessToken?: string;
+  teamName?: string;
   requestParams: StackOverflowQuestionsRequestParams;
   logger: Logger;
 };
diff --git a/plugins/stack-overflow-backend/config.d.ts b/plugins/stack-overflow-backend/config.d.ts
index 54e517c5d8..b97f237c19 100644
--- a/plugins/stack-overflow-backend/config.d.ts
+++ b/plugins/stack-overflow-backend/config.d.ts
@@ -30,6 +30,11 @@ export interface Config {
      */
     apiKey?: string;
 
+    /**
+     * The name of the team for a Stack Overflow for Teams account
+     */
+    teamName?: string;
+
     /**
      * The API Access Token to authenticate to Stack Overflow API
      * @visibility secret
diff --git a/plugins/stack-overflow-backend/package.json b/plugins/stack-overflow-backend/package.json
index b31ee346bc..a0430707b4 100644
--- a/plugins/stack-overflow-backend/package.json
+++ b/plugins/stack-overflow-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-stack-overflow-backend",
-  "version": "0.1.13-next.1",
+  "version": "0.1.13-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.test.ts b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.test.ts
index bdc5be125c..5d2f65923c 100644
--- a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.test.ts
+++ b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.test.ts
@@ -139,5 +139,49 @@ describe('StackOverflowQuestionsCollatorFactory', () => {
 
       expect(documents).toHaveLength(mockOverrideQuestion.items.length);
     });
+
+    it('uses API key when provided', async () => {
+      worker.use(
+        rest.get('http://stack.overflow.override/questions', (req, res, ctx) =>
+          req.url.searchParams.get('key') === 'abcdefg'
+            ? res(ctx.status(200), ctx.json(mockOverrideQuestion))
+            : res(ctx.status(401), ctx.json({})),
+        ),
+      );
+      const factory = StackOverflowQuestionsCollatorFactory.fromConfig(config, {
+        logger,
+        baseUrl: 'http://stack.overflow.override',
+        apiKey: 'abcdefg',
+        requestParams: defaultOptions.requestParams,
+      });
+      const collator = await factory.getCollator();
+
+      const pipeline = TestPipeline.fromCollator(collator);
+      const { documents } = await pipeline.execute();
+
+      expect(documents).toHaveLength(mockOverrideQuestion.items.length);
+    });
+
+    it('uses teamName when provided', async () => {
+      worker.use(
+        rest.get('http://stack.overflow.override/questions', (req, res, ctx) =>
+          req.url.searchParams.get('team') === 'abcdefg'
+            ? res(ctx.status(200), ctx.json(mockOverrideQuestion))
+            : res(ctx.status(401), ctx.json({})),
+        ),
+      );
+      const factory = StackOverflowQuestionsCollatorFactory.fromConfig(config, {
+        logger,
+        baseUrl: 'http://stack.overflow.override',
+        teamName: 'abcdefg',
+        requestParams: defaultOptions.requestParams,
+      });
+      const collator = await factory.getCollator();
+
+      const pipeline = TestPipeline.fromCollator(collator);
+      const { documents } = await pipeline.execute();
+
+      expect(documents).toHaveLength(mockOverrideQuestion.items.length);
+    });
   });
 });
diff --git a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
index 807d6637c1..c5f8a8c16b 100644
--- a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
+++ b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
@@ -53,6 +53,7 @@ export type StackOverflowQuestionsCollatorFactoryOptions = {
   maxPage?: number;
   apiKey?: string;
   apiAccessToken?: string;
+  teamName?: string;
   requestParams: StackOverflowQuestionsRequestParams;
   logger: Logger;
 };
@@ -69,6 +70,7 @@ export class StackOverflowQuestionsCollatorFactory
   private readonly baseUrl: string | undefined;
   private readonly apiKey: string | undefined;
   private readonly apiAccessToken: string | undefined;
+  private readonly teamName: string | undefined;
   private readonly maxPage: number | undefined;
   private readonly logger: Logger;
   public readonly type: string = 'stack-overflow';
@@ -77,6 +79,7 @@ export class StackOverflowQuestionsCollatorFactory
     this.baseUrl = options.baseUrl;
     this.apiKey = options.apiKey;
     this.apiAccessToken = options.apiAccessToken;
+    this.teamName = options.teamName;
     this.maxPage = options.maxPage;
     this.requestParams = options.requestParams;
     this.logger = options.logger.child({ documentType: this.type });
@@ -90,15 +93,17 @@ export class StackOverflowQuestionsCollatorFactory
     const apiAccessToken = config.getOptionalString(
       'stackoverflow.apiAccessToken',
     );
+    const teamName = config.getOptionalString('stackoverflow.teamName');
     const baseUrl =
       config.getOptionalString('stackoverflow.baseUrl') ||
-      'https://api.stackexchange.com/2.2';
+      'https://api.stackexchange.com/2.3';
     const maxPage = options.maxPage || 100;
     return new StackOverflowQuestionsCollatorFactory({
       baseUrl,
       maxPage,
       apiKey,
       apiAccessToken,
+      teamName,
       ...options,
     });
   }
@@ -114,10 +119,16 @@ export class StackOverflowQuestionsCollatorFactory
       );
     }
 
+    if (this.apiKey && this.teamName) {
+      this.logger.debug(
+        'Both stackoverflow.apiKey and stackoverflow.teamName configured in your app-config.yaml, apiKey must be removed before teamName will be used',
+      );
+    }
+
     try {
       if (Object.keys(this.requestParams).indexOf('key') >= 0) {
         this.logger.warn(
-          'The API Key should be passed as a seperate param to bypass encoding',
+          'The API Key should be passed as a separate param to bypass encoding',
         );
         delete this.requestParams.key;
       }
@@ -134,6 +145,15 @@ export class StackOverflowQuestionsCollatorFactory
       ? `${params ? '&' : '?'}key=${this.apiKey}`
       : '';
 
+    const teamParam = this.teamName
+      ? `${params ? '&' : '?'}team=${this.teamName}`
+      : '';
+
+    // PAT change requires team name as a parameter
+    const requestUrl = this.apiKey
+      ? `${this.baseUrl}/questions${params}${apiKeyParam}`
+      : `${this.baseUrl}/questions${params}${teamParam}`;
+
     let hasMorePages = true;
     let page = 1;
     while (hasMorePages) {
@@ -144,7 +164,7 @@ export class StackOverflowQuestionsCollatorFactory
         break;
       }
       const res = await fetch(
-        `${this.baseUrl}/questions${params}${apiKeyParam}&page=${page}`,
+        `${requestUrl}&page=${page}`,
         this.apiAccessToken
           ? {
               headers: {
diff --git a/plugins/stack-overflow/CHANGELOG.md b/plugins/stack-overflow/CHANGELOG.md
index cc5cd08759..d177502f17 100644
--- a/plugins/stack-overflow/CHANGELOG.md
+++ b/plugins/stack-overflow/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-stack-overflow
 
+## 0.1.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-home@0.4.33-next.3
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-home@0.4.33-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/stack-overflow/package.json b/plugins/stack-overflow/package.json
index 4cfb56bd15..5b2177330b 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.13-next.1",
+  "version": "0.1.13-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/stackstorm/CHANGELOG.md b/plugins/stackstorm/CHANGELOG.md
index 75b87e0789..88d5045dc5 100644
--- a/plugins/stackstorm/CHANGELOG.md
+++ b/plugins/stackstorm/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-stackstorm
 
+## 0.1.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/plugins/stackstorm/package.json b/plugins/stackstorm/package.json
index 28f43bcff3..b27cae5a9e 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.1-next.1",
+  "version": "0.1.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
index d15c6e8e5c..d6c2ac84c6 100644
--- a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
+++ b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-tech-insights-backend-module-jsonfc
 
+## 0.1.28-next.2
+
+### Patch Changes
+
+- 9cb1db6546a: When multiple fact retrievers are used for a check, allow for cases where only one returns a given fact
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
 ## 0.1.28-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend-module-jsonfc/package.json b/plugins/tech-insights-backend-module-jsonfc/package.json
index 343fd73346..fb549384a0 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.28-next.1",
+  "version": "0.1.28-next.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-backend/CHANGELOG.md b/plugins/tech-insights-backend/CHANGELOG.md
index 35abcfd5ea..c78fa36f0a 100644
--- a/plugins/tech-insights-backend/CHANGELOG.md
+++ b/plugins/tech-insights-backend/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-tech-insights-backend
 
+## 0.5.10-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
+## 0.5.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+  - @backstage/plugin-tech-insights-node@0.4.2-next.2
+
 ## 0.5.10-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend/package.json b/plugins/tech-insights-backend/package.json
index 5a22261687..67a8c25516 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.10-next.1",
+  "version": "0.5.10-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-node/CHANGELOG.md b/plugins/tech-insights-node/CHANGELOG.md
index a1419ba993..1baf8bcb35 100644
--- a/plugins/tech-insights-node/CHANGELOG.md
+++ b/plugins/tech-insights-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-tech-insights-node
 
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json
index f726694638..1b6a429fd0 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.2-next.1",
+  "version": "0.4.2-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 dfc08e22d1..1332670e5d 100644
--- a/plugins/tech-insights/CHANGELOG.md
+++ b/plugins/tech-insights/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-tech-insights
 
+## 0.3.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
+## 0.3.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.10
+
 ## 0.3.9-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index 5eb4352760..c2f47e73f1 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.9-next.1",
+  "version": "0.3.9-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index 9e3831c757..0c49133c82 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-tech-radar
 
+## 0.6.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
+## 0.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.6.3-next.1
 
 ### Patch Changes
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index f5f87c8443..e1815eb95f 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.3-next.1",
+  "version": "0.6.3-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 4c84795a42..49b4d156f4 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/plugin-techdocs@1.6.1-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/test-utils@1.3.0-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.3
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## 1.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/plugin-techdocs@1.6.1-next.2
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/test-utils@1.3.0-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-catalog@1.10.0-next.2
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
 ## 1.0.12-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index fd3bcc2858..8cf5074c73 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.12-next.1",
+  "version": "1.0.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 82366856aa..b113b3ac7f 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.3
+
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.0-next.1
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-techdocs-node@1.6.1-next.2
+
 ## 1.6.1-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index a710e649c6..d515e99ea7 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
-  "version": "1.6.1-next.1",
+  "version": "1.6.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index 43e6840750..15342be241 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## 1.0.12-next.2
+
+### Patch Changes
+
+- c657d0a610e: Bump `photoswipe` dependency to `^5.3.7`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
 ## 1.0.12-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 4ce37cd465..29897a6c9f 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.12-next.1",
+  "version": "1.0.12-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index 5eec6e43de..f864ab63c0 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-techdocs-node
 
+## 1.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-aws-node@0.1.2
+  - @backstage/plugin-search-common@1.2.3-next.0
+
 ## 1.6.1-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/api-report.md b/plugins/techdocs-node/api-report.md
index a734fd404a..2a2fe12946 100644
--- a/plugins/techdocs-node/api-report.md
+++ b/plugins/techdocs-node/api-report.md
@@ -243,7 +243,7 @@ export class TechdocsGenerator implements GeneratorBase {
     config: Config;
     scmIntegrations: ScmIntegrationRegistry;
   });
-  static readonly defaultDockerImage = 'spotify/techdocs:v1.1.0';
+  static readonly defaultDockerImage = 'spotify/techdocs:v1.2.0';
   static fromConfig(
     config: Config,
     options: GeneratorOptions,
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index 75c99775ea..606ba62813 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.6.1-next.1",
+  "version": "1.6.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/plugins/techdocs-node/src/stages/generate/techdocs.ts b/plugins/techdocs-node/src/stages/generate/techdocs.ts
index 2f88e1a8ad..d2ad0021be 100644
--- a/plugins/techdocs-node/src/stages/generate/techdocs.ts
+++ b/plugins/techdocs-node/src/stages/generate/techdocs.ts
@@ -53,7 +53,7 @@ export class TechdocsGenerator implements GeneratorBase {
    * The default docker image (and version) used to generate content. Public
    * and static so that techdocs-node consumers can use the same version.
    */
-  public static readonly defaultDockerImage = 'spotify/techdocs:v1.1.0';
+  public static readonly defaultDockerImage = 'spotify/techdocs:v1.2.0';
   private readonly logger: Logger;
   private readonly containerRunner?: ContainerRunner;
   private readonly options: GeneratorConfig;
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 06eb77f7fa..46ecad8a29 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-techdocs-react
 
+## 1.1.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/version-bridge@1.0.4-next.0
+
+## 1.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/version-bridge@1.0.4-next.0
+
 ## 1.1.5-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index af0aeace87..a3e8b18328 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.5-next.1",
+  "version": "1.1.5-next.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index b25673f5bf..500fe2e15a 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/plugin-techdocs
 
+## 1.6.1-next.3
+
+### Patch Changes
+
+- 2e493480626: Fix a bug in sub-path navigation due to double addition of a sub-path if one was set up in `app.baseUrl`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.3
+  - @backstage/plugin-techdocs-react@1.1.5-next.3
+
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.2
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/plugin-search-common@1.2.3-next.0
+  - @backstage/plugin-search-react@1.5.2-next.2
+  - @backstage/plugin-techdocs-react@1.1.5-next.2
+
 ## 1.6.1-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 48bd40ae84..bdb30ac585 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.1-next.1",
+  "version": "1.6.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
index 48c1fa248c..9ac2ac4ef4 100644
--- a/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
+++ b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
@@ -38,6 +38,7 @@ import { DefaultTechDocsHome } from './DefaultTechDocsHome';
 
 const mockCatalogApi = {
   getEntityByRef: () => Promise.resolve(),
+  getEntitiesByRefs: () => Promise.resolve({ items: [] }),
   getEntities: async () => ({
     items: [
       {
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
index 4e8f331c7f..e11b7b6e81 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
@@ -18,7 +18,11 @@ import { act } from '@testing-library/react';
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
 
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import {
+  MockConfigApi,
+  renderInTestApp,
+  TestApiProvider,
+} from '@backstage/test-utils';
 
 import { techdocsApiRef, techdocsStorageApiRef } from '../../../api';
 
@@ -31,6 +35,7 @@ import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import { FlatRoutes } from '@backstage/core-app-api';
 
 import { Page } from '@backstage/core-components';
+import { configApiRef } from '@backstage/core-plugin-api';
 
 const mockEntityMetadata = {
   locationMetadata: {
@@ -80,11 +85,18 @@ jest.mock('@backstage/core-components', () => ({
   Page: jest.fn(),
 }));
 
+const configApi = new MockConfigApi({
+  app: {
+    baseUrl: 'http://localhost:3000',
+  },
+});
+
 const Wrapper = ({ children }: { children: React.ReactNode }) => {
   return (
     <TestApiProvider
       apis={[
         [scmIntegrationsApiRef, {}],
+        [configApiRef, configApi],
         [techdocsApiRef, techdocsApiMock],
         [techdocsStorageApiRef, techdocsStorageApiMock],
       ]}
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
index 9babff0c54..cc42c46b4e 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
@@ -15,7 +15,6 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 
 import { useTheme, useMediaQuery } from '@material-ui/core';
 
@@ -47,6 +46,7 @@ import {
   useSanitizerTransformer,
   useStylesTransformer,
 } from '../../transformers';
+import { useNavigateUrl } from './useNavigateUrl';
 
 const MOBILE_MEDIA_QUERY = 'screen and (max-width: 76.1875em)';
 
@@ -58,7 +58,7 @@ const MOBILE_MEDIA_QUERY = 'screen and (max-width: 76.1875em)';
 export const useTechDocsReaderDom = (
   entityRef: CompoundEntityRef,
 ): Element | null => {
-  const navigate = useNavigate();
+  const navigate = useNavigateUrl();
   const theme = useTheme<BackstageTheme>();
   const isMobileMedia = useMediaQuery(MOBILE_MEDIA_QUERY);
   const sanitizerTransformer = useSanitizerTransformer();
@@ -176,7 +176,6 @@ export const useTechDocsReaderDom = (
             // detect if CTRL or META keys are pressed so that links can be opened in a new tab with `window.open`
             const modifierActive = event.ctrlKey || event.metaKey;
             const parsedUrl = new URL(url);
-            const fullPath = `${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`;
 
             // capture link clicks within documentation
             const linkText =
@@ -187,9 +186,9 @@ export const useTechDocsReaderDom = (
             // hash exists when anchor is clicked on secondary sidebar
             if (parsedUrl.hash) {
               if (modifierActive) {
-                window.open(fullPath, '_blank');
+                window.open(url, '_blank');
               } else {
-                navigate(fullPath);
+                navigate(url);
                 // Scroll to hash if it's on the current page
                 transformedElement
                   ?.querySelector(`[id="${parsedUrl.hash.slice(1)}"]`)
@@ -197,9 +196,9 @@ export const useTechDocsReaderDom = (
               }
             } else {
               if (modifierActive) {
-                window.open(fullPath, '_blank');
+                window.open(url, '_blank');
               } else {
-                navigate(fullPath);
+                navigate(url);
               }
             }
           },
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx
new file mode 100644
index 0000000000..383ee4d688
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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 {
+  MockConfigApi,
+  renderInTestApp,
+  TestApiProvider,
+} from '@backstage/test-utils';
+import { resolveUrlToRelative, useNavigateUrl } from './useNavigateUrl';
+import { configApiRef } from '@backstage/core-plugin-api';
+
+const navigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => navigate,
+}));
+
+describe('resolveUrlToRelative', () => {
+  it('does nothing when app.baseUrl has no subpath', () => {
+    const url = 'http://localhost:3000/test';
+    const baseUrl = 'http://localhost:3000';
+    expect(resolveUrlToRelative(url, baseUrl)).toBe('/test');
+  });
+
+  it('removes the app.baseUrl subpath when present', () => {
+    const url = 'http://localhost:3000/instance/test';
+    const baseUrl = 'http://localhost:3000/instance';
+    expect(resolveUrlToRelative(url, baseUrl)).toBe('/test');
+  });
+
+  it('removes trailing slashes on the URL when present', () => {
+    const url = 'http://localhost:3000/test//';
+    const baseUrl = 'http://localhost:3000';
+    expect(resolveUrlToRelative(url, baseUrl)).toBe('/test');
+  });
+});
+
+const Component = ({ to }: { to: string }) => {
+  const navigateTo = useNavigateUrl();
+  return <>{navigateTo(to)}</>;
+};
+
+describe('useNavigateUrl', () => {
+  beforeEach(() => {
+    navigate.mockReset();
+  });
+  it('navigates to the desired page as expected', async () => {
+    const baseUrl = 'http://localhost:3000';
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [
+            configApiRef,
+            new MockConfigApi({
+              app: {
+                baseUrl,
+              },
+            }),
+          ],
+        ]}
+      >
+        <Component to={`${baseUrl}/test`} />
+      </TestApiProvider>,
+    );
+    expect(navigate).toHaveBeenCalledWith('/test');
+  });
+  it('handles app.baseUrl subpaths', async () => {
+    const baseUrl = 'http://localhost:3000/instance';
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [
+            configApiRef,
+            new MockConfigApi({
+              app: {
+                baseUrl,
+              },
+            }),
+          ],
+        ]}
+      >
+        <Component to={`${baseUrl}/test`} />
+      </TestApiProvider>,
+    );
+    expect(navigate).toHaveBeenCalledWith('/test');
+  });
+  it('handles relative urls', async () => {
+    const baseUrl = 'http://localhost:3000';
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [
+            configApiRef,
+            new MockConfigApi({
+              app: {
+                baseUrl,
+              },
+            }),
+          ],
+        ]}
+      >
+        <Component to="/test" />
+      </TestApiProvider>,
+    );
+    expect(navigate).toHaveBeenCalledWith('/test');
+  });
+});
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.tsx
new file mode 100644
index 0000000000..dfe1058d75
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.tsx
@@ -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 { configApiRef, useApi } from '@backstage/core-plugin-api';
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+/**
+ * Resolve a URL to a relative URL given a base URL that may or may not include subpaths.
+ * @param url - URL to parse into a relative url based on the baseUrl.
+ * @param baseUrl - Application base url, where the application is currently hosted.
+ * @returns relative path without any subpaths from website config.
+ */
+export function resolveUrlToRelative(url: string, baseUrl: string) {
+  const parsedAppUrl = new URL(baseUrl);
+  const appUrlPath = `${parsedAppUrl.origin}${parsedAppUrl.pathname.replace(
+    /\/$/,
+    '',
+  )}`;
+
+  const relativeUrl = url
+    .replace(appUrlPath, '')
+    // Remove any leading and trailing slashes.
+    .replace(/\/+$/, '')
+    .replace(/^\/+/, '');
+  const parsedUrl = new URL(`http://localhost/${relativeUrl}`);
+  return `${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`;
+}
+
+/**
+ * A helper hook that allows for full internal website urls to be processed through the navigate
+ *  hook provided by `react-router-dom`.
+ *
+ * NOTE: This does not support routing to external URLs. That should be done with a `Link` or `a`
+ *  element instead, or just `window.location.href`.
+ *
+ * TODO: Update this to use `useRouteRef` instead of `useApi`.
+ *
+ * @returns Navigation function that is a wrapper over `react-router-dom`'s
+ *  to support passing full URLs for navigation.
+ *
+ * @public
+ */
+export function useNavigateUrl() {
+  const navigate = useNavigate();
+  const configApi = useApi(configApiRef);
+  const appBaseUrl = configApi.getOptionalString('app.baseUrl');
+  const navigateFn = useCallback(
+    (to: string) => {
+      let url = to;
+      /**
+       * This should always be true when running the application, this just allows
+       *    test cases that do not have the configApi set up to run still.
+       */
+      if (appBaseUrl) {
+        try {
+          url = resolveUrlToRelative(to, appBaseUrl);
+        } catch (err) {
+          // URL passed in was relative.
+        }
+      }
+      navigate(url);
+    },
+    [navigate, appBaseUrl],
+  );
+  return navigateFn;
+}
diff --git a/plugins/todo-backend/CHANGELOG.md b/plugins/todo-backend/CHANGELOG.md
index 0a0e5e79f3..f422b8a023 100644
--- a/plugins/todo-backend/CHANGELOG.md
+++ b/plugins/todo-backend/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-todo-backend
 
+## 0.1.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+
+## 0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+
 ## 0.1.41-next.1
 
 ### Patch Changes
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index 7731293996..fff09403cd 100644
--- a/plugins/todo-backend/package.json
+++ b/plugins/todo-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-todo-backend",
   "description": "A Backstage backend plugin that lets you browse TODO comments in your source code",
-  "version": "0.1.41-next.1",
+  "version": "0.1.41-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index 60d107ffe6..1afaf26999 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-todo
 
+## 0.2.19-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.19-next.1
 
 ### Patch Changes
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index a305b79df7..53b3e82f61 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.19-next.1",
+  "version": "0.2.19-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index eeb62965a5..cc8b8a30ff 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.1.8-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+
 ## 0.1.8-next.1
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index 343eda45b8..e19c02b1e9 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.8-next.1",
+  "version": "0.1.8-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 5fe3362beb..bf357121d6 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-user-settings
 
+## 0.7.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/core-app-api@1.7.0-next.3
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
+## 0.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/core-app-api@1.7.0-next.2
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+
 ## 0.7.2-next.1
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 362b1e2344..6b108a227c 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-user-settings",
   "description": "A Backstage plugin that provides a settings page",
-  "version": "0.7.2-next.1",
+  "version": "0.7.2-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/vault-backend/CHANGELOG.md b/plugins/vault-backend/CHANGELOG.md
index 0f0ea675f0..4576354dce 100644
--- a/plugins/vault-backend/CHANGELOG.md
+++ b/plugins/vault-backend/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-vault-backend
 
+## 0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+
 ## 0.3.0-next.1
 
 ### Patch Changes
diff --git a/plugins/vault-backend/package.json b/plugins/vault-backend/package.json
index 4a58b42c69..23b4058c7c 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.0-next.1",
+  "version": "0.3.0-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 7580b64043..027d901964 100644
--- a/plugins/vault/CHANGELOG.md
+++ b/plugins/vault/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-vault
 
+## 0.1.11-next.3
+
+### Patch Changes
+
+- 7c7f8d38a51: Use `fetchApi` instead of raw `fetch` in order to pass auth header if necessary.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/plugin-catalog-react@1.4.1-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.1.11-next.1
 
 ### Patch Changes
diff --git a/plugins/vault/package.json b/plugins/vault/package.json
index 0cbd40b3fe..b266e061f4 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.11-next.1",
+  "version": "0.1.11-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/vault/src/api.test.ts b/plugins/vault/src/api.test.ts
index 471cadc87e..ec88412303 100644
--- a/plugins/vault/src/api.test.ts
+++ b/plugins/vault/src/api.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { VaultSecret, VaultClient } from './api';
@@ -26,6 +26,7 @@ describe('api', () => {
 
   const mockBaseUrl = 'https://api-vault.com/api/vault';
   const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
+  const fetchApi = new MockFetchApi();
 
   const mockSecretsResult: { items: VaultSecret[] } = {
     items: [
@@ -65,7 +66,7 @@ describe('api', () => {
 
   it('should return secrets', async () => {
     setupHandlers();
-    const api = new VaultClient({ discoveryApi });
+    const api = new VaultClient({ discoveryApi, fetchApi });
     expect(await api.listSecrets('test/success')).toEqual(
       mockSecretsResult.items,
     );
@@ -73,19 +74,19 @@ describe('api', () => {
 
   it('should return empty secret list', async () => {
     setupHandlers();
-    const api = new VaultClient({ discoveryApi });
+    const api = new VaultClient({ discoveryApi, fetchApi });
     expect(await api.listSecrets('test/empty')).toEqual([]);
   });
 
   it('should return all the secrets if no path defined', async () => {
     setupHandlers();
-    const api = new VaultClient({ discoveryApi });
+    const api = new VaultClient({ discoveryApi, fetchApi });
     expect(await api.listSecrets('')).toEqual(mockSecretsResult.items);
   });
 
   it('should throw an error if the Vault API responds with an HTTP 404', async () => {
     setupHandlers();
-    const api = new VaultClient({ discoveryApi });
+    const api = new VaultClient({ discoveryApi, fetchApi });
     await expect(api.listSecrets('test/not-found')).rejects.toThrow(
       "No secrets found in path 'v1/secrets/test%2Fnot-found'",
     );
@@ -93,7 +94,7 @@ describe('api', () => {
 
   it('should throw an error if the Vault API responds with a non-successful HTTP status code', async () => {
     setupHandlers();
-    const api = new VaultClient({ discoveryApi });
+    const api = new VaultClient({ discoveryApi, fetchApi });
     await expect(api.listSecrets('test/error')).rejects.toThrow(
       'Request failed with 400 Error',
     );
diff --git a/plugins/vault/src/api.ts b/plugins/vault/src/api.ts
index 84843c9176..d924336a2e 100644
--- a/plugins/vault/src/api.ts
+++ b/plugins/vault/src/api.ts
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DiscoveryApi, createApiRef } from '@backstage/core-plugin-api';
+import {
+  DiscoveryApi,
+  createApiRef,
+  FetchApi,
+} from '@backstage/core-plugin-api';
 import { NotFoundError, ResponseError } from '@backstage/errors';
 
 /**
@@ -52,9 +56,17 @@ export interface VaultApi {
  */
 export class VaultClient implements VaultApi {
   private readonly discoveryApi: DiscoveryApi;
+  private readonly fetchApi: FetchApi;
 
-  constructor({ discoveryApi }: { discoveryApi: DiscoveryApi }) {
+  constructor({
+    discoveryApi,
+    fetchApi,
+  }: {
+    discoveryApi: DiscoveryApi;
+    fetchApi: FetchApi;
+  }) {
     this.discoveryApi = discoveryApi;
+    this.fetchApi = fetchApi;
   }
 
   private async callApi<T>(
@@ -62,7 +74,7 @@ export class VaultClient implements VaultApi {
     query: { [key in string]: any },
   ): Promise<T> {
     const apiUrl = `${await this.discoveryApi.getBaseUrl('vault')}`;
-    const response = await fetch(
+    const response = await this.fetchApi.fetch(
       `${apiUrl}/${path}?${new URLSearchParams(query).toString()}`,
       {
         headers: {
diff --git a/plugins/vault/src/components/EntityVaultTable/EntityVaultTable.test.tsx b/plugins/vault/src/components/EntityVaultTable/EntityVaultTable.test.tsx
index 27cc0ed91e..e5bd5b43de 100644
--- a/plugins/vault/src/components/EntityVaultTable/EntityVaultTable.test.tsx
+++ b/plugins/vault/src/components/EntityVaultTable/EntityVaultTable.test.tsx
@@ -17,6 +17,7 @@
 import React from 'react';
 import { setupServer } from 'msw/node';
 import {
+  MockFetchApi,
   setupRequestMockHandlers,
   TestApiRegistry,
 } from '@backstage/test-utils';
@@ -33,6 +34,8 @@ describe('EntityVaultTable', () => {
   let apis: TestApiRegistry;
   const mockBaseUrl = 'https://api-vault.com/api/vault';
   const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
+  const fetchApi = new MockFetchApi();
+
   const entity = (secretPath: string) => {
     return {
       apiVersion: 'backstage.io/v1alpha1',
@@ -90,7 +93,7 @@ describe('EntityVaultTable', () => {
   beforeEach(() => {
     apis = TestApiRegistry.from([
       vaultApiRef,
-      new VaultClient({ discoveryApi }),
+      new VaultClient({ discoveryApi, fetchApi }),
     ]);
   });
 
diff --git a/plugins/vault/src/plugin.ts b/plugins/vault/src/plugin.ts
index 8275505abb..f62a8a73e4 100644
--- a/plugins/vault/src/plugin.ts
+++ b/plugins/vault/src/plugin.ts
@@ -19,9 +19,11 @@ import {
   createPlugin,
   DiscoveryApi,
   discoveryApiRef,
+  FetchApi,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 
-import { VaultClient, vaultApiRef } from './api';
+import { vaultApiRef, VaultClient } from './api';
 
 /**
  * The vault plugin.
@@ -32,10 +34,17 @@ export const vaultPlugin = createPlugin({
   apis: [
     createApiFactory({
       api: vaultApiRef,
-      deps: { discoveryApi: discoveryApiRef },
-      factory: ({ discoveryApi }: { discoveryApi: DiscoveryApi }) =>
+      deps: { discoveryApi: discoveryApiRef, fetchApi: fetchApiRef },
+      factory: ({
+        discoveryApi,
+        fetchApi,
+      }: {
+        discoveryApi: DiscoveryApi;
+        fetchApi: FetchApi;
+      }) =>
         new VaultClient({
           discoveryApi,
+          fetchApi,
         }),
     }),
   ],
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
index fc2bf583b7..8566f17377 100644
--- a/plugins/xcmetrics/CHANGELOG.md
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-xcmetrics
 
+## 0.2.37-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
+## 0.2.37-next.2
+
+### Patch Changes
+
+- 55a969fe574: Bumped `recharts` dependency to `^2.5.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.6-next.2
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/theme@0.2.19-next.0
+
 ## 0.2.37-next.1
 
 ### Patch Changes
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index cced2ca271..8801a4c66a 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.37-next.1",
+  "version": "0.2.37-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/storybook/package.json b/storybook/package.json
index b256fcaf33..6f2161b64c 100644
--- a/storybook/package.json
+++ b/storybook/package.json
@@ -8,7 +8,7 @@
     "build-storybook": "build-storybook --output-dir dist"
   },
   "dependencies": {
-    "@swc/core": "^1.3.9",
+    "@swc/core": "^1.3.46",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-hot-loader": "^4.13.0",
@@ -25,7 +25,7 @@
     "@storybook/manager-webpack5": "^6.5.9",
     "@storybook/node-logger": "^6.5.9",
     "@storybook/react": "^6.5.9",
-    "@storybook/testing-library": "^0.0.13",
+    "@storybook/testing-library": "^0.1.0",
     "storybook-dark-mode": "^1.1.0",
     "typescript": "~4.7.0"
   },
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 4bb4a0a098..4a7918d530 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -331,17 +331,17 @@ __metadata:
   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
+"@babel/helper-string-parser@npm:^7.19.4":
+  version: 7.19.4
+  resolution: "@babel/helper-string-parser@npm:7.19.4"
+  checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-validator-identifier@npm:7.18.6"
-  checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648
+"@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
 
@@ -386,12 +386,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.11":
-  version: 7.18.11
-  resolution: "@babel/parser@npm:7.18.11"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.11, @babel/parser@npm:^7.20.7":
+  version: 7.21.4
+  resolution: "@babel/parser@npm:7.21.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 5ecc75b83e62ec53a947b1635a6ca75d6210d4a4f962f9f16f4239a6783f98e57f9662b598fa2fb1b8e12c0ad5c2bd86846ed0b97b85eb73dd7498b3a6d71a4b
+  checksum: de610ecd1bff331766d0c058023ca11a4f242bfafefc42caf926becccfb6756637d167c001987ca830dd4b34b93c629a4cef63f8c8c864a8564cdfde1989ac77
   languageName: node
   linkType: hard
 
@@ -1528,14 +1528,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.2.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.18.13
-  resolution: "@babel/types@npm:7.18.13"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.21.4
+  resolution: "@babel/types@npm:7.21.4"
   dependencies:
-    "@babel/helper-string-parser": ^7.18.10
-    "@babel/helper-validator-identifier": ^7.18.6
+    "@babel/helper-string-parser": ^7.19.4
+    "@babel/helper-validator-identifier": ^7.19.1
     to-fast-properties: ^2.0.0
-  checksum: abc3ad1f3b6864df0ea0e778bcdf7d2c5ee2293811192962d50e8a8c05c1aeec90a48275f53b2a45aad882ed8bef9477ae1f8e70ac1d44d039e14930d1388dcc
+  checksum: 587bc55a91ce003b0f8aa10d70070f8006560d7dc0360dc0406d306a2cb2a10154e2f9080b9c37abec76907a90b330a536406cb75e6bdc905484f37b75c73219
   languageName: node
   linkType: hard
 
@@ -1952,28 +1952,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/addons@npm:6.5.10"
-  dependencies:
-    "@storybook/api": 6.5.10
-    "@storybook/channels": 6.5.10
-    "@storybook/client-logger": 6.5.10
-    "@storybook/core-events": 6.5.10
-    "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.10
-    "@storybook/theming": 6.5.10
-    "@types/webpack-env": ^1.16.0
-    core-js: ^3.8.2
-    global: ^4.4.0
-    regenerator-runtime: ^0.13.7
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 9143908c77ab77064a5da3de1fcfb218e5f0e561f4b8a083e59b4104e442567c87fb571a752bb11c469317fc3bbcb9c2e42ebd9a5a41f825b3fd67a920d90621
-  languageName: node
-  linkType: hard
-
 "@storybook/addons@npm:6.5.16, @storybook/addons@npm:^6.0.0, @storybook/addons@npm:^6.5.9":
   version: 6.5.16
   resolution: "@storybook/addons@npm:6.5.16"
@@ -1996,34 +1974,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/api@npm:6.5.10"
-  dependencies:
-    "@storybook/channels": 6.5.10
-    "@storybook/client-logger": 6.5.10
-    "@storybook/core-events": 6.5.10
-    "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.10
-    "@storybook/semver": ^7.3.2
-    "@storybook/theming": 6.5.10
-    core-js: ^3.8.2
-    fast-deep-equal: ^3.1.3
-    global: ^4.4.0
-    lodash: ^4.17.21
-    memoizerific: ^1.11.3
-    regenerator-runtime: ^0.13.7
-    store2: ^2.12.0
-    telejson: ^6.0.8
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 49e01f35fa6de776329407533c0449aac84bbc9404bf717b1cebff5dc8961618956d7ba0003361c4e6cdc24e898619f778fea15db5a30eb320fc73a4b53adb40
-  languageName: node
-  linkType: hard
-
 "@storybook/api@npm:6.5.16, @storybook/api@npm:^6.0.0":
   version: 6.5.16
   resolution: "@storybook/api@npm:6.5.16"
@@ -2180,6 +2130,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/channel-postmessage@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@storybook/channel-postmessage@npm:7.0.2"
+  dependencies:
+    "@storybook/channels": 7.0.2
+    "@storybook/client-logger": 7.0.2
+    "@storybook/core-events": 7.0.2
+    "@storybook/global": ^5.0.0
+    qs: ^6.10.0
+    telejson: ^7.0.3
+  checksum: ef175027b4b5794af263c6ec40f6caab02deb3c189598493f5612cd5745d9cada1427914dbf39aef01dbf3e71f4299d35cfcaaaad727c06da47850b56044032c
+  languageName: node
+  linkType: hard
+
 "@storybook/channel-websocket@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/channel-websocket@npm:6.5.16"
@@ -2193,17 +2157,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/channels@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/channels@npm:6.5.10"
-  dependencies:
-    core-js: ^3.8.2
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
-  checksum: 3837d2aff1575aa8d5af77162781b2824b909f18a7e7d3b961e6a14854b58011a56bd4f6c92bf065b8856fbcf7925a5849ffc56e42badac240701a560a26c627
-  languageName: node
-  linkType: hard
-
 "@storybook/channels@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/channels@npm:6.5.16"
@@ -2215,6 +2168,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/channels@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@storybook/channels@npm:7.0.2"
+  checksum: 34ff0481a7f8bf613a9b1c9ffc3db4e48e8c80fea29d66b68a9c3b74d52040d87a5ed002d0e3e287813f33ad607440d46078e5e96367bf98713c72efb587d4a3
+  languageName: node
+  linkType: hard
+
 "@storybook/client-api@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/client-api@npm:6.5.16"
@@ -2246,17 +2206,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/client-logger@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/client-logger@npm:6.5.10"
-  dependencies:
-    core-js: ^3.8.2
-    global: ^4.4.0
-  checksum: 6aa15e27e1f805b34332f647545eb53277c87492044073daf31ac6151b274cb7da6d2c8b3831484bb0c4c410f8adc1bb13322c3b80ee2f88e30856721c7d9ab1
-  languageName: node
-  linkType: hard
-
-"@storybook/client-logger@npm:6.5.16, @storybook/client-logger@npm:^6.4.0":
+"@storybook/client-logger@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/client-logger@npm:6.5.16"
   dependencies:
@@ -2266,6 +2216,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/client-logger@npm:7.0.2, @storybook/client-logger@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
+  version: 7.0.2
+  resolution: "@storybook/client-logger@npm:7.0.2"
+  dependencies:
+    "@storybook/global": ^5.0.0
+  checksum: 3deb50e8cde7777025753938e21318ee34c10237e29664cfb2dfd08f70d84b073961e1b546629e536ef53f26a91a9aed2c83223d7cfe1680787ecee7e39ce8a8
+  languageName: node
+  linkType: hard
+
 "@storybook/components@npm:6.5.16, @storybook/components@npm:^6.0.0":
   version: 6.5.16
   resolution: "@storybook/components@npm:6.5.16"
@@ -2384,15 +2343,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/core-events@npm:6.5.10"
-  dependencies:
-    core-js: ^3.8.2
-  checksum: 89139f3f34a4ea0f2bbc02ebaa2968664cdc17abd88cc2e0467a0dfb1c11577e85fa402e5804fe4d6a99edd696d365abf93d30c396fc177563478cdbb68bcb85
-  languageName: node
-  linkType: hard
-
 "@storybook/core-events@npm:6.5.16, @storybook/core-events@npm:^6.0.0":
   version: 6.5.16
   resolution: "@storybook/core-events@npm:6.5.16"
@@ -2402,6 +2352,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/core-events@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@storybook/core-events@npm:7.0.2"
+  checksum: 5bca4db82f582b939ba1aaba26aee3e8f9aa0a2d36728934b4d26dbe858b6f455a46ddcf4e8e6c7b3f5fa5b517716c503626febca08e53712d516f2ca105bf11
+  languageName: node
+  linkType: hard
+
 "@storybook/core-server@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/core-server@npm:6.5.16"
@@ -2522,6 +2479,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/csf@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@storybook/csf@npm:0.1.0"
+  dependencies:
+    type-fest: ^2.19.0
+  checksum: f1784f2aff27d5c27ab897878b08e3b04a64e7f62da1ea95fd11bfe9f558300e55f0d483d58282e8254a4b4e8935201178e70c264ccc96104c67403215d651f0
+  languageName: node
+  linkType: hard
+
 "@storybook/docs-tools@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/docs-tools@npm:6.5.16"
@@ -2537,16 +2503,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/instrumenter@npm:^6.4.0":
-  version: 6.5.10
-  resolution: "@storybook/instrumenter@npm:6.5.10"
+"@storybook/global@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@storybook/global@npm:5.0.0"
+  checksum: ede0ad35ec411fe31c61150dbd118fef344d1d0e72bf5d3502368e35cf68126f6b7ae4a0ab5e2ffe2f0baa3b4286f03ad069ba3e098e1725449ef08b7e154ba8
+  languageName: node
+  linkType: hard
+
+"@storybook/instrumenter@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
+  version: 7.0.2
+  resolution: "@storybook/instrumenter@npm:7.0.2"
   dependencies:
-    "@storybook/addons": 6.5.10
-    "@storybook/client-logger": 6.5.10
-    "@storybook/core-events": 6.5.10
-    core-js: ^3.8.2
-    global: ^4.4.0
-  checksum: cd393a8df6561561d416c6b36b46130040d91103a30e471a2161d6cb12a42c7b80d3134c2e8219a1fa1c08ad768a78194528467f5d0a15f4df0074dcc8bed057
+    "@storybook/channels": 7.0.2
+    "@storybook/client-logger": 7.0.2
+    "@storybook/core-events": 7.0.2
+    "@storybook/global": ^5.0.0
+    "@storybook/preview-api": 7.0.2
+  checksum: 1f0fcd2fd6561030897558ee6fb363da23bbbc67f08d12204f885da9ffc90f180703b3fbd85f01758e0f7a066437ebd6af415d4eefcb9ddb1e8ad16fd37e3eae
   languageName: node
   linkType: hard
 
@@ -2677,6 +2650,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/preview-api@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@storybook/preview-api@npm:7.0.2"
+  dependencies:
+    "@storybook/channel-postmessage": 7.0.2
+    "@storybook/channels": 7.0.2
+    "@storybook/client-logger": 7.0.2
+    "@storybook/core-events": 7.0.2
+    "@storybook/csf": ^0.1.0
+    "@storybook/global": ^5.0.0
+    "@storybook/types": 7.0.2
+    "@types/qs": ^6.9.5
+    dequal: ^2.0.2
+    lodash: ^4.17.21
+    memoizerific: ^1.11.3
+    qs: ^6.10.0
+    synchronous-promise: ^2.0.15
+    ts-dedent: ^2.0.0
+    util-deprecate: ^1.0.2
+  checksum: 350811420c996c9616b59615fe2fe7785ec6590301ed3a6a54b07ca4b2bb45614f47b4cacf037c72ed1d7dd04a8647d0e99a4e2e0f23f91a0dc5d1e8f3486ee2
+  languageName: node
+  linkType: hard
+
 "@storybook/preview-web@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/preview-web@npm:6.5.16"
@@ -2787,22 +2783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/router@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/router@npm:6.5.10"
-  dependencies:
-    "@storybook/client-logger": 6.5.10
-    core-js: ^3.8.2
-    memoizerific: ^1.11.3
-    qs: ^6.10.0
-    regenerator-runtime: ^0.13.7
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 118598867067344607cff7ef6fdef7b7a18a3e08a53f75fc4beaa65013f435ae18d800d25eea52376662bc1d98a2822a143531e701d8cea7130d42dc48e2cce7
-  languageName: node
-  linkType: hard
-
 "@storybook/router@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/router@npm:6.5.16"
@@ -2898,31 +2878,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/testing-library@npm:^0.0.13":
-  version: 0.0.13
-  resolution: "@storybook/testing-library@npm:0.0.13"
+"@storybook/testing-library@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@storybook/testing-library@npm:0.1.0"
   dependencies:
-    "@storybook/client-logger": ^6.4.0
-    "@storybook/instrumenter": ^6.4.0
+    "@storybook/client-logger": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
+    "@storybook/instrumenter": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
     "@testing-library/dom": ^8.3.0
     "@testing-library/user-event": ^13.2.1
     ts-dedent: ^2.2.0
-  checksum: 759361ad3fbc89bdfddfa6d5a15eef06ed6fa9110bfa40c08fcf2497e7acd85e8d5c73c26ea4a46934168b21db294256befb55755fee4292d3d277c576284a1c
-  languageName: node
-  linkType: hard
-
-"@storybook/theming@npm:6.5.10":
-  version: 6.5.10
-  resolution: "@storybook/theming@npm:6.5.10"
-  dependencies:
-    "@storybook/client-logger": 6.5.10
-    core-js: ^3.8.2
-    memoizerific: ^1.11.3
-    regenerator-runtime: ^0.13.7
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 2082d7847785a307a18eb605282468d844af01f57752916766a60047b5543cf6f0c6664b9c7a693809b4fdc121415989c2170833d3de7ca8b07fa056741787d0
+  checksum: a413110dafe80f8fe64da912fddb653bc3c695c94bd023b8cb918e519e9f94119bae559909bfb8ad229041a4f17a12b33425c61572270702c116d0b727b4d4ba
   languageName: node
   linkType: hard
 
@@ -2941,6 +2906,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/types@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@storybook/types@npm:7.0.2"
+  dependencies:
+    "@storybook/channels": 7.0.2
+    "@types/babel__core": ^7.0.0
+    "@types/express": ^4.7.0
+    file-system-cache: ^2.0.0
+  checksum: 329e271af5621619a8d17fff222e4170b62ca4b451bcb48b5a899d63bb8df211c5d3d8dafa2266ac3c9801bf64c4ac1aed73950a2f21da82333b19c448ea32e0
+  languageName: node
+  linkType: hard
+
 "@storybook/ui@npm:6.5.16":
   version: 6.5.16
   resolution: "@storybook/ui@npm:6.5.16"
@@ -2966,90 +2943,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-arm64@npm:1.3.42"
+"@swc/core-darwin-arm64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-arm64@npm:1.3.50"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-x64@npm:1.3.42"
+"@swc/core-darwin-x64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-x64@npm:1.3.50"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.42"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.50"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.42"
+"@swc/core-linux-arm64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.42"
+"@swc/core-linux-arm64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.42"
+"@swc/core-linux-x64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.42"
+"@swc/core-linux-x64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.42"
+"@swc/core-win32-arm64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.42"
+"@swc/core-win32-ia32-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.42"
+"@swc/core-win32-x64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.3.9":
-  version: 1.3.42
-  resolution: "@swc/core@npm:1.3.42"
+"@swc/core@npm:^1.3.46":
+  version: 1.3.50
+  resolution: "@swc/core@npm:1.3.50"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.42
-    "@swc/core-darwin-x64": 1.3.42
-    "@swc/core-linux-arm-gnueabihf": 1.3.42
-    "@swc/core-linux-arm64-gnu": 1.3.42
-    "@swc/core-linux-arm64-musl": 1.3.42
-    "@swc/core-linux-x64-gnu": 1.3.42
-    "@swc/core-linux-x64-musl": 1.3.42
-    "@swc/core-win32-arm64-msvc": 1.3.42
-    "@swc/core-win32-ia32-msvc": 1.3.42
-    "@swc/core-win32-x64-msvc": 1.3.42
+    "@swc/core-darwin-arm64": 1.3.50
+    "@swc/core-darwin-x64": 1.3.50
+    "@swc/core-linux-arm-gnueabihf": 1.3.50
+    "@swc/core-linux-arm64-gnu": 1.3.50
+    "@swc/core-linux-arm64-musl": 1.3.50
+    "@swc/core-linux-x64-gnu": 1.3.50
+    "@swc/core-linux-x64-musl": 1.3.50
+    "@swc/core-win32-arm64-msvc": 1.3.50
+    "@swc/core-win32-ia32-msvc": 1.3.50
+    "@swc/core-win32-x64-msvc": 1.3.50
+  peerDependencies:
+    "@swc/helpers": ^0.5.0
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -3071,7 +3050,10 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  checksum: 5c28c03ee6a4e1f630c4a519b56d7e23a0102f70fad977a3ab144a3da96231cf4849e473cdc9ee7be6b9266ba0838d0bc0b6b3575a75540f302befe96cc9606e
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 63364c0bf6f395a57b576c4f7c5f79542a7c018c7bcc121e1bccdb157ca3ead97ee30920cf5ec6e93b0bd58e0145cb388721d7862ede867927137a437b4ef21a
   languageName: node
   linkType: hard
 
@@ -3116,6 +3098,66 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/babel__core@npm:^7.0.0":
+  version: 7.20.0
+  resolution: "@types/babel__core@npm:7.20.0"
+  dependencies:
+    "@babel/parser": ^7.20.7
+    "@babel/types": ^7.20.7
+    "@types/babel__generator": "*"
+    "@types/babel__template": "*"
+    "@types/babel__traverse": "*"
+  checksum: 49b601a0a7637f1f387442c8156bd086cfd10ff4b82b0e1994e73a6396643b5435366fb33d6b604eade8467cca594ef97adcbc412aede90bb112ebe88d0ad6df
+  languageName: node
+  linkType: hard
+
+"@types/babel__generator@npm:*":
+  version: 7.6.4
+  resolution: "@types/babel__generator@npm:7.6.4"
+  dependencies:
+    "@babel/types": ^7.0.0
+  checksum: 20effbbb5f8a3a0211e95959d06ae70c097fb6191011b73b38fe86deebefad8e09ee014605e0fd3cdaedc73d158be555866810e9166e1f09e4cfd880b874dcb0
+  languageName: node
+  linkType: hard
+
+"@types/babel__template@npm:*":
+  version: 7.4.1
+  resolution: "@types/babel__template@npm:7.4.1"
+  dependencies:
+    "@babel/parser": ^7.1.0
+    "@babel/types": ^7.0.0
+  checksum: 649fe8b42c2876be1fd28c6ed9b276f78152d5904ec290b6c861d9ef324206e0a5c242e8305c421ac52ecf6358fa7e32ab7a692f55370484825c1df29b1596ee
+  languageName: node
+  linkType: hard
+
+"@types/babel__traverse@npm:*":
+  version: 7.18.3
+  resolution: "@types/babel__traverse@npm:7.18.3"
+  dependencies:
+    "@babel/types": ^7.3.0
+  checksum: d20953338b2f012ab7750932ece0a78e7d1645b0a6ff42d49be90f55e9998085da1374a9786a7da252df89555c6586695ba4d1d4b4e88ab2b9f306bcd35e00d3
+  languageName: node
+  linkType: hard
+
+"@types/body-parser@npm:*":
+  version: 1.19.2
+  resolution: "@types/body-parser@npm:1.19.2"
+  dependencies:
+    "@types/connect": "*"
+    "@types/node": "*"
+  checksum: e17840c7d747a549f00aebe72c89313d09fbc4b632b949b2470c5cb3b1cb73863901ae84d9335b567a79ec5efcfb8a28ff8e3f36bc8748a9686756b6d5681f40
+  languageName: node
+  linkType: hard
+
+"@types/connect@npm:*":
+  version: 3.4.35
+  resolution: "@types/connect@npm:3.4.35"
+  dependencies:
+    "@types/node": "*"
+  checksum: fe81351470f2d3165e8b12ce33542eef89ea893e36dd62e8f7d72566dfb7e448376ae962f9f3ea888547ce8b55a40020ca0e01d637fab5d99567673084542641
+  languageName: node
+  linkType: hard
+
 "@types/eslint-scope@npm:^3.7.3":
   version: 3.7.4
   resolution: "@types/eslint-scope@npm:3.7.4"
@@ -3150,6 +3192,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/express-serve-static-core@npm:^4.17.33":
+  version: 4.17.33
+  resolution: "@types/express-serve-static-core@npm:4.17.33"
+  dependencies:
+    "@types/node": "*"
+    "@types/qs": "*"
+    "@types/range-parser": "*"
+  checksum: dce580d16b85f207445af9d4053d66942b27d0c72e86153089fa00feee3e96ae336b7bedb31ed4eea9e553c99d6dd356ed6e0928f135375d9f862a1a8015adf2
+  languageName: node
+  linkType: hard
+
+"@types/express@npm:^4.7.0":
+  version: 4.17.17
+  resolution: "@types/express@npm:4.17.17"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/express-serve-static-core": ^4.17.33
+    "@types/qs": "*"
+    "@types/serve-static": "*"
+  checksum: 0196dacc275ac3ce89d7364885cb08e7fb61f53ca101f65886dbf1daf9b7eb05c0943e2e4bbd01b0cc5e50f37e0eea7e4cbe97d0304094411ac73e1b7998f4da
+  languageName: node
+  linkType: hard
+
 "@types/glob@npm:*, @types/glob@npm:^7.1.1":
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
@@ -3220,6 +3285,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/mime@npm:*":
+  version: 3.0.1
+  resolution: "@types/mime@npm:3.0.1"
+  checksum: 4040fac73fd0cea2460e29b348c1a6173da747f3a87da0dbce80dd7a9355a3d0e51d6d9a401654f3e5550620e3718b5a899b2ec1debf18424e298a2c605346e7
+  languageName: node
+  linkType: hard
+
 "@types/minimatch@npm:*":
   version: 3.0.5
   resolution: "@types/minimatch@npm:3.0.5"
@@ -3286,13 +3358,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/qs@npm:^6.9.5":
+"@types/qs@npm:*, @types/qs@npm:^6.9.5":
   version: 6.9.7
   resolution: "@types/qs@npm:6.9.7"
   checksum: 7fd6f9c25053e9b5bb6bc9f9f76c1d89e6c04f7707a7ba0e44cc01f17ef5284adb82f230f542c2d5557d69407c9a40f0f3515e8319afd14e1e16b5543ac6cdba
   languageName: node
   linkType: hard
 
+"@types/range-parser@npm:*":
+  version: 1.2.4
+  resolution: "@types/range-parser@npm:1.2.4"
+  checksum: b7c0dfd5080a989d6c8bb0b6750fc0933d9acabeb476da6fe71d8bdf1ab65e37c136169d84148034802f48378ab94e3c37bb4ef7656b2bec2cb9c0f8d4146a95
+  languageName: node
+  linkType: hard
+
+"@types/serve-static@npm:*":
+  version: 1.15.1
+  resolution: "@types/serve-static@npm:1.15.1"
+  dependencies:
+    "@types/mime": "*"
+    "@types/node": "*"
+  checksum: 2e078bdc1e458c7dfe69e9faa83cc69194b8896cce57cb745016580543c7ab5af07fdaa8ac1765eb79524208c81017546f66056f44d1204f812d72810613de36
+  languageName: node
+  linkType: hard
+
 "@types/source-list-map@npm:*":
   version: 0.1.2
   resolution: "@types/source-list-map@npm:0.1.2"
@@ -5203,6 +5292,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dequal@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "dequal@npm:2.0.3"
+  checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
+  languageName: node
+  linkType: hard
+
 "destroy@npm:1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
@@ -5902,6 +5998,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"file-system-cache@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "file-system-cache@npm:2.0.2"
+  dependencies:
+    fs-extra: ^11.1.0
+    ramda: ^0.28.0
+  checksum: ac4f9065132ac4593dbfb7c8fc4683cccc0f58823279763690fb3fca859cc5e6b4446c846af718354059695fa90db316be4ce19e16578bbb0feab4a9159e9fbc
+  languageName: node
+  linkType: hard
+
 "fill-range@npm:^4.0.0":
   version: 4.0.0
   resolution: "fill-range@npm:4.0.0"
@@ -6131,6 +6237,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:^11.1.0":
+  version: 11.1.1
+  resolution: "fs-extra@npm:11.1.1"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: fb883c68245b2d777fbc1f2082c9efb084eaa2bbf9fddaa366130d196c03608eebef7fb490541276429ee1ca99f317e2d73e96f5ca0999eefedf5a624ae1edfd
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1":
   version: 9.1.0
   resolution: "fs-extra@npm:9.1.0"
@@ -10655,8 +10772,8 @@ __metadata:
     "@storybook/manager-webpack5": ^6.5.9
     "@storybook/node-logger": ^6.5.9
     "@storybook/react": ^6.5.9
-    "@storybook/testing-library": ^0.0.13
-    "@swc/core": ^1.3.9
+    "@storybook/testing-library": ^0.1.0
+    "@swc/core": ^1.3.46
     react: ^17.0.2
     react-dom: ^17.0.2
     react-hot-loader: ^4.13.0
@@ -10954,6 +11071,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"telejson@npm:^7.0.3":
+  version: 7.1.0
+  resolution: "telejson@npm:7.1.0"
+  dependencies:
+    memoizerific: ^1.11.3
+  checksum: 8000e43dc862a87ab1ca342a2635641923d55c2585f85ea8c7c60293681d6f920e8b9570cc12d90ecef286f065c176da5f769f42f4828ba18a626627bed1ac07
+  languageName: node
+  linkType: hard
+
 "terser-webpack-plugin@npm:^4.2.3":
   version: 4.2.3
   resolution: "terser-webpack-plugin@npm:4.2.3"
@@ -11183,6 +11309,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^2.19.0":
+  version: 2.19.0
+  resolution: "type-fest@npm:2.19.0"
+  checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
+  languageName: node
+  linkType: hard
+
 "type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
diff --git a/yarn.lock b/yarn.lock
index 8ad5779546..15ef5a1087 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21,6 +21,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@apidevtools/json-schema-ref-parser@npm:9.0.6":
+  version: 9.0.6
+  resolution: "@apidevtools/json-schema-ref-parser@npm:9.0.6"
+  dependencies:
+    "@jsdevtools/ono": ^7.1.3
+    call-me-maybe: ^1.0.1
+    js-yaml: ^3.13.1
+  checksum: c7ff53623ab8a9dd221772a5757fa0b9e5167a5ac3a71c23596634bae6efc85d8efcdebbe17f73ee5c027ea5afc48c705e8a720f02c4909f9a357d8027040b7b
+  languageName: node
+  linkType: hard
+
 "@apidevtools/json-schema-ref-parser@npm:^9.0.6":
   version: 9.1.2
   resolution: "@apidevtools/json-schema-ref-parser@npm:9.1.2"
@@ -33,6 +44,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@apidevtools/openapi-schemas@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@apidevtools/openapi-schemas@npm:2.1.0"
+  checksum: 4a8f64935b9049ef21e41fa4b188f39f6bc3f5291cebd451701db1115451ccb246a739e46cc5ce9ecdec781671431db40db7851acdac84a990a45756e0f32de3
+  languageName: node
+  linkType: hard
+
+"@apidevtools/swagger-methods@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@apidevtools/swagger-methods@npm:3.0.2"
+  checksum: d06b1ac5c1956613c4c6be695612ef860cd4e962b93a509ca551735a328a856cae1e33399cac1dcbf8333ba22b231746f3586074769ef0e172cf549ec9e7eaae
+  languageName: node
+  linkType: hard
+
+"@apidevtools/swagger-parser@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "@apidevtools/swagger-parser@npm:10.1.0"
+  dependencies:
+    "@apidevtools/json-schema-ref-parser": 9.0.6
+    "@apidevtools/openapi-schemas": ^2.1.0
+    "@apidevtools/swagger-methods": ^3.0.2
+    "@jsdevtools/ono": ^7.1.3
+    ajv: ^8.6.3
+    ajv-draft-04: ^1.0.0
+    call-me-maybe: ^1.0.1
+  peerDependencies:
+    openapi-types: ">=7"
+  checksum: c7c923755bd025ee2cae97e1cfd525538523ba74c341a0ac814c023ffe5e63fc2d997539a8ccf9a0fcec41a2d6337d40cc5735acb991ddcbb415853a241908d1
+  languageName: node
+  linkType: hard
+
 "@apollo/cache-control-types@npm:^1.0.2":
   version: 1.0.2
   resolution: "@apollo/cache-control-types@npm:1.0.2"
@@ -43,8 +85,8 @@ __metadata:
   linkType: hard
 
 "@apollo/client@npm:^3.0.0":
-  version: 3.7.11
-  resolution: "@apollo/client@npm:3.7.11"
+  version: 3.7.12
+  resolution: "@apollo/client@npm:3.7.12"
   dependencies:
     "@graphql-typed-document-node/core": ^3.1.1
     "@wry/context": ^0.7.0
@@ -74,7 +116,7 @@ __metadata:
       optional: true
     subscriptions-transport-ws:
       optional: true
-  checksum: 56fa501dc27b68b01c054ffd5642fcfedb16ee4653e819fb92d1b6cae834160f1274a961f335812f4781bbbbdf3bb6f851f07a7351f95d8945740cc79fa2d58f
+  checksum: 9b9b0cd3b02d6b90ac4565737a1fa4d0e3c8e1f4cd0a0e1c680ed6f174f522469d16f0a71bc57ea358538b482c5085c33ae22d0d3cc42d90cef1c03b1f036e61
   languageName: node
   linkType: hard
 
@@ -489,569 +531,569 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/abort-controller@npm:3.296.0, @aws-sdk/abort-controller@npm:^3.208.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/abort-controller@npm:3.296.0"
+"@aws-sdk/abort-controller@npm:3.310.0, @aws-sdk/abort-controller@npm:^3.208.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/abort-controller@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: bfaf89f703f3be0b2c79574e3bd67f7f8272c88e1f99edaba51fa592a70d82f391380fdec703d8b31eea5488b285797848f7c6d187e87872ec0faf2df8284d47
+  checksum: ca081fbec7419ff7bc03b7fddcfe7be1d5e390290c819069f42672f5a66415b55d90a81de899c384fd3368396390e3573c66345a8f91683e600c6caff64a239f
   languageName: node
   linkType: hard
 
-"@aws-sdk/chunked-blob-reader@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/chunked-blob-reader@npm:3.295.0"
+"@aws-sdk/chunked-blob-reader@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/chunked-blob-reader@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 229903d1092a4367fcd4b9e9f9a0b5f33dece397e97e8266406fb17cb40ad3ce212d48d7b6fe4dc5e7b2cf4563fd2f61652e0b4803df9c5079ccb05fccb15ec7
+  checksum: 4969fe05c6cea38d0a8dc3ec8e37cbd82a0a5b6f8c32ad6c7d02f0800bc3641e96356f47981c88b645b4dc2bdcb73d03d7ec67ac38d277dde8337b61688f815b
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-cognito-identity@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-cognito-identity@npm:3.299.0"
+"@aws-sdk/client-cognito-identity@npm:3.312.0":
+  version: 3.312.0
+  resolution: "@aws-sdk/client-cognito-identity@npm:3.312.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.299.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/credential-provider-node": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-signing": 3.299.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/client-sts": 3.312.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/credential-provider-node": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-signing": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: fdcf53a12c4d5a4b71e29cac553c1aa8137fa4e5df3c23134f168618f4bd10e2480786a3de50bc9fab66aead74bd359bdbc5bf64c4d3553d71eb2488377a3f1f
+  checksum: 1bbd307c899e112bc265927e052afebe7e25d111fce8e765c85c40a84152910549dd25d9d8f4cb0561773f9be72c5a71f0ff9577582f61ee30e27d4188dc06d5
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-s3@npm:3.299.0"
+  version: 3.312.0
+  resolution: "@aws-sdk/client-s3@npm:3.312.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.299.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/credential-provider-node": 3.299.0
-    "@aws-sdk/eventstream-serde-browser": 3.296.0
-    "@aws-sdk/eventstream-serde-config-resolver": 3.296.0
-    "@aws-sdk/eventstream-serde-node": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-blob-browser": 3.299.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/hash-stream-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/md5-js": 3.296.0
-    "@aws-sdk/middleware-bucket-endpoint": 3.299.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-expect-continue": 3.296.0
-    "@aws-sdk/middleware-flexible-checksums": 3.296.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-location-constraint": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-sdk-s3": 3.296.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-signing": 3.299.0
-    "@aws-sdk/middleware-ssec": 3.296.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/signature-v4-multi-region": 3.299.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-stream-browser": 3.296.0
-    "@aws-sdk/util-stream-node": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
-    "@aws-sdk/util-waiter": 3.296.0
-    "@aws-sdk/xml-builder": 3.295.0
+    "@aws-sdk/client-sts": 3.312.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/credential-provider-node": 3.310.0
+    "@aws-sdk/eventstream-serde-browser": 3.310.0
+    "@aws-sdk/eventstream-serde-config-resolver": 3.310.0
+    "@aws-sdk/eventstream-serde-node": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-blob-browser": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/hash-stream-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/md5-js": 3.310.0
+    "@aws-sdk/middleware-bucket-endpoint": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-expect-continue": 3.310.0
+    "@aws-sdk/middleware-flexible-checksums": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-location-constraint": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-sdk-s3": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-signing": 3.310.0
+    "@aws-sdk/middleware-ssec": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/signature-v4-multi-region": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-stream-browser": 3.310.0
+    "@aws-sdk/util-stream-node": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
+    "@aws-sdk/util-waiter": 3.310.0
+    "@aws-sdk/xml-builder": 3.310.0
     fast-xml-parser: 4.1.2
     tslib: ^2.5.0
-  checksum: 564fb486c47550e44abee25ebb98349418dc0c7d016695aeeb7fc08a0401353e0789f3191eb02825aee06e892d15c175434bf727d8e79a7af8c8deb9c08bf54d
+  checksum: 20764e30d10a0280961ba45491f6b26f7ca27e430da348fa4ce257b75fe1b67d5dbf0f4e3109c9db33c8c3269ba1f62d4a2d53a45977e1271dbc189bfcc1d4ef
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-sqs@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-sqs@npm:3.299.0"
+  version: 3.312.0
+  resolution: "@aws-sdk/client-sqs@npm:3.312.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/client-sts": 3.299.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/credential-provider-node": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/md5-js": 3.296.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-sdk-sqs": 3.296.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-signing": 3.299.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/client-sts": 3.312.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/credential-provider-node": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/md5-js": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-sdk-sqs": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-signing": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     fast-xml-parser: 4.1.2
     tslib: ^2.5.0
-  checksum: a9e40735cfbef7beea646aa1047b0e629006b882b42bea61b129df415521ae5cb2e93c823d0117fb0deb38f43d7c239d4147e9268f3b78f7fd74c33634f8e7cf
+  checksum: 0cc2c0cb6b835d5dd29ff0f146fd4f7d4d7501ebdd419144a704a6092a029e774f580a6dcb6e668779fe86c589b6df884ef09f1866d3d28abbeb1787fe7eb58e
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso-oidc@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.299.0"
+"@aws-sdk/client-sso-oidc@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/client-sso-oidc@npm:3.310.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 67ab9a7a85cd6802e3247baa0932dbad6a385075975ba6ee939115fa9531ddb2c38a0829dff6def2a62e1d868a6f6bf340e2ba494c075128fafcc851ad352ab6
+  checksum: 7e4a013983978a02e390b621d76716c1649eb7b8889ad239f082b737ef204182879c4ab735a702ebd9c9a5a406c1fefd16c53d7f327db2cbaea88ebbf9bc6123
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-sso@npm:3.299.0"
+"@aws-sdk/client-sso@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/client-sso@npm:3.310.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: e83a26facdf0f08677f883df4e382654db6850a71a370c7f60afba1c00ecf7aac315477fcfc571e7300dd016804445d416fce3edd14966aa1b366e662a3697be
+  checksum: 5d7461e2102634c336e3748f91f51e9e53c8dc2fa50441535fad8f6926f368131224935b958b05a071d9c61357adfc8db885ac2adb5be9cee94243cecc3454d3
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sts@npm:3.299.0, @aws-sdk/client-sts@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/client-sts@npm:3.299.0"
+"@aws-sdk/client-sts@npm:3.312.0, @aws-sdk/client-sts@npm:^3.208.0":
+  version: 3.312.0
+  resolution: "@aws-sdk/client-sts@npm:3.312.0"
   dependencies:
     "@aws-crypto/sha256-browser": 3.0.0
     "@aws-crypto/sha256-js": 3.0.0
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/credential-provider-node": 3.299.0
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/hash-node": 3.296.0
-    "@aws-sdk/invalid-dependency": 3.296.0
-    "@aws-sdk/middleware-content-length": 3.296.0
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/middleware-host-header": 3.296.0
-    "@aws-sdk/middleware-logger": 3.296.0
-    "@aws-sdk/middleware-recursion-detection": 3.296.0
-    "@aws-sdk/middleware-retry": 3.296.0
-    "@aws-sdk/middleware-sdk-sts": 3.299.0
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/middleware-signing": 3.299.0
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/middleware-user-agent": 3.299.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/smithy-client": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-body-length-browser": 3.295.0
-    "@aws-sdk/util-body-length-node": 3.295.0
-    "@aws-sdk/util-defaults-mode-browser": 3.296.0
-    "@aws-sdk/util-defaults-mode-node": 3.299.0
-    "@aws-sdk/util-endpoints": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
-    "@aws-sdk/util-user-agent-browser": 3.299.0
-    "@aws-sdk/util-user-agent-node": 3.299.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/credential-provider-node": 3.310.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/hash-node": 3.310.0
+    "@aws-sdk/invalid-dependency": 3.310.0
+    "@aws-sdk/middleware-content-length": 3.310.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/middleware-host-header": 3.310.0
+    "@aws-sdk/middleware-logger": 3.310.0
+    "@aws-sdk/middleware-recursion-detection": 3.310.0
+    "@aws-sdk/middleware-retry": 3.310.0
+    "@aws-sdk/middleware-sdk-sts": 3.310.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/middleware-signing": 3.310.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/middleware-user-agent": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-body-length-browser": 3.310.0
+    "@aws-sdk/util-body-length-node": 3.310.0
+    "@aws-sdk/util-defaults-mode-browser": 3.310.0
+    "@aws-sdk/util-defaults-mode-node": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
+    "@aws-sdk/util-user-agent-browser": 3.310.0
+    "@aws-sdk/util-user-agent-node": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     fast-xml-parser: 4.1.2
     tslib: ^2.5.0
-  checksum: 4a9160e0e79a3f5d39646d56dbd9a0cb52063164df42e88640019ca74e88e49f7c36ddb98beae537051eb0798d912e283262657bdf420c6640ed04783f2d3d72
+  checksum: ad0b444605cbb53caf7ef2c637a79923adeca133d8fc74ee45208828bc8546ae69a2738ce77f6aae376c53d41e2f59ec7703d4a3c364066cacef06427a746e8c
   languageName: node
   linkType: hard
 
-"@aws-sdk/config-resolver@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/config-resolver@npm:3.299.0"
+"@aws-sdk/config-resolver@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/config-resolver@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-config-provider": 3.295.0
-    "@aws-sdk/util-middleware": 3.296.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-config-provider": 3.310.0
+    "@aws-sdk/util-middleware": 3.310.0
     tslib: ^2.5.0
-  checksum: 2fc2bd424a3b24cabf1df549b6102a47657ddf77f6d81cf2d477fd7eec407071febc5ec5e21384903104526b753c71777106c24dfdfd055e2b8cd810d7d50730
+  checksum: ec80bc867304344d04b6d6bbf369234e7d296540ffb988c3f29bf96ea5e3ac959f86a699c8eecef3fea87491fd413aaed3137e4f7a89544cceedf09cce1c9a15
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-cognito-identity@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.299.0"
+"@aws-sdk/credential-provider-cognito-identity@npm:3.312.0":
+  version: 3.312.0
+  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.312.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.299.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/client-cognito-identity": 3.312.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 03a1719599fa72cd42677a6b59cdb22285b0b27353489c9b04ddafc0a61d3cdd2206f90e456c2e162fb8b85f7d8214f25b774368624fa087dcd42f6ef187c8e6
+  checksum: 4acd9f7bbd8cb9adabbd9b6465fe81f7bd47d5808b3a5fd3352e4e573a8ff718e56684e67631649f72d01078dc858278de1b5c227b8557d948d4c43abde99561
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-env@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/credential-provider-env@npm:3.296.0"
+"@aws-sdk/credential-provider-env@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-env@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 2695b2431f68a0faea47e41bef6ad38a5ccaa48a85729b7b533af63daa30e0645e9aee6d138abfbb2175c361b2afdf6a8acb6bd19a6cc7c2648d7c6a1ca84917
+  checksum: 646e634e6f8429c1984475100a60066dd5d0c085b3e170dc0c05c55c824edb3b04d4c40496ab4318e9586b9ca1db0b20090d26919b0273351c82372a12cd9958
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-imds@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/credential-provider-imds@npm:3.296.0"
+"@aws-sdk/credential-provider-imds@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-imds@npm:3.310.0"
   dependencies:
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
     tslib: ^2.5.0
-  checksum: 02e3e5b45816a7907c48a79db209c7c3a3158908dd8beac2bf20c097d6d246d3cc89d3058c11ba2d774afc37b3cf1f83d93936644179e75f5bbc9484e853c747
+  checksum: 24915e2f108e37bef21b9bec07f7ab38f25bf3ed55c55ad318ae8e030e042123980855b977c13714580232d2c0a514e71efd61848e68c221716c2110c160ab13
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-ini@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.299.0"
+"@aws-sdk/credential-provider-ini@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.310.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.296.0
-    "@aws-sdk/credential-provider-imds": 3.296.0
-    "@aws-sdk/credential-provider-process": 3.296.0
-    "@aws-sdk/credential-provider-sso": 3.299.0
-    "@aws-sdk/credential-provider-web-identity": 3.296.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/credential-provider-env": 3.310.0
+    "@aws-sdk/credential-provider-imds": 3.310.0
+    "@aws-sdk/credential-provider-process": 3.310.0
+    "@aws-sdk/credential-provider-sso": 3.310.0
+    "@aws-sdk/credential-provider-web-identity": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 2bb3b76ee7083cd861ac81bfd3f9e3f2a610277e23a4235503101d262d3ed9e4fd9f2fff079549f0b180e7383e0388c30f965e55eb107f90dc3b9aef69a51946
+  checksum: 9d0adc90a942680ccc1aa135b1d5b42a32a1db1aee0a1d1cfeac2f20347b28a5b8a33bb982eec9e2ff1204ffacfff3cc4b1065cdd11f035edcde4142ff3e3125
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.299.0, @aws-sdk/credential-provider-node@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.299.0"
+"@aws-sdk/credential-provider-node@npm:3.310.0, @aws-sdk/credential-provider-node@npm:^3.208.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.296.0
-    "@aws-sdk/credential-provider-imds": 3.296.0
-    "@aws-sdk/credential-provider-ini": 3.299.0
-    "@aws-sdk/credential-provider-process": 3.296.0
-    "@aws-sdk/credential-provider-sso": 3.299.0
-    "@aws-sdk/credential-provider-web-identity": 3.296.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/credential-provider-env": 3.310.0
+    "@aws-sdk/credential-provider-imds": 3.310.0
+    "@aws-sdk/credential-provider-ini": 3.310.0
+    "@aws-sdk/credential-provider-process": 3.310.0
+    "@aws-sdk/credential-provider-sso": 3.310.0
+    "@aws-sdk/credential-provider-web-identity": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: e622fe0c550cdfc6df247591becfdb747c6a0aecc1142f954a728f72677a00391302b90ee90b019861093d2c79050ba4bc038430235c56a0f5bb8f131865a4ca
+  checksum: 893aacd840a69363e11cbfb50c915aa3f515f40d6f5a93018f2fd1d7775af40d2a2fd083422aabc817f433e0f89fe5cdaaea7059b0ec59e8f38c78c97b35995a
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/credential-provider-process@npm:3.296.0"
+"@aws-sdk/credential-provider-process@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-process@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 5b29c587806b8a611d3843bd3236061c9a4fd6ce2d4a461c94ff14bd6d4b3193323398d2a0380036be96f4e589d2e46f92f5af7c40da7bdd935444d7ebe009d3
+  checksum: 12c4ab1f34d5a045d56ca22bc6c834292da15d518129133babcbede056adb46f4e898489e1b54e7e5ee3472d1116882217f5a29af0a46cc40d2f3aa00ef6767f
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.299.0"
+"@aws-sdk/credential-provider-sso@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.310.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.299.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/token-providers": 3.299.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/client-sso": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/token-providers": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b837ea99a623f0d7e427db70160dcc1ac4c0c6e497ec4b4dadc9fdd16aa6fc0a0434998b48af50e3490be3c591c5fe7601a4b70e71b03118ce45d38cb22dd846
+  checksum: 595c3f393430e1c9ddb0b276b605e87a8a6d461fe5d7bfa7e9b033fd06f3d5bcb1f4fe6b74e7eb5fa38d1d88181f8be5398bb3c1a53ae18caada9a59eed1ba21
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.296.0"
+"@aws-sdk/credential-provider-web-identity@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 35fadfbc623cb47eae1b189a6384ae545d4a5d203c70a12e57bb236c645d61d31dd3ffaafc323d878cde6061ec5be5c285c34b3296e7c4a8992c479b4485518a
+  checksum: 62dd9362bb48e010cb84dfcb92461478b2d1fa830e47e078a9bd074999eb231b0ef4e273e585fce5ed0135768b90bafcbe9ca5df83fc6c0bc5d227ec74271a82
   languageName: node
   linkType: hard
 
 "@aws-sdk/credential-providers@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/credential-providers@npm:3.299.0"
+  version: 3.312.0
+  resolution: "@aws-sdk/credential-providers@npm:3.312.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.299.0
-    "@aws-sdk/client-sso": 3.299.0
-    "@aws-sdk/client-sts": 3.299.0
-    "@aws-sdk/credential-provider-cognito-identity": 3.299.0
-    "@aws-sdk/credential-provider-env": 3.296.0
-    "@aws-sdk/credential-provider-imds": 3.296.0
-    "@aws-sdk/credential-provider-ini": 3.299.0
-    "@aws-sdk/credential-provider-node": 3.299.0
-    "@aws-sdk/credential-provider-process": 3.296.0
-    "@aws-sdk/credential-provider-sso": 3.299.0
-    "@aws-sdk/credential-provider-web-identity": 3.296.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/client-cognito-identity": 3.312.0
+    "@aws-sdk/client-sso": 3.310.0
+    "@aws-sdk/client-sts": 3.312.0
+    "@aws-sdk/credential-provider-cognito-identity": 3.312.0
+    "@aws-sdk/credential-provider-env": 3.310.0
+    "@aws-sdk/credential-provider-imds": 3.310.0
+    "@aws-sdk/credential-provider-ini": 3.310.0
+    "@aws-sdk/credential-provider-node": 3.310.0
+    "@aws-sdk/credential-provider-process": 3.310.0
+    "@aws-sdk/credential-provider-sso": 3.310.0
+    "@aws-sdk/credential-provider-web-identity": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 0c1f49d6e057925f13a1a7028bb4fee124a1ec08d16fe5616aa7272007d8a9e70cd292726628a95d17a7d7099c91b88d94712faa2751da34bebee574f6e2ee4d
+  checksum: d47501b81e3f37c50110a12f58491407c95bebfa341ed80040aeefab236a3496dc33100da244e1e4467d2e2d62be19faec04f2e52a236a5c5ec2e1feeb12ceee
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-codec@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/eventstream-codec@npm:3.296.0"
+"@aws-sdk/eventstream-codec@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/eventstream-codec@npm:3.310.0"
   dependencies:
     "@aws-crypto/crc32": 3.0.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-hex-encoding": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-hex-encoding": 3.310.0
     tslib: ^2.5.0
-  checksum: 474fa95fa6cc2e6730d0931337d288e469de270ca53887a5acf4b18c9a11c4149fee491847dd4904757597c1446d0f52b38a61a3c2afd66970dc89acb182d278
+  checksum: 2866186a5303bb8b9151ea69f22bace420317c4ec3b5c9aa0beb9bd007aca419a519be2d911b8119ddfd1c0a8358cc9e0f957ca3a460b3009846e0e5517a8f7a
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-browser@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/eventstream-serde-browser@npm:3.296.0"
+"@aws-sdk/eventstream-serde-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/eventstream-serde-browser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/eventstream-serde-universal": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/eventstream-serde-universal": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 2c6e203c35d8725809a827830bdc66699f7b78915aa39dbc9df6895edba63715f6039dbd4b72fe2f39e3c60eca48aeeccb193c0fbcdc9c5b09890adb7e6b7c8b
+  checksum: 10a8dc5999c3f8f683ef399c8866d274232e235bf526c481da2527c24e23836e362c647c92103dcabdf52107b8fd0c46ae8e9f8d2f79741f198022cd94b150f1
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-config-resolver@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.296.0"
+"@aws-sdk/eventstream-serde-config-resolver@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: f0297397078e4d7e9f116e070c62c90ad2650f26c47cb75beaff045cffef9a51a5005c94292b7ffdf62ff867b57ee11253d8da6ab1fbe3ace26193d9c85bcb5a
+  checksum: 9ad39115d8bd163fe441fa8128e102c1e6157890c7731d7ab797b63a636f378f30a2695adcf41b58f52b6bfd71b68c2bafe51d1cf4f984b124746341d13ced6b
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-node@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/eventstream-serde-node@npm:3.299.0"
+"@aws-sdk/eventstream-serde-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/eventstream-serde-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/eventstream-serde-universal": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/eventstream-serde-universal": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b570a1b9310b56ed0f81c2bb682676c0754d82af946a6187905198244e530da370150ada6dd04c2a5bcd0c196654db9013ed9f5da81245968b98974523b32818
+  checksum: 1a695e39e5bbd4088d5790c8b4389dd635b7f6300892868d35e8711ef7ea5c1f2f50886c9ac55de5eae9619c49fe864c6e530e575a06231300294211a36827b3
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-universal@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/eventstream-serde-universal@npm:3.296.0"
+"@aws-sdk/eventstream-serde-universal@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/eventstream-serde-universal@npm:3.310.0"
   dependencies:
-    "@aws-sdk/eventstream-codec": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/eventstream-codec": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 9e9068bd9dae4fda72fc073f36960b9e892d2abc5459e853c643a8b69e813f75443a8350834fd38e9c368106f58f09beb105c0d8c3e401eb90c2ea40b3557e4f
+  checksum: 10ce20184cdfd826600f610418e07add4e70073470cf23a5b3b8b4ea479ab096eb70c6eeb9e87bcd30e040270b3c0519fe187aad3363c85bc357a048014a8de4
   languageName: node
   linkType: hard
 
-"@aws-sdk/fetch-http-handler@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/fetch-http-handler@npm:3.296.0"
+"@aws-sdk/fetch-http-handler@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/fetch-http-handler@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/querystring-builder": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/querystring-builder": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
     tslib: ^2.5.0
-  checksum: cc57acffff2a1dd96ed752a21f76d35f6c597a09ad2a7d5be5b03dba93386a1c3cfaf6c3c5f41b33e9734005424444892f4a173e58ce06dcf6e78421fb7b511b
+  checksum: 5daa78ee3e2a0a6bd07c3b8bc658ebd88a063b17025ec23454c2eb433859972d60a550fdc62969754488c3f4d624fbf3e758af8ea891c994998deca0f8e3903e
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-blob-browser@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/hash-blob-browser@npm:3.299.0"
+"@aws-sdk/hash-blob-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/hash-blob-browser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/chunked-blob-reader": 3.295.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/chunked-blob-reader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: a21e6cc2f64b925e3283af0d878c6fea4621b66b77809d85612708f54df3000db52966c70fd981b761e59216e6ddb66c57b66706d8f027b7b2d8fab2e08971be
+  checksum: 58908f51a89f61b5c0ed036beeda58d7e54d1385ca56447c057569671b110be0dad2bec4618daa35a8170c8b3e0e193bd473f695d0be269ec2dd06915bcaa9b9
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-node@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/hash-node@npm:3.296.0"
+"@aws-sdk/hash-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/hash-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-buffer-from": 3.295.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-buffer-from": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 728680b1bc04764dc710003e6b967e176d65ba46c03e53ffebf25f7d87bad2354203e1c1e754ef6b6bcebbc3bde725aac6a1e00cb47118f78419cefed13b5724
+  checksum: 379c04c78679d68730272b89fa397cdfcd444ae2f21d7dc51953e9885842469de40593efbb86b2399342e022b2ba17926841ef0a9fb108809296b2df416226c1
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-stream-node@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/hash-stream-node@npm:3.296.0"
+"@aws-sdk/hash-stream-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/hash-stream-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 3dec341abc783f333e2536dea9191b9e732ad40eecd76cc863eaa455a91e8d184466732fb8fd9652afe83630a9da2cb5073b76360d8f45ecc4a8244ed38c9ef3
+  checksum: 42fe6f8eddd67565019d935b109e9f3acf0eacfd940712859e718db8f1ca4550c305f0fc4dad9944624ea10e0ff7e15f895d13cce0cdcf5c614d3bff39263ecf
   languageName: node
   linkType: hard
 
-"@aws-sdk/invalid-dependency@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/invalid-dependency@npm:3.296.0"
+"@aws-sdk/invalid-dependency@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/invalid-dependency@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 5dc57b4396cbde9f594f14dc2a38e0c12e8cca4557b8e78fb5d23e1429e6dfef0b5ed1382da84862bb19abeaf39b92bc4dc7cba7c7a04dbc212cb6971f0553b0
+  checksum: e38d09615e273617583e845b2cd3683c9d27d54234a98bec7da1cf959107329f73e62b322479415155016ed62c7d849cd6542d6e9e33572f6ed542013c15821c
   languageName: node
   linkType: hard
 
-"@aws-sdk/is-array-buffer@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/is-array-buffer@npm:3.295.0"
+"@aws-sdk/is-array-buffer@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/is-array-buffer@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 23de81a3ab63a51ae61183792db4a9faf74f02c7c9cb5cfa6d4b36781d7832070090bb406dc8591dd74a07fa3d3c27bac11d7a931e75163f8e018987a995f3ce
+  checksum: ddd1536ad16e29186fb5055bc279cfe9790b7c32552e1ee21e31d4e410e1df297b06c94c6117f854ec368d29e60a231dd8cc77e5b604a6260e7602876fd047f8
   languageName: node
   linkType: hard
 
 "@aws-sdk/lib-storage@npm:^3.208.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/lib-storage@npm:3.299.0"
+  version: 3.312.0
+  resolution: "@aws-sdk/lib-storage@npm:3.312.0"
   dependencies:
-    "@aws-sdk/middleware-endpoint": 3.299.0
-    "@aws-sdk/smithy-client": 3.296.0
+    "@aws-sdk/middleware-endpoint": 3.310.0
+    "@aws-sdk/smithy-client": 3.310.0
     buffer: 5.6.0
     events: 3.3.0
     stream-browserify: 3.0.0
@@ -1059,488 +1101,488 @@ __metadata:
   peerDependencies:
     "@aws-sdk/abort-controller": ^3.0.0
     "@aws-sdk/client-s3": ^3.0.0
-  checksum: bbf180386c03ac4fb78c65c7b476dbb6bb5c81a4d8013e8c216710b6654642e89d4cd6dc8fe3383b42c285c098ca8f325199b58efdc13b5278ed6ce011b28331
+  checksum: ce09963885a749e6347ffe8d2ea94e2572629f31041f7859f71d98436ff863822862c13c2c465af5a11aacc3193d0c599f19d455b8251ebcbe95fc44eba1cd0e
   languageName: node
   linkType: hard
 
-"@aws-sdk/md5-js@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/md5-js@npm:3.296.0"
+"@aws-sdk/md5-js@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/md5-js@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 88d08cbf13af32c1c95c99727e8024c691c3fc2ff940394513a93524701a091385778bd5829a561991a7e145bf509c3e5e750803f352281df34d7a46d0147c51
+  checksum: 1939591f5f384e55ce9d610cbf3e8ae25e76c14489385ef73ee0c674b641351820d17e2406943e2b3ee4a3736d280256f2b79bb381e18e78440faf74d4ca04cf
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.299.0"
+"@aws-sdk/middleware-bucket-endpoint@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-arn-parser": 3.295.0
-    "@aws-sdk/util-config-provider": 3.295.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-arn-parser": 3.310.0
+    "@aws-sdk/util-config-provider": 3.310.0
     tslib: ^2.5.0
-  checksum: ed6bddb44c9e7212cea418cbc0ff0541f4d303722133708092dd25b08979b5cb3730f96b5ba1172604fc3274dcbcc84af9d96b511f499642aa191f00f9b5d0e5
+  checksum: cf300c0226a649bdd7128c5c44ff03bac58119390c8bf82a712094e95c2df4c0b1693a74256968294d8ad397828fb2f7d5f0d9355c08d1d67a24888255d6dfd2
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-content-length@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-content-length@npm:3.296.0"
+"@aws-sdk/middleware-content-length@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-content-length@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 649c0d3f0c1ec607ea9558df09f318bffc763f66501263136791571206c148ca7ca691cb3211fe18bd09aacdc69545fdc5ffff4daeac73323864b5cb76b5c072
+  checksum: 66977eac6aa9ce0d7c5640e357608b79eec18919d4e94c37aacf76801ac1b24471a3483755d1ab30a416aa2aa10c9da02fb6241f11e29ea99079ff04bdf012b1
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-endpoint@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/middleware-endpoint@npm:3.299.0"
+"@aws-sdk/middleware-endpoint@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-endpoint@npm:3.310.0"
   dependencies:
-    "@aws-sdk/middleware-serde": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/url-parser": 3.296.0
-    "@aws-sdk/util-middleware": 3.296.0
+    "@aws-sdk/middleware-serde": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/url-parser": 3.310.0
+    "@aws-sdk/util-middleware": 3.310.0
     tslib: ^2.5.0
-  checksum: 7e8c6a85575019871c87dc5c1b19c47999bd5ae3fc2546b72e3e617bf8bdea1392fb385e25a51f382b37d01d171de51dfaf2f53b79fb09adc10049ee571fbc13
+  checksum: 7d61ceaff3fb6be779f9b0597fceccbc1d5ebbc83b83d93ac184fc6451e60b4acca9eebb0c83c9e1c6b34400bd39345b498227860892ed51eda2b99f16ff0566
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.296.0"
+"@aws-sdk/middleware-expect-continue@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-expect-continue@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 8ccebf2f5d351c6495e5699016e7c132c8c9f19fa272910d443e63df5fbd7ba84da1b31cd56cf6a0e1756f89970e90b199e45ef52f551e11e4b2593983889708
+  checksum: 717eb502c00bc5b32cbb210657b0cfdec837f5296f86043bce40f43535f345e689639b017c71271709bdee0a58cc4ade6324ae0bcccfcdc0789e8699b2ce9f76
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.296.0"
+"@aws-sdk/middleware-flexible-checksums@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.310.0"
   dependencies:
     "@aws-crypto/crc32": 3.0.0
     "@aws-crypto/crc32c": 3.0.0
-    "@aws-sdk/is-array-buffer": 3.295.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/is-array-buffer": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 9191bf0b950699dd4eef575cdda598d54bdf90633bd683f0103aa9b9c44090190c7316b59619748803e0ec926444cf376ce89dc055d1675e3671bf108865c3a5
+  checksum: be99290968c5e00053dd2e43683d77cd08dbe1acff64189e522d9e4aa1440c8e6ae86d784ef4d163a059f725b52fdd5812b54594d70a9773c25feef24e63c9c3
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-host-header@npm:3.296.0"
+"@aws-sdk/middleware-host-header@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-host-header@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 8b5b2b26b204bcc8587cbd659a052b896c4d76dd1633e99d7c035b7b779d2b90beff4878481b8b5b28deeb363bf276584f371a5f7c88cecda43a18c5ae1ab7aa
+  checksum: 9b1bf8598f9bf44a0cd992f08820ce54fb7ce5f33366796b7328a003c2efc00754a3e0bfd56be87b221ca0f15b4c00f5caf736bf196cb9a4b3ca26dfd3e7f7db
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.296.0"
+"@aws-sdk/middleware-location-constraint@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-location-constraint@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 00378f43d08abe45d85c386c2c4acd5b80c16158d94f61341da85ba979731b5ce4c6ecaf706d3356b680a459fa8c26119845997a1e3d5bd24adb3ae98e945d3e
+  checksum: 2ca1a7d9ca47c29468c4286731f0a1dc15e0233f0a59bc1dad3f3ed5917b1e5d7b344c705660cc3afdecb153f2e2f203e9ae37eb018d6a56aaeba7ad05ebd466
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-logger@npm:3.296.0"
+"@aws-sdk/middleware-logger@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-logger@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: c006c03d24e26bbc1f9089987a0987b7627e1f7e1a5215d75e7132d2905f77f867d78806b968bee6e6830ddb94ddae8c1cead785b3fe4762e66da10584218ca9
+  checksum: 13014451afaadf11524754f959aaa4c4e7763442dedef841d693159370720e40d20a6113851b87b6cab6c709d92b1e952adede0ec9948dbaa1546dbff1e477d0
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.296.0"
+"@aws-sdk/middleware-recursion-detection@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 2d8b8e130b6410e95340bca961e966c36f54154041aba3b0a308b0b6786cea36e026f28b910ac13411f333e445dbcc122801366bb55f64fab5cd76e05bb70257
+  checksum: a5db6bec59a5232ebc28296d165d09fb94d74e9232d32f49f77bccbbae62cda58215d2f8a17979f1714b9dd07c25a989caae8bc7eee1f57c57d67328788fa401
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-retry@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-retry@npm:3.296.0"
+"@aws-sdk/middleware-retry@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-retry@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/service-error-classification": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-middleware": 3.296.0
-    "@aws-sdk/util-retry": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/service-error-classification": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-middleware": 3.310.0
+    "@aws-sdk/util-retry": 3.310.0
     tslib: ^2.5.0
     uuid: ^8.3.2
-  checksum: 9672f0654606581e27a2f79b4ff2436539f115700319cd1b1e8373a3eb54f1f95820a38fe2ed4da04c7a8d09e8962e3e7412d2fc9835f4d165c02b2ac2d3138d
+  checksum: 7d69c187d4cfad62df01b445596f812157e4028b377f34c40f6b272df3660a48ebbc6a0c86eba98b1b19454ade6be7b1459c62ffe8a1924725a23e330d2814b7
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.296.0"
+"@aws-sdk/middleware-sdk-s3@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-arn-parser": 3.295.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-arn-parser": 3.310.0
     tslib: ^2.5.0
-  checksum: f8be243d930d887c1f4dd3d850a382bcf0e90a5fec645fa357ebfd38bebba33428997927b2411a07c097cba50347b989b366b43d372553cf7b20a64740427ddc
+  checksum: b546560c2fc3fcbb37d38b5d02e3f8349592d66a6a2ef4571b72d0bb6c398d0c2bb7008665d58541efc577372f2e1aae88ea1318ba0fe8613583397604dff02e
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sqs@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.296.0"
+"@aws-sdk/middleware-sdk-sqs@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-hex-encoding": 3.295.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-hex-encoding": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 5a62ebf80bee110bde2b0c5da271c24db5af484bf50ade8cac2211e2acb3bc0566fdda1bd885110fe463cfa18c53b464af12f0d3c297201e1ba7f2275f0fd10a
+  checksum: b8207b1625e52d02b3a3f28153e84f3a9c44bc9812ceb0ca1da798aa9fe576b9aef26c2da10dd6c8742c64e734eec93fd5123d769079b99a19bd105599fe11e5
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sts@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.299.0"
+"@aws-sdk/middleware-sdk-sts@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.310.0"
   dependencies:
-    "@aws-sdk/middleware-signing": 3.299.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/middleware-signing": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b1e2b28d29d924bbe176203c9a0abbe05a48748845da970a5aa61723b5ad118d50b3790baf63cecb69db63b89dc6e4abca218f14ce258bce87858acf339696de
+  checksum: 80debd2f2371f65f7c37f2f0101e9e8ac520ef74d6a8ba54fedfbad6d63653732f7ce6095bae7bf3adbfec61bfa4d9f816b8eb5550cdadec825b400cf74bb2ce
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-serde@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-serde@npm:3.296.0"
+"@aws-sdk/middleware-serde@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-serde@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 337bf9c4a621d6ef3a5c5d16273633f098e12e3581e08a9543d48e3a63ba6b70472f26f4e4e46040ed43fc1a498f8f046b66c28fc629f4a3a74b6a331609fd52
+  checksum: 95c2c1b15906a93c9869be36563757f08cd53a0f385882759943e59a1fd31be777260fb075feaa1a9bb919cf1696739e7b2da89049cec0bee1a649a838f9184c
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-signing@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/middleware-signing@npm:3.299.0"
+"@aws-sdk/middleware-signing@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-signing@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/signature-v4": 3.299.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-middleware": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/signature-v4": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-middleware": 3.310.0
     tslib: ^2.5.0
-  checksum: 4eaa0a3b51eefa0f5e839a55ffa98f7cc79644fb7e8e3a3fbbdc4de2e2d10fb07cbd5201f44464a5550462af5efe47977feb6f057e6bd2160eed0904cd9d1752
+  checksum: f1db11435250075fc563de375c8c513dbaba7b9939ae99c70074d90622f9aea0cc339cd10f0eff63251eba462b73f564389bfb9dcfe6868f36892488dea0494b
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-ssec@npm:3.296.0"
+"@aws-sdk/middleware-ssec@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-ssec@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 37795d8094ee6209d76ef7423eb967c1ab1330ca5242c176230972004b36cdeda1328e9ed8626c33f16d1eff7df7a9d0d90df9ad298fad4d22a1ba81bde4d91e
+  checksum: a6d9cde8d826c4baae7908e82035e892f8b4706e648efa1ff5a8706285efabd17f9fe8d48b5b0fb42b17f227fba257b7d95b99baf9e152246cb95a2fe23a547f
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-stack@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/middleware-stack@npm:3.296.0"
+"@aws-sdk/middleware-stack@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-stack@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 1fb787c066aa48612e0f7ddd4932c3a9fbfd37eef5838bd83c06bd113d11af76f098e2b09a431ab039fb3f3628b1b80bdaca1200a10d9ec9cde56134e40b6995
+  checksum: ad90bb8cf2a8e3211869ed0c08e240e0df7097ff42a9bbfa6dd96ad79a8b741c096199082f1be40a2ae2b1fbeb56a4bc510cdaf431dd90a5db73e32fe7184ee2
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.299.0"
+"@aws-sdk/middleware-user-agent@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/middleware-user-agent@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-endpoints": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-endpoints": 3.310.0
     tslib: ^2.5.0
-  checksum: 7ae91b41d2a9ab6d016e749458c30eb99f7fc1b11093410e6e2b0f0258aba8269fd5e22a980eb54bcbf8456679bf65c7e76fbf5bb145a13ff7d31398a82821ae
+  checksum: 571ebfce481a2d814270248e728c68030661cb3f0de97908b73e1d446c508d5af06cb088c68c67b23ce9671873c1872ab681b9383d48797b5a1c53a7030085ff
   languageName: node
   linkType: hard
 
-"@aws-sdk/node-config-provider@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/node-config-provider@npm:3.296.0"
+"@aws-sdk/node-config-provider@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/node-config-provider@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 367dc07dffc8673d4c197773a023b79cbfb5dbd36ed02aeaa63ccd1a801e88164c2a042aadc51344198af3a6919db1d56302ce5e14ff8eaa7b9cf708bbbac2d9
+  checksum: 95d017aa1bb94e323c288bc0ce5edba5c4605eeabe779249beb5faee958c26f6eebb7f1664328b83d1024e441eb4e4f9fce9c1bb764637f83f7ebf20b8359a77
   languageName: node
   linkType: hard
 
-"@aws-sdk/node-http-handler@npm:3.296.0, @aws-sdk/node-http-handler@npm:^3.208.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/node-http-handler@npm:3.296.0"
+"@aws-sdk/node-http-handler@npm:3.310.0, @aws-sdk/node-http-handler@npm:^3.208.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/node-http-handler@npm:3.310.0"
   dependencies:
-    "@aws-sdk/abort-controller": 3.296.0
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/querystring-builder": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/abort-controller": 3.310.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/querystring-builder": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 8766f46047f1667363a34433c9a867b4e5b27b400252418df2d5b110b6f85ff46a8aeff8b96132f7b39fc2bafa54fb1ae0e0fe44da84c8222349cea05cc7cc38
+  checksum: 781cc864972bf52f884b580e43b9b659ab34a6ca7d7772d8e76107a51fe0930124c01024bc7ac1c4e99324319c594b809373ebc4752ea0a2e3a984ccf57aa535
   languageName: node
   linkType: hard
 
-"@aws-sdk/property-provider@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/property-provider@npm:3.296.0"
+"@aws-sdk/property-provider@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/property-provider@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b456e82002c8302b2ebe328446346381c6d34b63d64f797ffd5b24d9f5cb0d739127d21657587c76a351fa6f56f43585d66020df370ae64f7cd9718c26175fff
+  checksum: 8a906b3f4e482f4d5be0ef1277fcb22fb005e834c916919373187f8cf6b17b0d464f37a12770d152a553b7a505ed9981504a0c30f73f273d251ed93ff29616e1
   languageName: node
   linkType: hard
 
-"@aws-sdk/protocol-http@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/protocol-http@npm:3.296.0"
+"@aws-sdk/protocol-http@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/protocol-http@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b283a1e6b6a6ba544bf833929d19f988747a451a1e1232f440b9412918932d099f29c0459dd398163b7f7bbae4c372166cc36a5e5afc1343d3085884e36879bc
+  checksum: 4bfe2b7a93d52ded21472d6347483fb52dfd2414d4ff07d8e3a2869d7676e866a9bfa29e9e7ac4fa3849c7109740a39e3d1e646a02d8bb4b7c7b402f53b18450
   languageName: node
   linkType: hard
 
-"@aws-sdk/querystring-builder@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/querystring-builder@npm:3.296.0"
+"@aws-sdk/querystring-builder@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/querystring-builder@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-uri-escape": 3.295.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-uri-escape": 3.310.0
     tslib: ^2.5.0
-  checksum: 54028a5087126cdf48cf7abf4cc12c5d761c30aa97b23bab001ae387179cd95974a9332aacc6a74936f3ce818067ded67383231d5839b0456c5ed326bcaeeac5
+  checksum: c06ba9ec67d6e6a5f4c1099461b9b2d6cb12a278e6ec2fe198f68ba115ce1e05425f29cf6859f8a005ae7123036b6dadc325d18b35165c7049233f9d04670dcb
   languageName: node
   linkType: hard
 
-"@aws-sdk/querystring-parser@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/querystring-parser@npm:3.296.0"
+"@aws-sdk/querystring-parser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/querystring-parser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: b60b003302b4823609f9f585acdc3b7e48444aeaaf941549626066a6a74579201b473cdaa0ab1d59e63c4c8eec5bc9380464ccfeca47077ec4b5bc20fea4b190
+  checksum: 5e9d8700918db3daa89440f7c0aa9d0ee37e30bab13892f12602267259160ff73eaccd7e01521bf71f4a0f59da9cb632f75e583d927900f2acddc4913e3422f8
   languageName: node
   linkType: hard
 
-"@aws-sdk/service-error-classification@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/service-error-classification@npm:3.296.0"
-  checksum: f4f53591c636971bb2766340137a4816619c8ede0955dff37f795f03a0ed18534042f3ab9ec898d9f3fba98309322854b7442caeb919590f241ac21b3b18de74
+"@aws-sdk/service-error-classification@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/service-error-classification@npm:3.310.0"
+  checksum: a600a7634fe932b52676ea33851230173ce66b45f4c8350c91616e37f9cbd43e8f6e7e3fc9761fd14ca7ecd2c7ca90ca806fc555e383d0bf0ee2bdb6a4d73888
   languageName: node
   linkType: hard
 
-"@aws-sdk/shared-ini-file-loader@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/shared-ini-file-loader@npm:3.296.0"
+"@aws-sdk/shared-ini-file-loader@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/shared-ini-file-loader@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: a9e505957eefaedfa1c4ad09eea3d7bc5e4fab65ea40df4e46a1a2db6e461a63d4fc53c801be5d5bb189c634b157262154bf8840bacc02ecf0ffeaa10fb8b2b3
+  checksum: aa3ffb5cb4320ee936102be200dbacb95be0bd85088c692de268d56c175dd4329757a83847d1c4e689b98f3810f729596a1a0b726f1ea0a8d00c78516fc10cc3
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.299.0"
+"@aws-sdk/signature-v4-multi-region@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.310.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.296.0
-    "@aws-sdk/signature-v4": 3.299.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/protocol-http": 3.310.0
+    "@aws-sdk/signature-v4": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
   peerDependencies:
     "@aws-sdk/signature-v4-crt": ^3.118.0
   peerDependenciesMeta:
     "@aws-sdk/signature-v4-crt":
       optional: true
-  checksum: 6e1b20d4586ec02a30c272d978ddafc492cedee2e98853163f842e870cc3abe3ed4f4b9dd23bd8673841e0d64b58adc12fc5a21289ad6bcadf67e7d59bd1b400
+  checksum: ef88c3ba8dba0fda1204ec9358e46ea2bbefb0a258b21e2c83142b3ea9bb9be3eba428b38297da28bb4a5e93f9c27de8711aa6f219b3cbced4eba0c443c9b68a
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/signature-v4@npm:3.299.0"
+"@aws-sdk/signature-v4@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/signature-v4@npm:3.310.0"
   dependencies:
-    "@aws-sdk/is-array-buffer": 3.295.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-hex-encoding": 3.295.0
-    "@aws-sdk/util-middleware": 3.296.0
-    "@aws-sdk/util-uri-escape": 3.295.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/is-array-buffer": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-hex-encoding": 3.310.0
+    "@aws-sdk/util-middleware": 3.310.0
+    "@aws-sdk/util-uri-escape": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 642e49ef1cb87649a0fdceb82c55f5153f9d662d5429d49fb18601c3ff8c12a1b050d8856fb18c041511be9d4d38fa741628c23f4be508cb816be696446139cd
+  checksum: 0adaf05a005a8a468301f24482d25de3a35554debc98ab8eeb0444c529c02a63dc7e7754d990e9464e1a17c1eb1f6ffdcc178bcd7d35c87587e4cc41574c69b3
   languageName: node
   linkType: hard
 
-"@aws-sdk/smithy-client@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/smithy-client@npm:3.296.0"
+"@aws-sdk/smithy-client@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/smithy-client@npm:3.310.0"
   dependencies:
-    "@aws-sdk/middleware-stack": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/middleware-stack": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 8b7a626c1fd8b253f1f5b365c340626a9495aa6ba83d246be50f559d8274259daa6386f6931c9db41d3250ee3fd9d2d63646f4f0d7c2f793fed5aa7c87593676
+  checksum: a97b88e6ae3066abf136fe3d59ead258d459c4f37f69e6170a902d85194cb2d798519771b945880072776bbf0e77bfc18e15768dcbafc402f0f255d80bca0ba6
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/token-providers@npm:3.299.0"
+"@aws-sdk/token-providers@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/token-providers@npm:3.310.0"
   dependencies:
-    "@aws-sdk/client-sso-oidc": 3.299.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/shared-ini-file-loader": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/client-sso-oidc": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/shared-ini-file-loader": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 37fac12eead196c717385511344a0125871a2a1a745ce85fc7c2cf086023aeb19ce9cd0c5289ba425cb7df1182d346f8c6c50087467243850c879b3d74dc4a17
+  checksum: a38d5c562f0cc29ddcd6b52b8b4c872447824962055cdb77587fdc9e13e24e6a9acda1d7ea60e7b7e2dbfe8b27dc0ff03347e739b298099b7c1ebe67044ff8e1
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.296.0, @aws-sdk/types@npm:^3.208.0, @aws-sdk/types@npm:^3.222.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/types@npm:3.296.0"
+"@aws-sdk/types@npm:3.310.0, @aws-sdk/types@npm:^3.208.0, @aws-sdk/types@npm:^3.222.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/types@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 3cff062f8cb08cd5473c40076ca06f8d93c80fa11e64a7c2d8273fcc0107e709e08a669779f9e3e70d35b3ae7fc3abafd2885f74fa9f8ba57042e5167f72bd2a
+  checksum: b11a91899614e14d40081ceab39cd3702254a5658c7b5e8862ef0d66dbffaa41c9a0f0d31e415d22f31c791b507699ba3a5fc7d87a540273386eb779be3807e4
   languageName: node
   linkType: hard
 
-"@aws-sdk/url-parser@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/url-parser@npm:3.296.0"
+"@aws-sdk/url-parser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/url-parser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/querystring-parser": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/querystring-parser": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: eb76e25571d9d13f7a335f36dc5f7466a7d7e8a6e26a5a0ea2529cda36d0ad29d0d6c5d418ac8a81a53a480a57a1b8aced93a43a08060eb0fb8e4259ab2e5048
+  checksum: a9f5bec1cfa38cf2d244df1f6d7aad0f8e880a285d148678652ba14a3fb03fc0847defdc80a7e3ffb197d91e33d8cfb43325ee39f53c43c40ceb7fbd34f38fda
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-arn-parser@npm:3.295.0, @aws-sdk/util-arn-parser@npm:^3.208.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-arn-parser@npm:3.295.0"
+"@aws-sdk/util-arn-parser@npm:3.310.0, @aws-sdk/util-arn-parser@npm:^3.208.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-arn-parser@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 207dadcd23efc318bd9c028157a302999403749722b3b9cd4f2701cf2fd4c7b588bbcede45d949f583c4e41bb4e66ca7df923f9d4123574744497c961cd1c673
+  checksum: faac1e10f8bb6c2fe5fee82bcb7ce56c2b37ae9ffdb2b78b0746a7a06005eaa5ea747a0a10eaf490c1c4907ecc327e1c94a600e26a069e023e54b8d63c031e96
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-base64@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-base64@npm:3.295.0"
+"@aws-sdk/util-base64@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-base64@npm:3.310.0"
   dependencies:
-    "@aws-sdk/util-buffer-from": 3.295.0
+    "@aws-sdk/util-buffer-from": 3.310.0
     tslib: ^2.5.0
-  checksum: 047329e37dd6946f63b47ae415a988c32022b883b9fcf113120973b2d5e97679bc19f5183b264474f3201cb0560d3a4cb4b9d07d4d70b823945387e20869b41d
+  checksum: 3c9f7c818401fe8332d2ce438c0660cc9be7db9a5eef68d7fafa30ddcc44b0af3ba9ea58092f0e2b2537a18ec0942ce3c8f12090d3e3b9568b6a94a0713e9de7
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-body-length-browser@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-body-length-browser@npm:3.295.0"
+"@aws-sdk/util-body-length-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-body-length-browser@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 15100fa717f98a58475c934944108f98b811025039a04eeaaed71380bb2d4444fe44af7c527b74bb6ebd5a3ce277e28896d2e60ea73084f2b9e6cce6873b5592
+  checksum: c26136521ccbb59ba83ff29d6e52cb0e4b443b68e830c9dab578556539973573e6892093e5dea39101b1517c28b5d53c80ee38b9a01f9fa9fcd75f3aa5689857
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-body-length-node@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-body-length-node@npm:3.295.0"
+"@aws-sdk/util-body-length-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-body-length-node@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: e44fa83139d0e7e61152cce8f7709e772c920996fbd3ae4acc545df75ea3f7f28fd2959c97029411802b3e12277f775f3e2dbb34c797369635d0881bcf6b0a12
+  checksum: 202417ece7078f09f63c4119cb3ab5f321688ea893125f7d97985e8bf7fc61419d8d990f870d9ead3281dc51334975196ef98c50592eca1f9785472bd39b870d
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-buffer-from@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-buffer-from@npm:3.295.0"
+"@aws-sdk/util-buffer-from@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-buffer-from@npm:3.310.0"
   dependencies:
-    "@aws-sdk/is-array-buffer": 3.295.0
+    "@aws-sdk/is-array-buffer": 3.310.0
     tslib: ^2.5.0
-  checksum: c93e6f0cf66927230588365995d0e94ee874857dae6753529f44ebd7f2d9c1bc6e8fdef0a6459bd96f0c29a2fdc9eaa35145102d074249f4e8ff8bb070708f24
+  checksum: 9c3bd9c0664a0cbb5270eb285a662274bb9c46ae0d79e0275a85e74659a4b1f094bab900994780fd70dd0152dc6d2d33a8bc681d87f3911fa48eae9f6c3558d6
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-config-provider@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-config-provider@npm:3.295.0"
+"@aws-sdk/util-config-provider@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-config-provider@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 2b6cd2b118465a36c9908dfc330f9f107a0a67cbde2293101af8b3ca0cb2d9f29f76394261880535d62da74b10cf89c5433a2d4524272d5b8776ad8085b0489b
+  checksum: 958efc58ee492111ad746fe6224b25286da415f8aca1197c742bca063672b858d437d2d6b4df5f90ba770e1af9339b3fb1ffa9cc87f2fa993a7177057eb22caf
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-defaults-mode-browser@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.296.0"
+"@aws-sdk/util-defaults-mode-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     bowser: ^2.11.0
     tslib: ^2.5.0
-  checksum: ae8c6b03d9de2fc9c320ae4aa65027604658aff95483d3eccdc87307e683da2c6943f863a98f74af7c7f9cae74d0b1df7e6f83592cd0b5eff0ff8eba48fca127
+  checksum: 1f1847c41c43e167dec2e6f1a128ac9a486cc2e536b65d8d0e247131105cd2a46329297adc865ec164019850cbd425648add521dbde03417cacceaaf249555c2
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-defaults-mode-node@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/util-defaults-mode-node@npm:3.299.0"
+"@aws-sdk/util-defaults-mode-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-defaults-mode-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/config-resolver": 3.299.0
-    "@aws-sdk/credential-provider-imds": 3.296.0
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/property-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/config-resolver": 3.310.0
+    "@aws-sdk/credential-provider-imds": 3.310.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/property-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: f0a30f8a58a5f92ea8ee6bc0239f635f318f16b3cf00ef00ce622715a267c598f55791532bd845070344f35d4ba7e8b6063ecb7bc76caac3c2eb90cca3150657
+  checksum: dca18909df6f8c72ae606c25920e2f686016de969aef2be4568cd6ce1fa0c45b3f946702d607b3279d267aaedff8b67251d4ee7bb4f76a38fca4299c81a7757d
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.296.0"
+"@aws-sdk/util-endpoints@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 9ff3b1c39123e8a88c2dcc1e81757f99cfd787be2039b9172e6a1a8b48b04d78712c2082dd1762e41b8b0a6c2f8d79aa06c571ea7ee622351634e5c40a069643
+  checksum: 3f1c76b4c7662eeaf9dcf782739aa90812ed6920dd602a4a3779c80fbf3215efb15bd1ad82a30d022b577acd6049d35fbf79b45f6ae842e895be94db360d1b03
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-hex-encoding@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-hex-encoding@npm:3.295.0"
+"@aws-sdk/util-hex-encoding@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-hex-encoding@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 4b85f087de5c2a8317ff13df4947e355b4c4acae1dd283133e53139457252fb83951194c85e07b89a1e12cecec1b3c0dbd11b7d0f9f2a7775d8c6d3d9c21371e
+  checksum: 97b8d7e0e406189cdbd4fccb0a497dd247a22d54b18caf5a64a63d19d2535b95a64ee79ecf81b13f741bda1d565eb11448d4fd39617e4b86fc8626b05485d98c
   languageName: node
   linkType: hard
 
@@ -1553,84 +1595,84 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-middleware@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-middleware@npm:3.296.0"
+"@aws-sdk/util-middleware@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-middleware@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 9743a6279208cdb25fc6a5d5800477dfa7f10c25e65cfcb7e0721613c0640df21bef7fe6cb18f27ee3ff470c0be2ff06cb6afdefe234d418c7ac17d9a3563301
+  checksum: 3c25a83361ce95dd3f66170d67fb39911a3f5bc21627ffaccef1880ad8c3602b6351f5c51e9c0bfef5b4037e5c66b9eadb291a9441db644811cf5640c35c587b
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-retry@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-retry@npm:3.296.0"
+"@aws-sdk/util-retry@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-retry@npm:3.310.0"
   dependencies:
-    "@aws-sdk/service-error-classification": 3.296.0
+    "@aws-sdk/service-error-classification": 3.310.0
     tslib: ^2.5.0
-  checksum: f225fc4eb0933eda3df069d2b0028d8eed76be9b7b871b7bf601c4f5f17012ebb6ebb194df26fc141c9e77bad86d5cbdb79113fe5624d3c2c9d3441f96f580b3
+  checksum: a91b53ca40dd7ac423b46a4916a84567de163e84e63919e77d9a0694337323812b662580f6133442eb1c17885d0a2b5663cba9cadce4dabf5517dc34089b3399
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-stream-browser@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-stream-browser@npm:3.296.0"
+"@aws-sdk/util-stream-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-stream-browser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/fetch-http-handler": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-base64": 3.295.0
-    "@aws-sdk/util-hex-encoding": 3.295.0
-    "@aws-sdk/util-utf8": 3.295.0
+    "@aws-sdk/fetch-http-handler": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-base64": 3.310.0
+    "@aws-sdk/util-hex-encoding": 3.310.0
+    "@aws-sdk/util-utf8": 3.310.0
     tslib: ^2.5.0
-  checksum: 52d0fd8919a9990eeaa0207d1c91396414ee5015684b0d6279f0ec250c6a32e5daf3fec6bb1bb0830901d873997c0c5a66f8c7721cec7bdc0dc828df56f41262
+  checksum: 0058cdb410bd5d9365ce28c436dff17a534dfea38cc411f2bc83b34aa1be24850feae19f73b2fc7c2865df5d38d1f2502eb8ab4d061b3a90f4823bc09031f30c
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-stream-node@npm:3.296.0, @aws-sdk/util-stream-node@npm:^3.208.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-stream-node@npm:3.296.0"
+"@aws-sdk/util-stream-node@npm:3.310.0, @aws-sdk/util-stream-node@npm:^3.208.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-stream-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/node-http-handler": 3.296.0
-    "@aws-sdk/types": 3.296.0
-    "@aws-sdk/util-buffer-from": 3.295.0
+    "@aws-sdk/node-http-handler": 3.310.0
+    "@aws-sdk/types": 3.310.0
+    "@aws-sdk/util-buffer-from": 3.310.0
     tslib: ^2.5.0
-  checksum: b1e4a196be6f24c2c652d22d405ce3238769fd64267c157e480309b18531d693cae0c49ade10869b1f0f0fc4b7d5c2835fdd51562c434a09774d4606ee652606
+  checksum: 05caf55f81dd8151adccc23bc2f3f0007e095fb554bec279ec0c8045a7d8da22ecaed238f5d12705ae77e77b7cd81119bb5da2f1a9788962f5361647cafdf9ca
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-uri-escape@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-uri-escape@npm:3.295.0"
+"@aws-sdk/util-uri-escape@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-uri-escape@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: 2334baedd339161aa2fb6ae880c04730b072a217ed42b40aa0c0df526aba5a663302da50ba550ad657a4b3cf44070696d91501bf2ba33722f452247f5c2d0fde
+  checksum: 614c0a43b238b7371b6655a5961e21c57b708de3e1ce3138bd56284bedc48888e5c7d2a6965544108c3334fcdc45e9ddba86b2470c8e6901559ad7be8e21d418
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.299.0"
+"@aws-sdk/util-user-agent-browser@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-user-agent-browser@npm:3.310.0"
   dependencies:
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/types": 3.310.0
     bowser: ^2.11.0
     tslib: ^2.5.0
-  checksum: 60ebb1c0f5de624c212f00641fdcc8b667dac6442413d0d882745b660f72a6d1107cd6b04e7a5eee4013f0444b9fedfe151317937ac1f7d333dd3feeefa027b0
+  checksum: 32fc6249e762fcba3f3111ed627b644855e8127bc354911fdcdbd0332ea1915872bb0984f19c049fbc4feaf17e3bb02ff11b13d3792103ee8902d00c7fe3ff84
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.299.0":
-  version: 3.299.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.299.0"
+"@aws-sdk/util-user-agent-node@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-user-agent-node@npm:3.310.0"
   dependencies:
-    "@aws-sdk/node-config-provider": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/node-config-provider": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
   peerDependencies:
     aws-crt: ">=1.0.0"
   peerDependenciesMeta:
     aws-crt:
       optional: true
-  checksum: 50bfcaf9bc0ee6f0ca87bfbcbacf10394631d62dba508f0b43b7c3cf2a6febe75ca1160e18d0abc96caddb0608504ab7ceb4a92078184764669a935db1af7cf8
+  checksum: 82d214f814405a538df8afb259f6a3f2d373cd87adbc2895ac93e9d1f4ed9f4f8f6dcc0ae8ba55887e99e45b5ea83c7b1e5ed3efccbcdbbcaee6a863a638d183
   languageName: node
   linkType: hard
 
@@ -1643,33 +1685,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-utf8@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/util-utf8@npm:3.295.0"
+"@aws-sdk/util-utf8@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-utf8@npm:3.310.0"
   dependencies:
-    "@aws-sdk/util-buffer-from": 3.295.0
+    "@aws-sdk/util-buffer-from": 3.310.0
     tslib: ^2.5.0
-  checksum: 098058651aa48bb2a6652ea6a1a0a1520e9964a91920e67eed023eacc0956b75475d25025e888ee193140aa800ed89faafa67653914b78c7ffb98e8f96f6d54c
+  checksum: 4045e79b8e3593e12233b359ba77d1b4c162fd9fcb4ab3b58b711c41b725552306dd91402b8d57ce5be080c76309f046a7a0c4ff704d12f9ba71e3b25b810086
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-waiter@npm:3.296.0":
-  version: 3.296.0
-  resolution: "@aws-sdk/util-waiter@npm:3.296.0"
+"@aws-sdk/util-waiter@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/util-waiter@npm:3.310.0"
   dependencies:
-    "@aws-sdk/abort-controller": 3.296.0
-    "@aws-sdk/types": 3.296.0
+    "@aws-sdk/abort-controller": 3.310.0
+    "@aws-sdk/types": 3.310.0
     tslib: ^2.5.0
-  checksum: 9984297149735df1791791c2f02077bab47501113393efbef619f6af9d19fb1c44a6ac79be73dbc6725a9eb3343b77c04068dcdc0797ddc7da7b9f93df810d7c
+  checksum: 51eb9fbb9a21cd02c312f4639e520b934e2d6ea93eb7c0c1c71f3cf415d61b0a681e7f88209f9e49f3e84bba83480d1c14b0c0b069b610bd12753ff1c1d68f42
   languageName: node
   linkType: hard
 
-"@aws-sdk/xml-builder@npm:3.295.0":
-  version: 3.295.0
-  resolution: "@aws-sdk/xml-builder@npm:3.295.0"
+"@aws-sdk/xml-builder@npm:3.310.0":
+  version: 3.310.0
+  resolution: "@aws-sdk/xml-builder@npm:3.310.0"
   dependencies:
     tslib: ^2.5.0
-  checksum: a32bcea43104c049b995c967ea416887fac45da8a8ecf55f06836a08aff878683c702852b383a36c04a09368ebb091388169f46f0d0a49cf477392966b4bdbdd
+  checksum: fc17fd8f68470702d947948ada46097bdddecafdc68fa57bf584320e92748e8ef0372a51999d3ab7902ba4f62c2dbfbdec2dba1180fca19bb5127bad1ef0e48b
   languageName: node
   linkType: hard
 
@@ -1920,8 +1962,8 @@ __metadata:
   linkType: hard
 
 "@azure/storage-blob@npm:^12.5.0":
-  version: 12.13.0
-  resolution: "@azure/storage-blob@npm:12.13.0"
+  version: 12.14.0
+  resolution: "@azure/storage-blob@npm:12.14.0"
   dependencies:
     "@azure/abort-controller": ^1.0.0
     "@azure/core-http": ^3.0.0
@@ -1931,7 +1973,7 @@ __metadata:
     "@azure/logger": ^1.0.0
     events: ^3.0.0
     tslib: ^2.2.0
-  checksum: 1509b8904eb46937b76f9acc04e9e0c39e8e9219a3bc3f5c006df7eb4d29ff2ed0ebbecc875f9372b5a349639e79123b30bbfb407864cfe91633dd6871a9bd99
+  checksum: d087afd09a68342f7dcc655bf8861ffbcf84caddbfeee9ad226491a5b890fe0721a51d7221d0fc514b205a50ac153982803d89958640d2237a431b5f6b47dd6c
   languageName: node
   linkType: hard
 
@@ -3342,12 +3384,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.20.13
-  resolution: "@babel/runtime@npm:7.20.13"
+"@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.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.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"
   dependencies:
     regenerator-runtime: ^0.13.11
-  checksum: 09b7a97a05c80540db6c9e4ddf8c5d2ebb06cae5caf3a87e33c33f27f8c4d49d9c67a2d72f1570e796045288fad569f98a26ceba0c4f5fad2af84b6ad855c4fb
+  checksum: 7b33e25bfa9e0e1b9e8828bb61b2d32bdd46b41b07ba7cb43319ad08efc6fda8eb89445193e67d6541814627df0ca59122c0ea795e412b99c5183a0540d338ab
   languageName: node
   linkType: hard
 
@@ -3581,6 +3623,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/backend-openapi-utils@workspace:^, @backstage/backend-openapi-utils@workspace:packages/backend-openapi-utils":
+  version: 0.0.0-use.local
+  resolution: "@backstage/backend-openapi-utils@workspace:packages/backend-openapi-utils"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@types/express": ^4.17.6
+    "@types/express-serve-static-core": ^4.17.5
+    express: ^4.17.1
+    express-promise-router: ^4.1.0
+    json-schema-to-ts: ^2.6.2
+    openapi3-ts: ^3.1.2
+  languageName: unknown
+  linkType: soft
+
 "@backstage/backend-plugin-api@workspace:^, @backstage/backend-plugin-api@workspace:packages/backend-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/backend-plugin-api@workspace:packages/backend-plugin-api"
@@ -3644,7 +3700,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-client@^1.4.0, @backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
+"@backstage/catalog-client@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@backstage/catalog-client@npm:1.4.0"
+  dependencies:
+    "@backstage/catalog-model": ^1.2.1
+    "@backstage/errors": ^1.1.5
+    cross-fetch: ^3.1.5
+  checksum: 8ffa95d74b2be83247beafce3aebe06cb688b018ada8ce4364b48ca09500293b1057cb48b90650a44b6252775bc3e09eeafcef79b8d8db4114271f8ec31bec80
+  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:
@@ -3656,7 +3723,22 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-model@^1.1.5, @backstage/catalog-model@^1.2.1, @backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
+"@backstage/catalog-model@npm:^1.1.5, @backstage/catalog-model@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@backstage/catalog-model@npm:1.2.1"
+  dependencies:
+    "@backstage/config": ^1.0.7
+    "@backstage/errors": ^1.1.5
+    "@backstage/types": ^1.0.2
+    ajv: ^8.10.0
+    json-schema: ^0.4.0
+    lodash: ^4.17.21
+    uuid: ^8.0.0
+  checksum: 78ea76ecb42d661f21e4b02dbb39bccc4718783bf28985488d7abe496b9f0357742813c29c935fda3e764040b8c54f8b7129fe138e93637e867067ead8bb2a8f
+  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:
@@ -3683,12 +3765,30 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/cli-node@workspace:^, @backstage/cli-node@workspace:packages/cli-node":
+  version: 0.0.0-use.local
+  resolution: "@backstage/cli-node@workspace:packages/cli-node"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/cli-common": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@manypkg/get-packages": ^1.1.3
+    "@yarnpkg/parsers": ^3.0.0-rc.4
+    fs-extra: 10.1.0
+    mock-fs: ^5.2.0
+    semver: ^7.3.2
+    zod: ^3.21.4
+  languageName: unknown
+  linkType: soft
+
 "@backstage/cli@workspace:*, @backstage/cli@workspace:^, @backstage/cli@workspace:packages/cli":
   version: 0.0.0-use.local
   resolution: "@backstage/cli@workspace:packages/cli"
   dependencies:
     "@backstage/backend-common": "workspace:^"
     "@backstage/cli-common": "workspace:^"
+    "@backstage/cli-node": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/config-loader": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
@@ -3719,8 +3819,8 @@ __metadata:
     "@svgr/plugin-svgo": 6.5.x
     "@svgr/rollup": 6.5.x
     "@svgr/webpack": 6.5.x
-    "@swc/core": ^1.3.9
-    "@swc/helpers": ^0.4.7
+    "@swc/core": ^1.3.46
+    "@swc/helpers": ^0.5.0
     "@swc/jest": ^0.2.22
     "@types/cross-spawn": ^6.0.2
     "@types/diff": ^5.0.0
@@ -4345,6 +4445,7 @@ __metadata:
     "@types/node": "*"
     "@types/react": ^16.13.1 || ^17.0.0
     cross-fetch: ^3.1.5
+    lodash: ^4.17.21
     msw: ^1.0.0
     react-markdown: ^8.0.0
     react-use: ^17.2.4
@@ -5037,6 +5138,7 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-catalog-common": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@types/lodash": ^4.14.151
@@ -5330,6 +5432,7 @@ __metadata:
   resolution: "@backstage/plugin-catalog-backend@workspace:plugins/catalog-backend"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-openapi-utils": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
@@ -5833,7 +5936,7 @@ __metadata:
     supertest: ^6.1.6
     uuid: ^8.3.2
     winston: ^3.2.1
-    xml2js: ^0.4.23
+    xml2js: ^0.5.0
     yn: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -6361,6 +6464,7 @@ __metadata:
     classnames: ^2.2.6
     cross-fetch: ^3.1.5
     msw: ^1.0.0
+    pluralize: ^8.0.0
     react-use: ^17.2.4
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
@@ -7141,6 +7245,7 @@ __metadata:
     "@backstage/core-components": "workspace:^"
     "@backstage/core-plugin-api": "workspace:^"
     "@backstage/dev-utils": "workspace:^"
+    "@backstage/errors": "workspace:^"
     "@backstage/plugin-catalog-react": "workspace:^"
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/test-utils": "workspace:^"
@@ -7159,6 +7264,7 @@ __metadata:
     cronstrue: ^2.2.0
     cross-fetch: ^3.1.5
     js-yaml: ^4.0.0
+    kubernetes-models: ^4.1.0
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -7593,6 +7699,7 @@ __metadata:
   resolution: "@backstage/plugin-permission-backend@workspace:plugins/permission-backend"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
@@ -7649,6 +7756,7 @@ __metadata:
   resolution: "@backstage/plugin-permission-node@workspace:plugins/permission-node"
   dependencies:
     "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
@@ -7777,6 +7885,7 @@ __metadata:
     cross-fetch: ^3.1.5
     lodash: ^4.17.21
     msw: ^1.0.0
+    pluralize: ^8.0.0
     qs: ^6.9.4
     react-hook-form: ^7.13.0
     react-use: ^17.2.4
@@ -7815,6 +7924,37 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-puppetdb@workspace:^, @backstage/plugin-puppetdb@workspace:plugins/puppetdb":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-puppetdb@workspace:plugins/puppetdb"
+  dependencies:
+    "@backstage/catalog-model": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/dev-utils": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-catalog-react": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": ^4.0.0-alpha.57
+    "@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
+    msw: ^1.0.1
+    react-use: ^17.2.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/plugin-rollbar-backend@workspace:^, @backstage/plugin-rollbar-backend@workspace:plugins/rollbar-backend":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-rollbar-backend@workspace:plugins/rollbar-backend"
@@ -8109,11 +8249,11 @@ __metadata:
     "@material-ui/lab": 4.0.0-alpha.61
     "@react-hookz/web": ^20.0.0
     "@rjsf/core": ^3.2.1
-    "@rjsf/core-v5": "npm:@rjsf/core@5.3.1"
+    "@rjsf/core-v5": "npm:@rjsf/core@5.5.2"
     "@rjsf/material-ui": ^3.2.1
-    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.3.1"
-    "@rjsf/utils": 5.3.1
-    "@rjsf/validator-ajv8": 5.3.1
+    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.5.2"
+    "@rjsf/utils": 5.5.2
+    "@rjsf/validator-ajv8": 5.5.2
     "@testing-library/dom": ^8.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
@@ -8176,8 +8316,8 @@ __metadata:
     "@react-hookz/web": ^20.0.0
     "@rjsf/core": ^3.2.1
     "@rjsf/material-ui": ^3.2.1
-    "@rjsf/utils": 5.3.1
-    "@rjsf/validator-ajv8": 5.3.1
+    "@rjsf/utils": 5.5.2
+    "@rjsf/validator-ajv8": 5.5.2
     "@testing-library/dom": ^8.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
@@ -9329,6 +9469,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/repo-tools@workspace:packages/repo-tools"
   dependencies:
+    "@apidevtools/swagger-parser": ^10.1.0
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@backstage/errors": "workspace:^"
@@ -9344,8 +9485,11 @@ __metadata:
     fs-extra: 10.1.0
     glob: ^8.0.3
     is-glob: ^4.0.3
+    js-yaml: ^4.1.0
+    lodash: ^4.17.21
     minimatch: ^5.1.1
     mock-fs: ^5.1.0
+    p-limit: ^3.0.2
     ts-node: ^10.0.0
   peerDependencies:
     "@microsoft/api-extractor-model": "*"
@@ -9801,13 +9945,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0":
-  version: 6.9.3
-  resolution: "@codemirror/view@npm:6.9.3"
+  version: 6.9.4
+  resolution: "@codemirror/view@npm:6.9.4"
   dependencies:
     "@codemirror/state": ^6.1.4
     style-mod: ^4.0.0
     w3c-keyname: ^2.2.4
-  checksum: 718ecbb021ca75eb89003f73c846a07d36a708dcfec8345f0f0dbcfc0d0df5ea6f114918694b2730a6d49e5e50502bcce79ce7ff94ce55748e068e5a35073755
+  checksum: 9d2e9596caa3f568cea5aeff87c9ed10b7cf1e73d198240042bddeeffaea21f70b859927b1a05f5a613a8d58a92be762c6b899ced0725cf70194057d9591f83b
   languageName: node
   linkType: hard
 
@@ -10324,20 +10468,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "@eslint/eslintrc@npm:1.4.1"
+"@eslint-community/eslint-utils@npm:^4.2.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "@eslint-community/regexpp@npm:4.5.0"
+  checksum: 99c01335947dbd7f2129e954413067e217ccaa4e219fe0917b7d2bd96135789384b8fedbfb8eb09584d5130b27a7b876a7150ab7376f51b3a0c377d5ce026a10
+  languageName: node
+  linkType: hard
+
+"@eslint/eslintrc@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@eslint/eslintrc@npm:2.0.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
-    espree: ^9.4.0
+    espree: ^9.5.1
     globals: ^13.19.0
     ignore: ^5.2.0
     import-fresh: ^3.2.1
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: cd3e5a8683db604739938b1c1c8b77927dc04fce3e28e0c88e7f2cd4900b89466baf83dfbad76b2b9e4d2746abdd00dd3f9da544d3e311633d8693f327d04cd7
+  checksum: cfcf5e12c7b2c4476482e7f12434e76eae16fcd163ee627309adb10b761e5caa4a4e52ed7be464423320ff3d11eca5b50de5bf8be3e25834222470835dd5c801
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.38.0":
+  version: 8.38.0
+  resolution: "@eslint/js@npm:8.38.0"
+  checksum: 1f28987aa8c9cd93e23384e16c7220863b39b5dc4b66e46d7cdbccce868040f455a98d24cd8b567a884f26545a0555b761f7328d4a00c051e7ef689cbea5fce1
   languageName: node
   linkType: hard
 
@@ -10482,11 +10651,11 @@ __metadata:
   linkType: hard
 
 "@google-cloud/container@npm:^4.0.0":
-  version: 4.7.1
-  resolution: "@google-cloud/container@npm:4.7.1"
+  version: 4.8.0
+  resolution: "@google-cloud/container@npm:4.8.0"
   dependencies:
-    google-gax: ^3.5.2
-  checksum: e622ddc2522fcffadd72a0cc6fa3f12e6a337b9e53ff1886a2057a8d4f3f0fc13b60b806c35946da0a1211fe52d66f65b4ab59c06b5e7cd725cd588477c0bde1
+    google-gax: ^3.5.8
+  checksum: f9c64a368d16a3fbc79a122987f99b02d15a82205d13381b30fcb7e012a6a06dc869bc3c07b1325517863df3692e07351e4b8998b774c3b72c31ecd225f2f3bc
   languageName: node
   linkType: hard
 
@@ -10585,14 +10754,14 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/cli@npm:^3.0.0":
-  version: 3.2.2
-  resolution: "@graphql-codegen/cli@npm:3.2.2"
+  version: 3.3.0
+  resolution: "@graphql-codegen/cli@npm:3.3.0"
   dependencies:
     "@babel/generator": ^7.18.13
     "@babel/template": ^7.18.10
     "@babel/types": ^7.18.13
     "@graphql-codegen/core": ^3.1.0
-    "@graphql-codegen/plugin-helpers": ^4.1.0
+    "@graphql-codegen/plugin-helpers": ^4.2.0
     "@graphql-tools/apollo-engine-loader": ^7.3.6
     "@graphql-tools/code-file-loader": ^7.3.17
     "@graphql-tools/git-loader": ^7.2.13
@@ -10630,7 +10799,7 @@ __metadata:
     graphql-code-generator: cjs/bin.js
     graphql-codegen: cjs/bin.js
     graphql-codegen-esm: esm/bin.js
-  checksum: b94284ac538a3504f96c7d507c140b7cfee30042209c4230ffc3068f05b6b27c75e1922b31c696363ab43e34e472ed194cc72996bbb10f59991cd2a4a35ff36e
+  checksum: 7c3ae7ba62cfb5576e6c1fc78f81a2c59d399415b9ef2ba55818af00aff2337a047a61b1cedb6e89e73dac30d9a00e57045ff6052245934bc4c5cf35c9762250
   languageName: node
   linkType: hard
 
@@ -10649,24 +10818,24 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/graphql-modules-preset@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "@graphql-codegen/graphql-modules-preset@npm:3.1.1"
+  version: 3.1.2
+  resolution: "@graphql-codegen/graphql-modules-preset@npm:3.1.2"
   dependencies:
-    "@graphql-codegen/plugin-helpers": ^4.1.0
-    "@graphql-codegen/visitor-plugin-common": 3.0.2
+    "@graphql-codegen/plugin-helpers": ^4.2.0
+    "@graphql-codegen/visitor-plugin-common": 3.1.0
     "@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: f437590afa33ac308c075d214b501404ae2f99888cac8071d05cc2b8c7ceaea5aef8f86bb60e7a9a45902126dc99bd20d77e951c0beef665aaa31ac3c2217e26
+  checksum: d3b4e9fe169742ce7973466045793ff0823c690f0736ba22aef3d4578be498746df108726ccad0c190d1c45a33816ab4e010b9c6e9931ced06ef7489d85a3691
   languageName: node
   linkType: hard
 
-"@graphql-codegen/plugin-helpers@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@graphql-codegen/plugin-helpers@npm:4.1.0"
+"@graphql-codegen/plugin-helpers@npm:^4.1.0, @graphql-codegen/plugin-helpers@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@graphql-codegen/plugin-helpers@npm:4.2.0"
   dependencies:
     "@graphql-tools/utils": ^9.0.0
     change-case-all: 1.0.15
@@ -10676,7 +10845,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: a4d89909d7a62bd7a93041b6073b1d46e912b42f7af1d15c44f7ed595ab1185b6c257cccf8272e0ae36ba22724578449d0e21524e8dbc21fb375da0620687868
+  checksum: 5d26adc132026916db061d23b06fc2c329f372f19ecf56e39bd2b30082bff642f2030cd6dc0bad8d2d3ab781c1e145384e040310a479b83d85ec804b2983646d
   languageName: node
   linkType: hard
 
@@ -10694,41 +10863,41 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/typescript-resolvers@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "@graphql-codegen/typescript-resolvers@npm:3.1.1"
+  version: 3.2.0
+  resolution: "@graphql-codegen/typescript-resolvers@npm:3.2.0"
   dependencies:
-    "@graphql-codegen/plugin-helpers": ^4.1.0
-    "@graphql-codegen/typescript": ^3.0.2
-    "@graphql-codegen/visitor-plugin-common": 3.0.2
+    "@graphql-codegen/plugin-helpers": ^4.2.0
+    "@graphql-codegen/typescript": ^3.0.3
+    "@graphql-codegen/visitor-plugin-common": 3.1.0
     "@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: 88faa1ca2335096aa9939101f3591007d9fa477836d969a3c622dbf67704505600387a2e9fbb416d61b5ef42dbd79a0d351003037c0756d8d0c7f32c7961e783
+  checksum: d866b95775c95d1685e832a1d24df2a1e98feb67f35ef20a5d590c42b7314307b48399531b0cdc004e0be1062769ffe1e1a4757863ed1ca1f575dcd5e08b014d
   languageName: node
   linkType: hard
 
-"@graphql-codegen/typescript@npm:^3.0.0, @graphql-codegen/typescript@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@graphql-codegen/typescript@npm:3.0.2"
+"@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"
   dependencies:
-    "@graphql-codegen/plugin-helpers": ^4.1.0
+    "@graphql-codegen/plugin-helpers": ^4.2.0
     "@graphql-codegen/schema-ast": ^3.0.1
-    "@graphql-codegen/visitor-plugin-common": 3.0.2
+    "@graphql-codegen/visitor-plugin-common": 3.1.0
     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: e92dc54804b6ad45fb2499b91cb89743e455a984684e2b1df1b1a8f479a0bbffa5c625be97ccb55874ac8b7316a820b546e9e312b22eda78012acd5c27594a28
+  checksum: 5d292379b5f25f1df0dfdec62211f7e304a85910b6e30dcb28e89478dd15b565f05993913d9b8cf7f08b1e9166242f08e9cb68bd9688f486bd5eada7c6f82442
   languageName: node
   linkType: hard
 
-"@graphql-codegen/visitor-plugin-common@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@graphql-codegen/visitor-plugin-common@npm:3.0.2"
+"@graphql-codegen/visitor-plugin-common@npm:3.1.0":
+  version: 3.1.0
+  resolution: "@graphql-codegen/visitor-plugin-common@npm:3.1.0"
   dependencies:
-    "@graphql-codegen/plugin-helpers": ^4.1.0
+    "@graphql-codegen/plugin-helpers": ^4.2.0
     "@graphql-tools/optimize": ^1.3.0
     "@graphql-tools/relay-operation-optimizer": ^6.5.0
     "@graphql-tools/utils": ^9.0.0
@@ -10740,7 +10909,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: c8f941df7f8304b722b492ceaf15dddcf33e3a69bc29b54970908ffa12b14d92276958005bd307648e0cdc55f9e243d0fb390862f73a17a26bd50f6484ac42d6
+  checksum: 7532666c578680cda538d7b859ee7d5541113f3972f0f2396affa4dd6823a2e2d6f8b715c685912652b0906722dfafb4375c462aa3b4f991a12ec0a28f1b7ba7
   languageName: node
   linkType: hard
 
@@ -11058,7 +11227,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/merge@npm:8.4.0, @graphql-tools/merge@npm:^8.2.6":
+"@graphql-tools/merge@npm:8.4.0":
   version: 8.4.0
   resolution: "@graphql-tools/merge@npm:8.4.0"
   dependencies:
@@ -11070,6 +11239,18 @@ __metadata:
   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"
+  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: badb094e2eb29688d39d451a83909dc6f92a28c98dbb485a2f745a963813ad1310b1624c7618e97477c90f7935c99b06792bf63c4957a58c642af1609bcec143
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/optimize@npm:^1.3.0":
   version: 1.3.0
   resolution: "@graphql-tools/optimize@npm:1.3.0"
@@ -11151,7 +11332,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:9.0.17, @graphql-tools/schema@npm:^9.0.0, @graphql-tools/schema@npm:^9.0.16":
+"@graphql-tools/schema@npm:9.0.17":
   version: 9.0.17
   resolution: "@graphql-tools/schema@npm:9.0.17"
   dependencies:
@@ -11165,6 +11346,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/schema@npm:^9.0.0, @graphql-tools/schema@npm:^9.0.16":
+  version: 9.0.18
+  resolution: "@graphql-tools/schema@npm:9.0.18"
+  dependencies:
+    "@graphql-tools/merge": ^8.4.1
+    "@graphql-tools/utils": ^9.2.1
+    tslib: ^2.4.0
+    value-or-promise: 1.0.12
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 316bc3ce2673a357e3e8ed8f2dbd8e194c27323af7a78a1112253a597bacea70c6d1ea811e385e60c4226cd6ded54ef41b5bc44969433e14bcb192b666379b83
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/url-loader@npm:7.16.28, @graphql-tools/url-loader@npm:^7.13.2, @graphql-tools/url-loader@npm:^7.9.7":
   version: 7.16.28
   resolution: "@graphql-tools/url-loader@npm:7.16.28"
@@ -11909,6 +12104,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@kubernetes-models/apimachinery@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@kubernetes-models/apimachinery@npm:1.1.0"
+  dependencies:
+    "@kubernetes-models/base": ^4.0.0
+    "@kubernetes-models/validate": ^3.0.0
+    tslib: ^2.4.0
+  checksum: 71fc127a8e50c3686e32d9f9df94a307ae4d69995d6e82ea50a7eb9a5ce6a18e9950700ad0eb445e1451c997aabb22e2594ab1037c11faa9c0051b51bab569c6
+  languageName: node
+  linkType: hard
+
+"@kubernetes-models/base@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@kubernetes-models/base@npm:4.0.0"
+  dependencies:
+    "@kubernetes-models/validate": ^3.0.0
+    is-plain-object: ^5.0.0
+    tslib: ^2.4.0
+  checksum: 3c44f2220e119c24b874d6d674f38f9796f0ab682ba0cff1516d39549a6536055348bcee6c3c5257ebb8d4d6c8d1865d84e519d8f8948e6dd29eb1d72f3830cb
+  languageName: node
+  linkType: hard
+
+"@kubernetes-models/validate@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@kubernetes-models/validate@npm:3.0.0"
+  dependencies:
+    ajv: ^8.11.0
+    ajv-formats: ^2.1.1
+    tslib: ^2.4.0
+  checksum: b53b7181ddaad7e8faf6ceac228cb23df239ef5da3784887f3378dd3a7f89e1936b7b1884ab123255a905627311bab4302a06668fba35d26152e69fbf208a855
+  languageName: node
+  linkType: hard
+
 "@kubernetes/client-node@npm:0.18.1":
   version: 0.18.1
   resolution: "@kubernetes/client-node@npm:0.18.1"
@@ -11969,6 +12197,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lukeed/csprng@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "@lukeed/csprng@npm:1.1.0"
+  checksum: 926f5f7fc629470ca9a8af355bfcd0271d34535f7be3890f69902432bddc3262029bb5dbe9025542cf6c9883d878692eef2815fc2f3ba5b92e9da1f9eba2e51b
+  languageName: node
+  linkType: hard
+
 "@manypkg/find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "@manypkg/find-root@npm:1.1.0"
@@ -12438,16 +12673,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/common@npm:8.4.4":
-  version: 8.4.4
-  resolution: "@nestjs/common@npm:8.4.4"
+"@nestjs/axios@npm:0.0.8":
+  version: 0.0.8
+  resolution: "@nestjs/axios@npm:0.0.8"
   dependencies:
-    axios: 0.26.1
-    iterare: 1.2.1
-    tslib: 2.3.1
-    uuid: 8.3.2
+    axios: 0.27.2
   peerDependencies:
-    cache-manager: "*"
+    "@nestjs/common": ^7.0.0 || ^8.0.0
+    reflect-metadata: ^0.1.12
+    rxjs: ^6.0.0 || ^7.0.0
+  checksum: bc6b18c6e8bcfab1e8e9371a089cbba293a7b1df6d5de7fa15bb80db1966e6f62ba62d2b30c7378674f7d2272a1a1d0c694e1192c767c269c0aae04b7bdfea9b
+  languageName: node
+  linkType: hard
+
+"@nestjs/common@npm:9.3.11":
+  version: 9.3.11
+  resolution: "@nestjs/common@npm:9.3.11"
+  dependencies:
+    iterare: 1.2.1
+    tslib: 2.5.0
+    uid: 2.0.1
+  peerDependencies:
+    cache-manager: <=5
     class-transformer: "*"
     class-validator: "*"
     reflect-metadata: ^0.1.12
@@ -12459,26 +12706,25 @@ __metadata:
       optional: true
     class-validator:
       optional: true
-  checksum: bd0326a7a52b4ca819ca8790cec1e649ba0067d2eee54a32aabe890729f5d7dd6ecbf834cf68aa6727974a693981a4a6c119574dd12560914041380010632174
+  checksum: c39dfa9f02268e3f7fa22c4e9eecff0cfbee39c4d4dd0efc757a52117696dc9aec1f87588252b8b267a18469a6c12987707708b44f97ccbb5c6297396c0d9c00
   languageName: node
   linkType: hard
 
-"@nestjs/core@npm:8.4.4":
-  version: 8.4.4
-  resolution: "@nestjs/core@npm:8.4.4"
+"@nestjs/core@npm:9.3.11":
+  version: 9.3.11
+  resolution: "@nestjs/core@npm:9.3.11"
   dependencies:
     "@nuxtjs/opencollective": 0.3.2
     fast-safe-stringify: 2.1.1
     iterare: 1.2.1
-    object-hash: 3.0.0
     path-to-regexp: 3.2.0
-    tslib: 2.3.1
-    uuid: 8.3.2
+    tslib: 2.5.0
+    uid: 2.0.1
   peerDependencies:
-    "@nestjs/common": ^8.0.0
-    "@nestjs/microservices": ^8.0.0
-    "@nestjs/platform-express": ^8.0.0
-    "@nestjs/websockets": ^8.0.0
+    "@nestjs/common": ^9.0.0
+    "@nestjs/microservices": ^9.0.0
+    "@nestjs/platform-express": ^9.0.0
+    "@nestjs/websockets": ^9.0.0
     reflect-metadata: ^0.1.12
     rxjs: ^7.1.0
   peerDependenciesMeta:
@@ -12488,7 +12734,7 @@ __metadata:
       optional: true
     "@nestjs/websockets":
       optional: true
-  checksum: 65cc143c8e43cf009a94988a25e5c85cdab4c915990b8f840a06e7029d364e52baa381e3e0d05590f057332e0bd8c4ffce73b59f61e062ebe50ba166de156b58
+  checksum: 39d49e5b16cc260887233dd6701dbc53c073dc7522975d592f6c355db1f42fcf31eeaf300b9d03c63943f7330ecee910281cb78bb66d1c2d938d9b13491e70b4
   languageName: node
   linkType: hard
 
@@ -13219,22 +13465,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/webhooks-types@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@octokit/webhooks-types@npm:6.10.0"
-  checksum: 6eac226f070a48d9ef2594df952e8540b001e2a8760c4fa5ac2f78c1750694a6c3b8de42fb4dbb4bb78335f091d9268539d4261c52a1a91fb9ef1e9af1959b44
+"@octokit/webhooks-types@npm:6.11.0":
+  version: 6.11.0
+  resolution: "@octokit/webhooks-types@npm:6.11.0"
+  checksum: af35ac7a3d8d95bf9906fb3a8f6075cf9cb10707c79444fa82df2d64596125f515a35a4995b4548b84ee042c7c1b1cc120e05ece4a197af541a52f154bf4bcce
   languageName: node
   linkType: hard
 
 "@octokit/webhooks@npm:^10.0.0":
-  version: 10.7.0
-  resolution: "@octokit/webhooks@npm:10.7.0"
+  version: 10.9.1
+  resolution: "@octokit/webhooks@npm:10.9.1"
   dependencies:
     "@octokit/request-error": ^3.0.0
     "@octokit/webhooks-methods": ^3.0.0
-    "@octokit/webhooks-types": 6.10.0
+    "@octokit/webhooks-types": 6.11.0
     aggregate-error: ^3.1.0
-  checksum: c86d6ae97b59b540701b14e40aca88f47352cf4c03ee0237f714b65ea49b7416d262475d340ed0b4aee851c0a2fdc7d599982d30b4e5a3431986576fbcd4e86d
+  checksum: 3ee4ae98777653d629068c7914a8df29affb399a385ae55954953afa0caa856bab0cf8e92cfa80d36db0e7dd08eada0a3597cffd2f503a9078410660f0609161
   languageName: node
   linkType: hard
 
@@ -13256,27 +13502,28 @@ __metadata:
   linkType: hard
 
 "@openapitools/openapi-generator-cli@npm:^2.4.26":
-  version: 2.5.2
-  resolution: "@openapitools/openapi-generator-cli@npm:2.5.2"
+  version: 2.6.0
+  resolution: "@openapitools/openapi-generator-cli@npm:2.6.0"
   dependencies:
-    "@nestjs/common": 8.4.4
-    "@nestjs/core": 8.4.4
+    "@nestjs/axios": 0.0.8
+    "@nestjs/common": 9.3.11
+    "@nestjs/core": 9.3.11
     "@nuxtjs/opencollective": 0.3.2
     chalk: 4.1.2
     commander: 8.3.0
-    compare-versions: 4.1.3
+    compare-versions: 4.1.4
     concurrently: 6.5.1
     console.table: 0.10.0
-    fs-extra: 10.0.1
+    fs-extra: 10.1.0
     glob: 7.1.6
-    inquirer: 8.2.2
+    inquirer: 8.2.5
     lodash: 4.17.21
     reflect-metadata: 0.1.13
-    rxjs: 7.5.5
+    rxjs: 7.8.0
     tslib: 2.0.3
   bin:
     openapi-generator-cli: main.js
-  checksum: 77a77be03877311b55c8a749646cebd6a1e330eb5c2edf64695b20ae575c3cd8c6c316d2099866f7a9ed9fe545847472f4ec44aab133d76b707c085e77b70605
+  checksum: d60711b0fc018f4834faa28be8990a6d019d87be9cd8c8f7f1a2f5dfb863044b1f80bc0841caceffa76f6eec3e756291e3b8e81a00d42ca883974703b616097f
   languageName: node
   linkType: hard
 
@@ -13526,19 +13773,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/core-v5@npm:@rjsf/core@5.3.1":
-  version: 5.3.1
-  resolution: "@rjsf/core@npm:5.3.1"
+"@rjsf/core-v5@npm:@rjsf/core@5.5.2":
+  version: 5.5.2
+  resolution: "@rjsf/core@npm:5.5.2"
   dependencies:
     lodash: ^4.17.15
     lodash-es: ^4.17.15
-    markdown-to-jsx: ^7.1.9
+    markdown-to-jsx: ^7.2.0
     nanoid: ^3.3.4
     prop-types: ^15.7.2
   peerDependencies:
     "@rjsf/utils": ^5.0.0
     react: ^16.14.0 || >=17
-  checksum: e7f5c05a594db0549c5289f1dc570977fa37c9ca0f1fed47ec17fa49dd4b6b85ffc3844c9c11d36455a66ff17f898469b6a2dca159223de348f84bdadd28ae32
+  checksum: 3e0b9d23a45e90df76cbe0824190516dcaf2d5f82ce2bd528fcfd0d0032b36aa063b551a045cdab018a067f28c8e4708ec2984d892c78f0ba51c4f8b451aad2c
   languageName: node
   linkType: hard
 
@@ -13561,16 +13808,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.3.1":
-  version: 5.3.1
-  resolution: "@rjsf/material-ui@npm:5.3.1"
+"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.5.2":
+  version: 5.5.2
+  resolution: "@rjsf/material-ui@npm:5.5.2"
   peerDependencies:
     "@material-ui/core": ^4.12.3
     "@material-ui/icons": ^4.11.2
     "@rjsf/core": ^5.0.0
     "@rjsf/utils": ^5.0.0
     react: ^16.14.0 || >=17
-  checksum: 169d78e3983742b38008de95ab320cdc1f52995dabf2e75d44052c09fb0b734ecb45c58fbdf51dea18bf8bd45130aec01dc0b4b75a2635e82ef5c489d1d35af1
+  checksum: ccd16e81ee4fbf6c5a3cb7361e9143ab5072c8415159b4781c4d1eb322319f3bf973a45230bb929a61242ede584ef11810d7c55eb0d3fd86557acff912da906f
   languageName: node
   linkType: hard
 
@@ -13586,9 +13833,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/utils@npm:5.3.1":
-  version: 5.3.1
-  resolution: "@rjsf/utils@npm:5.3.1"
+"@rjsf/utils@npm:5.5.2":
+  version: 5.5.2
+  resolution: "@rjsf/utils@npm:5.5.2"
   dependencies:
     json-schema-merge-allof: ^0.8.1
     jsonpointer: ^5.0.1
@@ -13597,13 +13844,13 @@ __metadata:
     react-is: ^18.2.0
   peerDependencies:
     react: ^16.14.0 || >=17
-  checksum: 400a17bf99a043557adbd4e0dc3651b9d1b47ab61a40acb8756c5b986d044a329bd26bf45263a667eb963acf51084d612c043c9409aeaac4e4c6ab66af0bb700
+  checksum: 25ef467be23ee42fa2791e46ed73301952e30564b2085e224ca40763578a7268c54cf20c4cb620855771e357f60d2d8329301892395f0014a5f63e7025779e11
   languageName: node
   linkType: hard
 
-"@rjsf/validator-ajv8@npm:5.3.1":
-  version: 5.3.1
-  resolution: "@rjsf/validator-ajv8@npm:5.3.1"
+"@rjsf/validator-ajv8@npm:5.5.2":
+  version: 5.5.2
+  resolution: "@rjsf/validator-ajv8@npm:5.5.2"
   dependencies:
     ajv: ^8.12.0
     ajv-formats: ^2.1.1
@@ -13611,13 +13858,13 @@ __metadata:
     lodash-es: ^4.17.15
   peerDependencies:
     "@rjsf/utils": ^5.0.0
-  checksum: b99e0d2df6b6431438ea81c2e31636aa5a1939d054153236851e5d8e8b06f8a1958c8c16887dd2babfd1608e18aa1ce3f1c0a778b3b3198028b92f0553e0383e
+  checksum: 355afe4369763b888be6d341541df4e75ca5f634a7f01c938d7f978bd389d7eda93518daea420a93acdec8ba91e4f0257889f05d472c860ead975e2ecf241dfb
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-buildkite@npm:^2.0.8":
-  version: 2.1.7
-  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.7"
+  version: 2.1.8
+  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.8"
   dependencies:
     "@backstage/catalog-model": ^1.2.1
     "@backstage/core-components": ^0.12.5
@@ -13635,13 +13882,13 @@ __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: 1b84acf97e22f3b481d4b4fbc1ccb1d184f811ec00998b92cc8ee6f4be95af2acebd9932ad4337c611d17ca15f8c34cd44310a44d775008a1d845fe1a197ae37
+  checksum: f35f5bb78cb415a894532e5af5879d47d6b61c2f52bc6f4274fde46bc7bba2bca974845a802fdd361591002d048b8f14a4ce4aee1b6a2d70df531b8bb60ae447
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-insights@npm:^2.0.5":
-  version: 2.3.8
-  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.8"
+  version: 2.3.9
+  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.9"
   dependencies:
     "@backstage/catalog-model": ^1.2.1
     "@backstage/core-components": ^0.12.5
@@ -13663,13 +13910,13 @@ __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: 0a9027a035d41e46344d88da361ec91fbf43adb018bb9e383e5659d4478b67951ef9e32381b020a2104bf16be5009ae7e97c07182dcbe04721d6385e93ec8ce2
+  checksum: 49b95a6724cb1126686dc29fc6d949583209dc47cc299c30a84fa5f9ac951bd74bb15901110856ba410e86dd75027562277ce5a9456d5c07557a67ef04bb9d7f
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-pull-requests@npm:^2.2.7":
-  version: 2.5.5
-  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.5.5"
+  version: 2.5.7
+  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.5.7"
   dependencies:
     "@backstage/catalog-model": ^1.2.1
     "@backstage/core-components": ^0.12.5
@@ -13684,7 +13931,7 @@ __metadata:
     "@types/node-fetch": ^2.5.7
     history: ^5.0.0
     lodash: ^4.17.21
-    moment: ^2.27.0
+    luxon: ^3.3.0
     msw: ^1.0.1
     node-fetch: ^2.6.1
     react-use: ^17.2.4
@@ -13692,13 +13939,13 @@ __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: 3a17a21665c397b3bd94c277e31b9f1005387b458a14b1c4c3bd28f6ef1400289fcf24e44bb8c54e07b99b59af49fe608c587f49e27d15cf01ef4d539cc25354
+  checksum: 325d448ea877da7dbc0a9604cd20f3f6cd74634314cd74c22d1853f0eb6b8550190616c1817a35f35e5e3762f41d7d375cea58aa77163bbfe82e6df621fa3f38
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-travis-ci@npm:^2.0.5":
-  version: 2.1.7
-  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.7"
+  version: 2.1.8
+  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.8"
   dependencies:
     "@backstage/catalog-model": ^1.2.1
     "@backstage/core-components": ^0.12.5
@@ -13718,7 +13965,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: 1a00d0128e1bdacac93ffa7b1aa1534ec91b603899d40967ed387e3fd91f35bbc5f9babfc7b811279775d60e28db7747211fd5c0d368db23b5a184b054e918c1
+  checksum: b135750b1fbf6f74743dd9142c2fcdec00379633ffd1b3793649eeea9ef6b015165da0dcb85f5442294364794c77592ef8ec1e83ada9f8bbb66ac394729a6f1a
   languageName: node
   linkType: hard
 
@@ -14248,9 +14495,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-core@npm:=0.69.0, @swagger-api/apidom-core@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-core@npm:0.69.0"
+"@swagger-api/apidom-core@npm:>=0.69.2 <1.0.0, @swagger-api/apidom-core@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-core@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
     "@swagger-api/apidom-ast": ^0.69.0
@@ -14260,194 +14507,194 @@ __metadata:
     ramda-adjunct: =3.4.0
     short-unique-id: =4.4.4
     stampit: =4.3.2
-  checksum: 036dc1198014fff9d7e879529186c4b0db423ae4c933eecec90650985e198cb3745638feff8681f85940f124703484d1b071dfca4eaf7b9457a4f99186c98972
+  checksum: c7820c1fb7e2e790796f5b124054f48f2153e0480f949a8baa3bfd7a507ae63da0303c252573f76a30844c9d8acc50bd6a29a7139f36ba57d7d582c7ca8eb29f
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-json-pointer@npm:=0.69.0, @swagger-api/apidom-json-pointer@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-json-pointer@npm:0.69.0"
+"@swagger-api/apidom-json-pointer@npm:>=0.69.2 <1.0.0, @swagger-api/apidom-json-pointer@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-json-pointer@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: 7930d938011c608d5c227c3b1cbfcb120eeebd32aedd447220219b079d030af6387a9a61e74461fe53578c06ba29aa78e5e5fdfcd561d5611d5a07ef5534ee49
+  checksum: 3485f1ed477a4c5b2982b996ab94695612d922da1c57432576936eb1ef22023f399f26fbc7b498d95f269ba37445393ea6f9548e82006483fd33e86c25dcf953
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-api-design-systems@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-api-design-systems@npm:0.69.0"
+"@swagger-api/apidom-ns-api-design-systems@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-api-design-systems@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: 1c3047d4081cd07bbbdce6fa19c62407d1c57f7bf05b85947fd1e9b3cc2c2792fb85a926a54d3376c761a123ce3b130b06e38830ca68743a20c684aae89275f1
+  checksum: 63dc8eb922bf41896645d09cb012126fd25c59e9d4c82c688b2677080c850ee5917163c84eb27ceffbdb4302eef4c5d9aee8a9dae9c4e28a63956d1fbd0dbf7b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-asyncapi-2@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-asyncapi-2@npm:0.69.0"
+"@swagger-api/apidom-ns-asyncapi-2@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-asyncapi-2@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-json-schema-draft-7": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-json-schema-draft-7": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: c5b9161166ddce0be047a474e7257520a756ed3fe426b806c19122334535d07b48529be60638dd560ab6ff23899641cee1110932cad16b4bf93f8fbe8f52ca05
+  checksum: 067437e2f020a64824d6726b833e42c48776f1ebbe007552a2bf9659305a11cc1e852aa4860c529e730c792b698e77564cf8688131f6c48c63b0a230c049e030
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-4@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:0.69.0"
+"@swagger-api/apidom-ns-json-schema-draft-4@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: d308227f5849071be3481bd8d4a8dc16d0e9e99edb61250927da88ed34595d176d59792003a2a666a49585643ff659a16774826790aab718a316beda9ce617c3
+  checksum: 61d4ed9c69e7f4eeaa57cb56e789453deebc73209ecfaa9630c4ef9b90d54adb52424c877e039da266a80741521d41f3c02fd9792e244b4fec70803439b49070
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-6@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-6@npm:0.69.0"
+"@swagger-api/apidom-ns-json-schema-draft-6@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-6@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: df237753d0c9aa7d22029c22b5355310a14aa7a77aa484cc86d46850bd994db3f0901804510a6c62196e181c150e15fc7a031b97f0f45983b6f819fb7ed71ccb
+  checksum: fa37e493d6057739b1e18ba6bd21954e559185db1ea4318eed9d30cbe05e4b87c371712fdcd21bd81fccd9b94bdfda99c11f4260386764aaa95e0d8177921a7e
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-7@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-7@npm:0.69.0"
+"@swagger-api/apidom-ns-json-schema-draft-7@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-7@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-json-schema-draft-6": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-json-schema-draft-6": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: a2059092cfb1797c90b15384270df65fadd6d1e8b469350082ab46d25a1840fd05ff0bea72a8005068f77ab277a049110962a15f1fbeeac63b9c0a34d21d78c2
+  checksum: f6ae001675eb918aed498c1cc71da735463047c2f5cfadcf33746b663535ed029164a2fc8cafeabb118ab1b00a53bc93a08296f6593688c4225bf2c12b1fa2b5
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-0@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:0.69.0"
+"@swagger-api/apidom-ns-openapi-3-0@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-json-schema-draft-4": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: e53bda9fada416e23a5220dd8987b3e4082b3020e3db40c5532fdd454aaa02953d4d72223fd0372897b0a6a73b321f89e83504d60bb8b52fa4fbcdfb5f097e59
+  checksum: d876bde22b46d511ed74d0431d86f6d00e51567647e0d540288ab2965dfd7610189b1fe58f4a7accd9c83daa914ead87af572090daf2e07ef9df65c6c95e7bdd
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-1@npm:=0.69.0, @swagger-api/apidom-ns-openapi-3-1@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:0.69.0"
+"@swagger-api/apidom-ns-openapi-3-1@npm:>=0.69.2 <1.0.0, @swagger-api/apidom-ns-openapi-3-1@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
     stampit: =4.3.2
-  checksum: 7f194ebb36891655fdcd8dfe88e664e70f6efcd713ac6defc75dadefb0087d3fd0358b656dec4920d876342d23c44ff1cee034fa32cfa1f8b3d49ceba9509dbb
+  checksum: 2862f9e7855687a997658d17681cbb89531d2713d49fad9eca972c1fb904769990c019a7082aab1f5750ea9e2e4f108fb62181d1e02e2519b027742a1cd9d02b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-json@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-api-design-systems": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-api-design-systems": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-json": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: 68b43e19effd7b9c26e52381903a39fff7ef0990ad3cbcbf4aa7de01cf3454d915dc10d8f688aa0fa4405b11f1a6d8f49bc160e6b72c482fadb484bd787bdebd
+  checksum: 062ad18d3fd402008558854415c725e94d9e1941b2049e40c54cbbdd190a9435c6f105808b7b8c36e0a3f0d8232bc17b2145d32f88957ff01e649aaa03fe2d8e
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-api-design-systems-yaml@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-api-design-systems": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-api-design-systems": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: 6ded590b93087ad4b848ba4f742c6baeb35a572195d763a1ae0b479b8de4ae7d331175d5042116dab26684413ca6a58680080fb4b28ca5c66c7d72d6e624e174
+  checksum: 09deb1fe9234780c93d5cae4c25bfbe2b31e0f13726fafeeed3f79120ad3bfcf1a4ca85790b8e2ddd5d0120df4c7cd667b7ff7ba9270f07e66c56316008b90a3
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-json-2@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-json": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: c13b4ea5a603d7422ebf4dd87851a72a999c0036ff451b080cd37b96aa1b455f6483c447e4962303af52b44ac0fca3517573dfeeddbdb7f8d04cb7ff8796089f
+  checksum: 7730bf99d5c57be4b5af56701f376b4b50009e9d6ddb854fd643ea331720e12855834c869a95fca06959971879ebc7227db3f76074b56ea1ee07bb7b14bcb18a
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: f3415e86371f98e3677d22f432214f4b4e2267b80da2f505ed28d89c711fa32a627cea94040c6071e83d2ea3cf6aabc454331951d2fd3bcc138b091e78286423
+  checksum: d3de29891320bed19f0a7ab161c73a2bef34cca634119f2c71dd782f41cd7086322f5f8e80a337e07585cd723d6cf1be8b1a7e7fe98154afb79fd88027b5b44e
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-json@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-json@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-json@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-json@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
     "@swagger-api/apidom-ast": ^0.69.0
-    "@swagger-api/apidom-core": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
     "@types/ramda": =0.28.23
     node-gyp: latest
     ramda: =0.28.0
@@ -14456,77 +14703,77 @@ __metadata:
     tree-sitter: =0.20.1
     tree-sitter-json: =0.20.0
     web-tree-sitter: =0.20.7
-  checksum: e640ffbf749285f70ea4d125cbb030ff9920b011e8694e3cd5c379b3a6f3f387805c9535af7786c2bed6f0f67bfd9f6daad6eb65a64ca76b48b45f283933f4d5
+  checksum: 30fbb4fd5f2c63440b4d64577997c33c5cc9d881a9eb07a08704fcfc5171a75e7ec9e9364c7de8aac829d08bf2e48be5e7803f22f3fdca72fa58e56bd90aaed6
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-0@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-json": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: 50c61b46d16ed2a24816665ee810c295f6e82cad8a031ebc91d91aa3650bae92ddcede99ceea4346dcb69ca6edd811213018ebe8b23929012c08b425103a807d
+  checksum: 7c030340a7f9a24091dd0542377e5ea95b6c10967f9791ea065456301ac3766eb373ee402ed10766c4c215801308c7274f0dce925d4cab4b38b02bd3e2d58ed3
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-json-3-1@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-json": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: 9c657b1eb82814958ed2b2c4e710a51378cbb11ca6957d0cc57ec544e0cba4a3bac412475f923e47c1fff8130f5a42cf8edcd99080703316150de8f1b30891b8
+  checksum: b7535677eae57c5e4b6eadb834b17606e3bd4702e3753bdf4daaa675fbd1609691f3a76c355f6d8ad8e58a82d7f2e6089d0cff59edc3de7e5a505abf81f568f4
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: ee32fc65e053ccda7eae265ad1a43e5acd0688460620912363156ada3babf3115fbec0dd35423ca633aaf78e9e4ed71ee4be030385cfdcc9ed69e8438319cc19
+  checksum: f8129919930c6f79e7ff16a7eef0f58d1f585d4df3c69c52cebd2fb21fdde58be0192ac4a1a16ba4e0efc6e5aee4adcd34c63c726dc71b88f154b8ce785fcd2b
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.2
     "@types/ramda": =0.28.23
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
-  checksum: c21f6ad4b149f64bb5af24d7d7ba5bd8342c2ab2e0e37d85617ca0d4d3333ee45a4603ce7cdca460d4dcb17c6d41b47f733390d3ef6754664ae11705a628fe9c
+  checksum: fc9772e9e6028a67c089806207a289ac585b5c6ab4645377467fbf3d5c6f6f01d2ccddeb9324e5faca7495a2efb09f8d04570bf22acde58cecca682edc75d420
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-parser-adapter-yaml-1-2@npm:^0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-parser-adapter-yaml-1-2@npm:0.69.0"
+"@swagger-api/apidom-parser-adapter-yaml-1-2@npm:^0.69.2":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-parser-adapter-yaml-1-2@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
     "@swagger-api/apidom-ast": ^0.69.0
-    "@swagger-api/apidom-core": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
     "@types/ramda": =0.28.23
     node-gyp: latest
     ramda: =0.28.0
@@ -14535,33 +14782,33 @@ __metadata:
     tree-sitter: =0.20.1
     tree-sitter-yaml: =0.5.0
     web-tree-sitter: =0.20.7
-  checksum: 6067347f6ab9d2cfbbe55f13345609c86b1660bebb7cea215c90739eab011498695d785bc7bb75fc95055ea98bafc765bbc0d304ad19f72647b72ee4308d249e
+  checksum: 9d4fb2638e84e756ce01b9115956885c6f00ecdfe745af105ba4328b6092b4073cf1dcbc7cf33e420a5c4191ce7a4173fc8b0abc7dcb22d8af4a10ac62818ec6
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-reference@npm:=0.69.0":
-  version: 0.69.0
-  resolution: "@swagger-api/apidom-reference@npm:0.69.0"
+"@swagger-api/apidom-reference@npm:>=0.69.2 <1.0.0":
+  version: 0.69.2
+  resolution: "@swagger-api/apidom-reference@npm:0.69.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^0.69.0
-    "@swagger-api/apidom-json-pointer": ^0.69.0
-    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.0
-    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-api-design-systems-json": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-asyncapi-json-2": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-json": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-0": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-1": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": ^0.69.0
-    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.0
+    "@swagger-api/apidom-core": ^0.69.2
+    "@swagger-api/apidom-json-pointer": ^0.69.2
+    "@swagger-api/apidom-ns-asyncapi-2": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-0": ^0.69.2
+    "@swagger-api/apidom-ns-openapi-3-1": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-api-design-systems-json": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-asyncapi-json-2": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-json": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-0": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-1": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": ^0.69.2
+    "@swagger-api/apidom-parser-adapter-yaml-1-2": ^0.69.2
     "@types/ramda": =0.28.23
     axios: =1.3.4
-    minimatch: =7.3.0
+    minimatch: =7.4.3
     process: =0.11.10
     ramda: =0.28.0
     ramda-adjunct: =3.4.0
@@ -14595,94 +14842,96 @@ __metadata:
       optional: true
     "@swagger-api/apidom-parser-adapter-yaml-1-2":
       optional: true
-  checksum: f176e51e64377c09449e9f5bf50438be7a05fa63d4ff2f9ec5c45cf0722439537aafbe4804e2197661a652cec013c1aaa78f6a2a7ac4f6d63083aa07875c8671
+  checksum: 92bda2e2d905a184f005a9be51cbe02cbaa3791a349d9fc956bf24b3d42b9215a0d6ff036929a5104cb0402713e7b12760a4ceeda23b89e3936fbd799c8515f0
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-arm64@npm:1.3.42"
+"@swc/core-darwin-arm64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-arm64@npm:1.3.50"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-darwin-x64@npm:1.3.42"
+"@swc/core-darwin-x64@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-darwin-x64@npm:1.3.50"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.42"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.50"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.42"
+"@swc/core-linux-arm64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.42"
+"@swc/core-linux-arm64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.50"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.42"
+"@swc/core-linux-x64-gnu@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.42"
+"@swc/core-linux-x64-musl@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.50"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.42"
+"@swc/core-win32-arm64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.42"
+"@swc/core-win32-ia32-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.42":
-  version: 1.3.42
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.42"
+"@swc/core-win32-x64-msvc@npm:1.3.50":
+  version: 1.3.50
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.50"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.3.9":
-  version: 1.3.42
-  resolution: "@swc/core@npm:1.3.42"
+"@swc/core@npm:^1.3.46":
+  version: 1.3.50
+  resolution: "@swc/core@npm:1.3.50"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.42
-    "@swc/core-darwin-x64": 1.3.42
-    "@swc/core-linux-arm-gnueabihf": 1.3.42
-    "@swc/core-linux-arm64-gnu": 1.3.42
-    "@swc/core-linux-arm64-musl": 1.3.42
-    "@swc/core-linux-x64-gnu": 1.3.42
-    "@swc/core-linux-x64-musl": 1.3.42
-    "@swc/core-win32-arm64-msvc": 1.3.42
-    "@swc/core-win32-ia32-msvc": 1.3.42
-    "@swc/core-win32-x64-msvc": 1.3.42
+    "@swc/core-darwin-arm64": 1.3.50
+    "@swc/core-darwin-x64": 1.3.50
+    "@swc/core-linux-arm-gnueabihf": 1.3.50
+    "@swc/core-linux-arm64-gnu": 1.3.50
+    "@swc/core-linux-arm64-musl": 1.3.50
+    "@swc/core-linux-x64-gnu": 1.3.50
+    "@swc/core-linux-x64-musl": 1.3.50
+    "@swc/core-win32-arm64-msvc": 1.3.50
+    "@swc/core-win32-ia32-msvc": 1.3.50
+    "@swc/core-win32-x64-msvc": 1.3.50
+  peerDependencies:
+    "@swc/helpers": ^0.5.0
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -14704,28 +14953,31 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  checksum: 5c28c03ee6a4e1f630c4a519b56d7e23a0102f70fad977a3ab144a3da96231cf4849e473cdc9ee7be6b9266ba0838d0bc0b6b3575a75540f302befe96cc9606e
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 63364c0bf6f395a57b576c4f7c5f79542a7c018c7bcc121e1bccdb157ca3ead97ee30920cf5ec6e93b0bd58e0145cb388721d7862ede867927137a437b4ef21a
   languageName: node
   linkType: hard
 
-"@swc/helpers@npm:^0.4.7":
-  version: 0.4.14
-  resolution: "@swc/helpers@npm:0.4.14"
+"@swc/helpers@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@swc/helpers@npm:0.5.0"
   dependencies:
     tslib: ^2.4.0
-  checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5
+  checksum: 61c9c7dddb707deb58b85328cfe9d211887145f1311ae6a6e6c0fa9f781fb29916a8669a7d479e46e26a32a89d6ef4f293a22dee4925e009c84051e9dd10e8b7
   languageName: node
   linkType: hard
 
 "@swc/jest@npm:^0.2.22":
-  version: 0.2.24
-  resolution: "@swc/jest@npm:0.2.24"
+  version: 0.2.26
+  resolution: "@swc/jest@npm:0.2.26"
   dependencies:
     "@jest/create-cache-key-function": ^27.4.2
     jsonc-parser: ^3.2.0
   peerDependencies:
     "@swc/core": "*"
-  checksum: 3558213098970cc2882b1f2d1299e78ccea2e18e1e4a4c1820bb669b969ced648eacb14eb78b0bc6fe66e4a60816a7ad7a72c5048ece8382647b8ceac82b708a
+  checksum: 771821ed08cf168ca0b6307dee7689253d0af0685acd08408ac431860a7c42ace892db2cb6bb6dcfe297edbdce0f2e22d44ed4ed72d1c621be9e841cffd408a0
   languageName: node
   linkType: hard
 
@@ -14813,18 +15065,18 @@ __metadata:
   linkType: hard
 
 "@testing-library/dom@npm:^8.0.0, @testing-library/dom@npm:^8.1.0":
-  version: 8.11.3
-  resolution: "@testing-library/dom@npm:8.11.3"
+  version: 8.20.0
+  resolution: "@testing-library/dom@npm:8.20.0"
   dependencies:
     "@babel/code-frame": ^7.10.4
     "@babel/runtime": ^7.12.5
-    "@types/aria-query": ^4.2.0
+    "@types/aria-query": ^5.0.1
     aria-query: ^5.0.0
     chalk: ^4.1.0
     dom-accessibility-api: ^0.5.9
     lz-string: ^1.4.4
     pretty-format: ^27.0.2
-  checksum: 2245d254b6058590e25de86fb7b3c75e4a31096901a191f80d3efb9fa7e1e273043416f370c8770feb9f3ccc73a1550a877a3b003b593f1728ae828fcb52cd62
+  checksum: 1e599129a2fe91959ce80900a0a4897232b89e2a8e22c1f5950c36d39c97629ea86b4986b60b173b5525a05de33fde1e35836ea597b03de78cc51b122835c6f0
   languageName: node
   linkType: hard
 
@@ -14995,10 +15247,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/aria-query@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@types/aria-query@npm:4.2.0"
-  checksum: e4a3748c5511deb88e93c6faf2acb0730233ff75018e9aaed95e3d2833880e9d0eda7e08e4315a827872471779471585671d08bae00ac8b9813fc140194b52e5
+"@types/aria-query@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@types/aria-query@npm:5.0.1"
+  checksum: 69fd7cceb6113ed370591aef04b3fd0742e9a1b06dd045c43531448847b85de181495e4566f98e776b37c422a12fd71866e0a1dfd904c5ec3f84d271682901de
   languageName: node
   linkType: hard
 
@@ -15883,9 +16135,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.185
-  resolution: "@types/lodash@npm:4.14.185"
-  checksum: f81d13da5ecab110ca9c5c7cc2bedc3c9802a6acf668576aecd1b8f4b134ed81d06c15f1e600fb08f05975098280a0d97d30cddfc2cb39ec1c6b56e971ca53b3
+  version: 4.14.194
+  resolution: "@types/lodash@npm:4.14.194"
+  checksum: 113f34831c461469d91feca2dde737f88487732898b4d25e9eb23b087bb193985f864d1e1e0f3b777edc5022e460443588b6000a3b2348c966f72d17eedc35ea
   languageName: node
   linkType: hard
 
@@ -16021,12 +16273,12 @@ __metadata:
   linkType: hard
 
 "@types/node-fetch@npm:^2.5.0, @types/node-fetch@npm:^2.5.12, @types/node-fetch@npm:^2.5.7, @types/node-fetch@npm:^2.6.1":
-  version: 2.6.2
-  resolution: "@types/node-fetch@npm:2.6.2"
+  version: 2.6.3
+  resolution: "@types/node-fetch@npm:2.6.3"
   dependencies:
     "@types/node": "*"
     form-data: ^3.0.0
-  checksum: 6f73b1470000d303d25a6fb92875ea837a216656cb7474f66cdd67bb014aa81a5a11e7ac9c21fe19bee9ecb2ef87c1962bceeaec31386119d1ac86e4c30ad7a6
+  checksum: b68cda58e91535a42dd5337932443c37f8e198ca1e8deeb95bd92a64a9a84d92071867b91c5eb84ee8e13f33d45a70549fe2bc11dd070a894dd561909f4d39f5
   languageName: node
   linkType: hard
 
@@ -16040,9 +16292,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0, @types/node@npm:^18.11.17":
-  version: 18.11.19
-  resolution: "@types/node@npm:18.11.19"
-  checksum: d7cd19fcfc59cbdd3f9ba0b4072cb7adc21bd575bd8eb7d7e698975e63564aaa83f03434f32b12331f84f73d0b369d9cbe2371e359d9d7f5c3361f4987f4f7da
+  version: 18.15.11
+  resolution: "@types/node@npm:18.15.11"
+  checksum: 977b4ad04708897ff0eb049ecf82246d210939c82461922d20f7d2dcfd81bbc661582ba3af28869210f7e8b1934529dcd46bff7d448551400f9d48b9d3bddec3
   languageName: node
   linkType: hard
 
@@ -16061,9 +16313,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:^14.14.31":
-  version: 14.18.33
-  resolution: "@types/node@npm:14.18.33"
-  checksum: 4e23f95186d8ae1d38c999bc6b46fe94e790da88744b0a3bfeedcbd0d9ffe2cb0ff39e85f43014f6739e5270292c1a1f6f97a1fc606fd573a0c17fda9a1d42de
+  version: 14.18.42
+  resolution: "@types/node@npm:14.18.42"
+  checksum: 1c92f04a482ab54a21342b3911fc6f0093f04d3314197bc0e2f20012e9efc929c44e2ea41990b9b3cde420d7859c9ed716733f3e65c0cd6c2910a55799465f6b
   languageName: node
   linkType: hard
 
@@ -16075,9 +16327,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:^16.0.0, @types/node@npm:^16.11.26, @types/node@npm:^16.9.2":
-  version: 16.18.12
-  resolution: "@types/node@npm:16.18.12"
-  checksum: fc3271182414f8593018ef8f00b4718116a92f463f619081bd399d9460e7861e1dd7eebc7cf94c23567e418ff397babed077011711aae8d47171b5a81c5bd71d
+  version: 16.18.23
+  resolution: "@types/node@npm:16.18.23"
+  checksum: 00e51db28fc7a182747f37215b3f25400b1c7a8525e09fa14e55be5798891a118ebf636a49d3197335a3580fcb8222fd4ecc20c2ccff69f1c0d233fc5697465d
   languageName: node
   linkType: hard
 
@@ -16647,11 +16899,11 @@ __metadata:
   linkType: hard
 
 "@types/swagger-ui-react@npm:^4.1.1":
-  version: 4.11.0
-  resolution: "@types/swagger-ui-react@npm:4.11.0"
+  version: 4.18.0
+  resolution: "@types/swagger-ui-react@npm:4.18.0"
   dependencies:
     "@types/react": "*"
-  checksum: cec88ffebaba7ce576d4945c901157a4aac360a669741abb6deacdf31435af5a679154d4f9281cc178214441ed1ac2cc800bd7a8f8588d1221984bef0c16c8aa
+  checksum: fa946a76ece76cdbaf8d8dc2945d690787f67b29a9ed14d95b706b8a7fca2d4161a62eeda74ce81c09b872c23b788f86dab36607e891744c91f425b92e302cef
   languageName: node
   linkType: hard
 
@@ -16927,6 +17179,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:5.58.0":
+  version: 5.58.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.58.0"
+  dependencies:
+    "@typescript-eslint/types": 5.58.0
+    "@typescript-eslint/visitor-keys": 5.58.0
+  checksum: f0d3df5cc3c461fe63ef89ad886b53c239cc7c1d9061d83d8a9d9c8e087e5501eac84bebff8a954728c17ccea191f235686373d54d2b8b6370af2bcf2b18e062
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:5.9.0":
   version: 5.9.0
   resolution: "@typescript-eslint/scope-manager@npm:5.9.0"
@@ -16961,6 +17223,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:5.58.0":
+  version: 5.58.0
+  resolution: "@typescript-eslint/types@npm:5.58.0"
+  checksum: 8622a73d73220c4a7111537825f488c0271272032a1d4e129dc722bc6e8b3ec84f64469b2ca3b8dae7da3a9c18953ce1449af51f5f757dad60835eb579ad1d2c
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.9.0":
   version: 5.9.0
   resolution: "@typescript-eslint/types@npm:5.9.0"
@@ -16986,6 +17255,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:5.58.0":
+  version: 5.58.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.58.0"
+  dependencies:
+    "@typescript-eslint/types": 5.58.0
+    "@typescript-eslint/visitor-keys": 5.58.0
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.3.7
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 51b668ec858db0c040a71dff526273945cee4ba5a9b240528d503d02526685882d900cf071c6636a4d9061ed3fd4a7274f7f1a23fba55c4b48b143344b4009c7
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.9.0":
   version: 5.9.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.9.0"
@@ -17004,7 +17291,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.53.0, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.43.0":
+"@typescript-eslint/utils@npm:5.53.0":
   version: 5.53.0
   resolution: "@typescript-eslint/utils@npm:5.53.0"
   dependencies:
@@ -17022,6 +17309,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.58.0":
+  version: 5.58.0
+  resolution: "@typescript-eslint/utils@npm:5.58.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@types/json-schema": ^7.0.9
+    "@types/semver": ^7.3.12
+    "@typescript-eslint/scope-manager": 5.58.0
+    "@typescript-eslint/types": 5.58.0
+    "@typescript-eslint/typescript-estree": 5.58.0
+    eslint-scope: ^5.1.1
+    semver: ^7.3.7
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: c618ae67963ecf96b1492c09afaeb363f542f0d6780bcac4af3c26034e3b20034666b2d523aa94821df813aafb57a0b150a7d5c2224fe8257452ad1de2237a58
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.53.0":
   version: 5.53.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.53.0"
@@ -17032,6 +17337,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:5.58.0":
+  version: 5.58.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.58.0"
+  dependencies:
+    "@typescript-eslint/types": 5.58.0
+    eslint-visitor-keys: ^3.3.0
+  checksum: ab2d1f37660559954c840429ef78bbf71834063557e3e68e435005b4987970b9356fdf217ead53f7a57f66f5488dc478062c5c44bf17053a8bf041733539b98f
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.9.0":
   version: 5.9.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.9.0"
@@ -17042,9 +17357,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.19.10":
-  version: 4.19.10
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.19.10"
+"@uiw/codemirror-extensions-basic-setup@npm:4.19.11":
+  version: 4.19.11
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.19.11"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -17061,19 +17376,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: 2eca6545f29699bf938238f089a08c7134e04611473a338c7a59377ca1b0ebdfddb73402819921fc718c317fa52c0c473188e4dea20007e5ac68c83caaaa83f0
+  checksum: c7bc3498ace8efa29492674ed94feb3c6d941f389302696136c1509ab5e3b55e590ca9887a7883b7e4972cee921d7120d9af7f78354094ccb341a72656ad8ac9
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.19.10
-  resolution: "@uiw/react-codemirror@npm:4.19.10"
+  version: 4.19.11
+  resolution: "@uiw/react-codemirror@npm:4.19.11"
   dependencies:
     "@babel/runtime": ^7.18.6
     "@codemirror/commands": ^6.1.0
     "@codemirror/state": ^6.1.1
     "@codemirror/theme-one-dark": ^6.0.0
-    "@uiw/codemirror-extensions-basic-setup": 4.19.10
+    "@uiw/codemirror-extensions-basic-setup": 4.19.11
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -17083,7 +17398,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 3210787e4ec717c1945ef31b8a7f066bc1b326da6e63f295f8bb790aa200359151e791ebc3420afbf9f615c03509a17fae62f4ab7eaeb1dec51f074a26ac9e08
+  checksum: 5ff4c7d021b565bc578d0fce2f4b6761b8d55024fa3190288435d287028cc8770b8fe5b4b103a64c452eaf26ab88c8bfd25819782a4b4d7dcfd4361765e307ff
   languageName: node
   linkType: hard
 
@@ -17539,6 +17854,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ajv-draft-04@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "ajv-draft-04@npm:1.0.0"
+  peerDependencies:
+    ajv: ^8.5.0
+  peerDependenciesMeta:
+    ajv:
+      optional: true
+  checksum: 3f11fa0e7f7359bef6608657f02ab78e9cc62b1fb7bdd860db0d00351b3863a1189c1a23b72466d2d82726cab4eb20725c76f5e7c134a89865e2bfd0e6828137
+  languageName: node
+  linkType: hard
+
 "ajv-formats@npm:^2.1.1":
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
@@ -17585,7 +17912,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.12.0, ajv@npm:^8.8.0":
+"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.12.0, ajv@npm:^8.6.3, ajv@npm:^8.8.0":
   version: 8.12.0
   resolution: "ajv@npm:8.12.0"
   dependencies:
@@ -18209,12 +18536,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:0.26.1":
-  version: 0.26.1
-  resolution: "axios@npm:0.26.1"
+"axios@npm:0.27.2, axios@npm:^0.27.2":
+  version: 0.27.2
+  resolution: "axios@npm:0.27.2"
   dependencies:
-    follow-redirects: ^1.14.8
-  checksum: d9eb58ff4bc0b36a04783fc9ff760e9245c829a5a1052ee7ca6013410d427036b1d10d04e7380c02f3508c5eaf3485b1ae67bd2adbfec3683704745c8d7a6e1a
+    follow-redirects: ^1.14.9
+    form-data: ^4.0.0
+  checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
   languageName: node
   linkType: hard
 
@@ -18238,16 +18566,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.27.2":
-  version: 0.27.2
-  resolution: "axios@npm:0.27.2"
-  dependencies:
-    follow-redirects: ^1.14.9
-    form-data: ^4.0.0
-  checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
-  languageName: node
-  linkType: hard
-
 "axobject-query@npm:^3.1.1":
   version: 3.1.1
   resolution: "axobject-query@npm:3.1.1"
@@ -18589,13 +18907,13 @@ __metadata:
   linkType: hard
 
 "better-sqlite3@npm:^8.0.0":
-  version: 8.2.0
-  resolution: "better-sqlite3@npm:8.2.0"
+  version: 8.3.0
+  resolution: "better-sqlite3@npm:8.3.0"
   dependencies:
     bindings: ^1.5.0
     node-gyp: latest
     prebuild-install: ^7.1.0
-  checksum: ab8a00bcc33c4a7467f78fcbb103c784705cf170ecc9c8eb1149a89a2153c03a7f65681064667eb214fa7f555797abd8183380a0396ce04eaf36efef921ce103
+  checksum: 00fc9f12058d2d157f56fe57b0f5c8ba705aee22a1dfe33ef8f60755531eda8f809cdb2377af314f6ed9396ad036094576e0596649bd6ca5bcaec172613e2dc9
   languageName: node
   linkType: hard
 
@@ -20131,10 +20449,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:4.1.3":
-  version: 4.1.3
-  resolution: "compare-versions@npm:4.1.3"
-  checksum: 54460756ab2d62f8a9d672db249b248fec7ca41c3e8ed242925e2f2257793ad3e83cecb2cdfd60b46a3aabc962a3a4cbf37a4b928c8f30517822d2bde937a3d1
+"compare-versions@npm:4.1.4":
+  version: 4.1.4
+  resolution: "compare-versions@npm:4.1.4"
+  checksum: c1617544b79c2f36a1d543c50efd0da1a994040294c8923218080bc0df46da83ca414e3378282e93cab073744995124946417d130d8987e8efb5d1a73c0c4ba6
   languageName: node
   linkType: hard
 
@@ -21918,10 +22236,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:=2.3.10":
-  version: 2.3.10
-  resolution: "dompurify@npm:2.3.10"
-  checksum: ee343876b4c065e82d194818c66af76a6d2290264c7db583ad71761c11781fd626f0245f9f4670175d5707c4b8fcfb89adae80bed0418a9426a47ee7f36b0ffc
+"dompurify@npm:=3.0.1":
+  version: 3.0.1
+  resolution: "dompurify@npm:3.0.1"
+  checksum: 19447e6d96415a8ad3a67bc9c76ffe671eb31cf7c1e0a538cbe5037c8b8b03afe144d64cf96c6e0f7fe63b83721a33b5b913394d20a85e96550e42e31f7c086b
   languageName: node
   linkType: hard
 
@@ -22890,13 +23208,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-cypress@npm:^2.10.3":
-  version: 2.12.1
-  resolution: "eslint-plugin-cypress@npm:2.12.1"
+  version: 2.13.2
+  resolution: "eslint-plugin-cypress@npm:2.13.2"
   dependencies:
     globals: ^11.12.0
   peerDependencies:
     eslint: ">= 3.2.1"
-  checksum: 1f1c36e149304e9a6f58e2292a761abad58274da33b3a48b24ad55ad20cbce3ac7467321f2b6fcb052f9563c89f67004de4766eba2e2bdbcb010a6a0666989cf
+  checksum: 81cc425cfced563cf50ad2553f887e20a39fe179275e95408c53989bcf8f65f0fac648b429d006130c84221edf99eada663a2c6419eb837bf81ece3d18998cf5
   languageName: node
   linkType: hard
 
@@ -23030,13 +23348,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-testing-library@npm:^5.9.1":
-  version: 5.10.2
-  resolution: "eslint-plugin-testing-library@npm:5.10.2"
+  version: 5.10.3
+  resolution: "eslint-plugin-testing-library@npm:5.10.3"
   dependencies:
-    "@typescript-eslint/utils": ^5.43.0
+    "@typescript-eslint/utils": ^5.58.0
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 3b2b330e62f4a6dc438050006f0d0c97605f6861828b153271dc6d2fafb1e60f4e86fbaa8166c7afd452e3b6cad39413738fd4c8e2eb2def1915c678154676da
+  checksum: 3033121a0040b98280cd41856273ad1b268f56083759401e7af72ac8a96dcb213892f1248983aa9a18988b44913263e93f0d182dbb0c5b27b00242bfffc9cdcc
   languageName: node
   linkType: hard
 
@@ -23078,10 +23396,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "eslint-visitor-keys@npm:3.3.0"
-  checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808
+"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "eslint-visitor-keys@npm:3.4.0"
+  checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c
   languageName: node
   linkType: hard
 
@@ -23102,10 +23420,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.33.0, eslint@npm:^8.6.0":
-  version: 8.33.0
-  resolution: "eslint@npm:8.33.0"
+  version: 8.38.0
+  resolution: "eslint@npm:8.38.0"
   dependencies:
-    "@eslint/eslintrc": ^1.4.1
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.4.0
+    "@eslint/eslintrc": ^2.0.2
+    "@eslint/js": 8.38.0
     "@humanwhocodes/config-array": ^0.11.8
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
@@ -23116,10 +23437,9 @@ __metadata:
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
     eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.4.0
-    esquery: ^1.4.0
+    eslint-visitor-keys: ^3.4.0
+    espree: ^9.5.1
+    esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
     file-entry-cache: ^6.0.1
@@ -23140,13 +23460,12 @@ __metadata:
     minimatch: ^3.1.2
     natural-compare: ^1.4.0
     optionator: ^0.9.1
-    regexpp: ^3.2.0
     strip-ansi: ^6.0.1
     strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 727e63ab8b7acf281442323c5971f6afdd5b656fbcebc4476cf54e35af51b2f180617433fc5e1952f0449ca3f43a905527f9407ea4b8a7ea7562fc9c3f278d4c
+  checksum: 73b6d9b650d0434aa7c07d0a1802f099b086ee70a8d8ba7be730439a26572a5eb71def12125c82942be2ec8ee5be38a6f1b42a13e40d4b67f11a148ec9e263eb
   languageName: node
   linkType: hard
 
@@ -23157,14 +23476,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.0.0, espree@npm:^9.4.0":
-  version: 9.4.0
-  resolution: "espree@npm:9.4.0"
+"espree@npm:^9.0.0, espree@npm:^9.5.1":
+  version: 9.5.1
+  resolution: "espree@npm:9.5.1"
   dependencies:
     acorn: ^8.8.0
     acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c
+    eslint-visitor-keys: ^3.4.0
+  checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88
   languageName: node
   linkType: hard
 
@@ -23178,12 +23497,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "esquery@npm:1.4.0"
+"esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
   dependencies:
     estraverse: ^5.1.0
-  checksum: a0807e17abd7fbe5fbd4fab673038d6d8a50675cdae6b04fbaa520c34581be0c5fa24582990e8acd8854f671dd291c78bb2efb9e0ed5b62f33bac4f9cf820210
+  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
   languageName: node
   linkType: hard
 
@@ -23381,6 +23700,7 @@ __metadata:
     "@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:^"
@@ -23442,8 +23762,12 @@ __metadata:
     "@backstage/backend-defaults": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-app-backend": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-catalog-backend": "workspace:^"
     "@backstage/plugin-kubernetes-backend": "workspace:^"
+    "@backstage/plugin-permission-backend": "workspace:^"
+    "@backstage/plugin-permission-common": "workspace:^"
+    "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/plugin-scaffolder-backend": "workspace:^"
     "@backstage/plugin-search-backend": "workspace:^"
     "@backstage/plugin-search-backend-module-catalog": "workspace:^"
@@ -24241,7 +24565,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
   version: 1.15.2
   resolution: "follow-redirects@npm:1.15.2"
   peerDependenciesMeta:
@@ -24457,17 +24781,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:10.0.1":
-  version: 10.0.1
-  resolution: "fs-extra@npm:10.0.1"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: c1faaa5eb9e1c5c7c7ff09f966e93922ecb068ae1b04801cfc983ef05fcc1f66bfbb8d8d0b745c910014c7a2e7317fb6cf3bfe7390450c1157e3cc1a218f221d
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:10.1.0, fs-extra@npm:^10.0.0, fs-extra@npm:^10.0.1":
   version: 10.1.0
   resolution: "fs-extra@npm:10.1.0"
@@ -25025,9 +25338,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-gax@npm:^3.5.2, google-gax@npm:^3.5.7":
-  version: 3.5.7
-  resolution: "google-gax@npm:3.5.7"
+"google-gax@npm:^3.5.7, google-gax@npm:^3.5.8":
+  version: 3.6.0
+  resolution: "google-gax@npm:3.6.0"
   dependencies:
     "@grpc/grpc-js": ~1.8.0
     "@grpc/proto-loader": ^0.7.0
@@ -25041,13 +25354,13 @@ __metadata:
     node-fetch: ^2.6.1
     object-hash: ^3.0.0
     proto3-json-serializer: ^1.0.0
-    protobufjs: 7.2.2
+    protobufjs: 7.2.3
     protobufjs-cli: 1.1.1
     retry-request: ^5.0.0
   bin:
     compileProtos: build/tools/compileProtos.js
     minifyProtoJson: build/tools/minify.js
-  checksum: 1f3c647fc1ddc00a6a017be0f83b89691997358720763db13a69a94c7a74f6d31a49b0fd56f7bab18689914c784328901b118bdf150d742719995c705d0fa65d
+  checksum: 4c7b1b5a278ffda3eaa92e7f25a9e0ea2d0a76aca704aca4baee4fe9d109916e97e83062ad751006ed93ac675a7fd74028061204fa9ed92833a853e6657a71a1
   languageName: node
   linkType: hard
 
@@ -25255,11 +25568,11 @@ __metadata:
   linkType: hard
 
 "graphql-ws@npm:^5.4.1, graphql-ws@npm:^5.9.0":
-  version: 5.12.0
-  resolution: "graphql-ws@npm:5.12.0"
+  version: 5.12.1
+  resolution: "graphql-ws@npm:5.12.1"
   peerDependencies:
     graphql: ">=0.11 <=16"
-  checksum: 5c683e2d5bdadfcfec0639eda69b8a66ef275e68e64f662bd75da6779a87b34395cbce8e37cb66830a9febca1871f7dc2575e6814f6f6e899904fe72e245f216
+  checksum: 88d587c431feba681957faecd96101bb3860e1a4765f34b8cae1c514e7f98754b5f31c6b3127775e4732f26883b0802fe426bf9f7031c16cd0b25a27ad90ec9c
   languageName: node
   linkType: hard
 
@@ -26197,29 +26510,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:8.2.2":
-  version: 8.2.2
-  resolution: "inquirer@npm:8.2.2"
-  dependencies:
-    ansi-escapes: ^4.2.1
-    chalk: ^4.1.1
-    cli-cursor: ^3.1.0
-    cli-width: ^3.0.0
-    external-editor: ^3.0.3
-    figures: ^3.0.0
-    lodash: ^4.17.21
-    mute-stream: 0.0.8
-    ora: ^5.4.1
-    run-async: ^2.4.0
-    rxjs: ^7.5.5
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-    through: ^2.3.6
-  checksum: 69a2cf32f51af0e94dd66c597fdca42b890ff521b537dbfe1fd532c19a751d54893b7896523691ec30357f6212a80a2417fec7bf34411f369bbf151bdbc95ae9
-  languageName: node
-  linkType: hard
-
-"inquirer@npm:^8.0.0, inquirer@npm:^8.2.0":
+"inquirer@npm:8.2.5, inquirer@npm:^8.0.0, inquirer@npm:^8.2.0":
   version: 8.2.5
   resolution: "inquirer@npm:8.2.5"
   dependencies:
@@ -28217,6 +28508,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-schema-to-ts@npm:^2.6.2":
+  version: 2.7.2
+  resolution: "json-schema-to-ts@npm:2.7.2"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    "@types/json-schema": ^7.0.9
+    ts-algebra: ^1.2.0
+  checksum: cc359d3b2aed035b550582e85989a6fdd4d54bbfd5a2933c9a1e242709a04a7babdba53f5c22280e11b4bd9730b08a933d060fc69810814310908cce76f9e152
+  languageName: node
+  linkType: hard
+
 "json-schema-traverse@npm:^0.4.1":
   version: 0.4.1
   resolution: "json-schema-traverse@npm:0.4.1"
@@ -28769,6 +29071,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"kubernetes-models@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "kubernetes-models@npm:4.1.0"
+  dependencies:
+    "@kubernetes-models/apimachinery": ^1.1.0
+    "@kubernetes-models/base": ^4.0.0
+    "@kubernetes-models/validate": ^3.0.0
+    tslib: ^2.4.0
+  checksum: 1c3195a78ca422a6436f9c4143288a4d29f53b75ff597d72f44cc7f274714daab40a5bb99dd13e02edf3ce11a41f1df34d3d0bb1930b6401cc21c44666ad2b6b
+  languageName: node
+  linkType: hard
+
 "kuler@npm:^2.0.0":
   version: 2.0.0
   resolution: "kuler@npm:2.0.0"
@@ -28965,8 +29279,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^13.0.0":
-  version: 13.2.0
-  resolution: "lint-staged@npm:13.2.0"
+  version: 13.2.1
+  resolution: "lint-staged@npm:13.2.1"
   dependencies:
     chalk: 5.2.0
     cli-truncate: ^3.1.0
@@ -28983,7 +29297,7 @@ __metadata:
     yaml: ^2.2.1
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: dcaa8fbbde567eb8ac27230a18b3a22f30c278c524c0e27cf7d4110d662d5d33ed68a585a2e1b05075ef1c262e853f557a5ae046188b723603246d63e6b9f07b
+  checksum: 5788d3fe38e69b7f7b7f700284d4e10738978a0916bc77d3f6253c43a030fc4f01f89c09da349fb658f929f3393d8b1e3eaabaac5b604416ebc33476640b51ce
   languageName: node
   linkType: hard
 
@@ -29508,10 +29822,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"luxon@npm:^3.0.0, luxon@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "luxon@npm:3.2.1"
-  checksum: 3fa3def2c5f5d3032b4c46220c4da8aeb467ac979888fc9d2557adcd22195f93516b4ad5909a75862bec8dc6ddc0953b0f38e6d2f4a8ab8450ddc531a83cf20d
+"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "luxon@npm:3.3.0"
+  checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187
   languageName: node
   linkType: hard
 
@@ -29694,7 +30008,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"markdown-to-jsx@npm:^7.1.9":
+"markdown-to-jsx@npm:^7.2.0":
   version: 7.2.0
   resolution: "markdown-to-jsx@npm:7.2.0"
   peerDependencies:
@@ -30557,12 +30871,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:=7.3.0":
-  version: 7.3.0
-  resolution: "minimatch@npm:7.3.0"
+"minimatch@npm:=7.4.3":
+  version: 7.4.3
+  resolution: "minimatch@npm:7.4.3"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: c4d9af992958339d5fc593c9ce496f4b9615597e57cdd663e57bd3a745ebd208c2bba19c3290c25ed8dcf259586fa1f68e4e1acf304f8694927b84c5381167d0
+  checksum: daa954231b6859e3ba0e5fbd2486986d3cae283bb69acb7ed3833c84a293f8d7edb8514360ea62c01426ba791446b2a1e1cc0d718bed15c0212cef35c59a6b95
   languageName: node
   linkType: hard
 
@@ -30747,7 +31061,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:^2.27.0, moment@npm:^2.29.1":
+"moment@npm:^2.29.1":
   version: 2.29.4
   resolution: "moment@npm:2.29.4"
   checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
@@ -31598,8 +31912,8 @@ __metadata:
   linkType: hard
 
 "nunjucks@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "nunjucks@npm:3.2.3"
+  version: 3.2.4
+  resolution: "nunjucks@npm:3.2.4"
   dependencies:
     a-sync-waterfall: ^1.0.0
     asap: ^2.0.3
@@ -31611,7 +31925,7 @@ __metadata:
       optional: true
   bin:
     nunjucks-precompile: bin/precompile
-  checksum: 9d0125acf917166675af2d9b5d525b6d3edaba68ec6f8c92edee8ad05140cfa8aef12feb46f4c3da52ed2836cadfb9d26fbf1fa9d9be6bef4660d03ce1e89dbe
+  checksum: 8b902a9deb9ff0f5c9ebbd2c7f96dfe5800bf42bdfc91d8f829fc0440ec1f87901593e20479f5ba1bddcc9f2472b16a5e932be5863dcdec0899a27c01a03df32
   languageName: node
   linkType: hard
 
@@ -31643,13 +31957,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-hash@npm:3.0.0, object-hash@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "object-hash@npm:3.0.0"
-  checksum: 80b4904bb3857c52cc1bfd0b52c0352532ca12ed3b8a6ff06a90cd209dfda1b95cee059a7625eb9da29537027f68ac4619363491eedb2f5d3dddbba97494fd6c
-  languageName: node
-  linkType: hard
-
 "object-hash@npm:^2.0.1":
   version: 2.2.0
   resolution: "object-hash@npm:2.2.0"
@@ -31657,6 +31964,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-hash@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "object-hash@npm:3.0.0"
+  checksum: 80b4904bb3857c52cc1bfd0b52c0352532ca12ed3b8a6ff06a90cd209dfda1b95cee059a7625eb9da29537027f68ac4619363491eedb2f5d3dddbba97494fd6c
+  languageName: node
+  linkType: hard
+
 "object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
@@ -31874,6 +32188,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"openapi3-ts@npm:^3.1.2":
+  version: 3.2.0
+  resolution: "openapi3-ts@npm:3.2.0"
+  dependencies:
+    yaml: ^2.2.1
+  checksum: 8796a29a1363bc892ba1acb3ddffd9e6b80e8f83cbfad4cd507262e957317139cac2528ab4b14c1b30bf350ebc9cc4c43ad32a89da4d7c4b85f7e815ffba3ebe
+  languageName: node
+  linkType: hard
+
 "openid-client@npm:^5.2.1, openid-client@npm:^5.3.0":
   version: 5.4.0
   resolution: "openid-client@npm:5.4.0"
@@ -33790,9 +34113,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"protobufjs@npm:7.2.2, protobufjs@npm:^7.0.0":
-  version: 7.2.2
-  resolution: "protobufjs@npm:7.2.2"
+"protobufjs@npm:7.2.3, protobufjs@npm:^7.0.0":
+  version: 7.2.3
+  resolution: "protobufjs@npm:7.2.3"
   dependencies:
     "@protobufjs/aspromise": ^1.1.2
     "@protobufjs/base64": ^1.1.2
@@ -33806,7 +34129,7 @@ __metadata:
     "@protobufjs/utf8": ^1.1.0
     "@types/node": ">=13.7.0"
     long: ^5.0.0
-  checksum: 86166e8f3e46789fa4d117ae72c17356db36bf87c0e0710d224be32e543b1c378a94e66dc2b1de5af45edfc25f56acfc7e688c50c956426a3ae97bc474f4445c
+  checksum: 9afa6de5fced0139a5180c063718508fac3ea734a9f1aceb99712367b15473a83327f91193f16b63540f9112b09a40912f5f0441a9b0d3f3c6a1c7f707d78249
   languageName: node
   linkType: hard
 
@@ -34427,8 +34750,8 @@ __metadata:
   linkType: hard
 
 "react-markdown@npm:^8.0.0":
-  version: 8.0.6
-  resolution: "react-markdown@npm:8.0.6"
+  version: 8.0.7
+  resolution: "react-markdown@npm:8.0.7"
   dependencies:
     "@types/hast": ^2.0.0
     "@types/prop-types": ^15.0.0
@@ -34448,7 +34771,7 @@ __metadata:
   peerDependencies:
     "@types/react": ">=16"
     react: ">=16"
-  checksum: 59fd5dcd089df0cd9098755e3063d8fcf4b4635b1ac2d5e05fcda9923769724476396abdf2afb80fb8e7589a951deac50d6f89c4740d5ec6decd34076122c80c
+  checksum: 0f3e570975134a3382c3fe5189e04e742ae154941463bdfaab2293319da1f1585cb9b75b6f07d99f514c4d728d69cc1af3c96ab37df90003b3bcc210dd0001ba
   languageName: node
   linkType: hard
 
@@ -35863,12 +36186,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.5.5":
-  version: 7.5.5
-  resolution: "rxjs@npm:7.5.5"
+"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":
+  version: 7.8.0
+  resolution: "rxjs@npm:7.8.0"
   dependencies:
     tslib: ^2.1.0
-  checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6
+  checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2
   languageName: node
   linkType: hard
 
@@ -35881,15 +36204,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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":
-  version: 7.8.0
-  resolution: "rxjs@npm:7.8.0"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2
-  languageName: node
-  linkType: hard
-
 "sade@npm:^1.7.3":
   version: 1.8.1
   resolution: "sade@npm:1.8.1"
@@ -37637,15 +37951,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swagger-client@npm:^3.19.1":
-  version: 3.19.2
-  resolution: "swagger-client@npm:3.19.2"
+"swagger-client@npm:^3.19.5":
+  version: 3.19.6
+  resolution: "swagger-client@npm:3.19.6"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.13
-    "@swagger-api/apidom-core": =0.69.0
-    "@swagger-api/apidom-json-pointer": =0.69.0
-    "@swagger-api/apidom-ns-openapi-3-1": =0.69.0
-    "@swagger-api/apidom-reference": =0.69.0
+    "@swagger-api/apidom-core": ">=0.69.2 <1.0.0"
+    "@swagger-api/apidom-json-pointer": ">=0.69.2 <1.0.0"
+    "@swagger-api/apidom-ns-openapi-3-1": ">=0.69.2 <1.0.0"
+    "@swagger-api/apidom-reference": ">=0.69.2 <1.0.0"
     cookie: ~0.5.0
     cross-fetch: ^3.1.5
     deepmerge: ~4.3.0
@@ -37658,13 +37972,13 @@ __metadata:
     qs: ^6.10.2
     traverse: ~0.6.6
     url: ~0.11.0
-  checksum: 9613387191b6e72afbe1e551d70646b7c74a136160d2a69ac3220cf23007175c500d3035b0c9ebf1ef0b49769a65d54cf343eb3b0c0d260c5797338776c872ba
+  checksum: de41a3cafd343f56478782cac463882305e73bd5c4298820bda2f6f35ad4bc65701e4599dbdd135f56592beebb2beca0fa5412051b52b1af8017cf981e692aa4
   languageName: node
   linkType: hard
 
 "swagger-ui-react@npm:^4.11.1":
-  version: 4.18.1
-  resolution: "swagger-ui-react@npm:4.18.1"
+  version: 4.18.2
+  resolution: "swagger-ui-react@npm:4.18.2"
   dependencies:
     "@babel/runtime-corejs3": ^7.18.9
     "@braintree/sanitize-url": =6.0.2
@@ -37672,7 +37986,7 @@ __metadata:
     classnames: ^2.3.1
     css.escape: 1.5.1
     deep-extend: 0.6.0
-    dompurify: =2.3.10
+    dompurify: =3.0.1
     ieee754: ^1.2.1
     immutable: ^3.x.x
     js-file-download: ^0.4.12
@@ -37695,7 +38009,7 @@ __metadata:
     reselect: ^4.1.5
     serialize-error: ^8.1.0
     sha.js: ^2.4.11
-    swagger-client: ^3.19.1
+    swagger-client: ^3.19.5
     url-parse: ^1.5.8
     xml: =1.0.1
     xml-but-prettier: ^1.0.1
@@ -37703,7 +38017,7 @@ __metadata:
   peerDependencies:
     react: ">=17.0.0"
     react-dom: ">=17.0.0"
-  checksum: 183e15d7ccab2ef9197b3695029b66fe1e0556c48bab10f63150feabc304492ae87529a1f1b3e0ee689d19f8b3645a168dff0f3edf421737ac7e8a2d320d26c4
+  checksum: 400a0fef6f00b82a8933a2698c12e8f9c9563debaf24901089d6bfa69408d9e1da66b2cb93abed659e4922d672c64609c67561363ab06c0d6d2577cdc670b755
   languageName: node
   linkType: hard
 
@@ -37727,13 +38041,13 @@ __metadata:
   linkType: hard
 
 "swr@npm:^2.0.0":
-  version: 2.1.2
-  resolution: "swr@npm:2.1.2"
+  version: 2.1.3
+  resolution: "swr@npm:2.1.3"
   dependencies:
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.11.0 || ^17.0.0 || ^18.0.0
-  checksum: 90010a1a1ba3ecd699f64ef5e3de9a40c291e220803e811c46fabb858d908fd74039f4a2c668cf8fd21dbb3f9d9b3d8300915292ed9933d0e4bdac1193ba8fb8
+  checksum: e983f5bd58d1564b86ebdf6117173b16d6e9368df06a7d1ff7c2f73900f1f90c877887b88bbb4c4ee70ff1c06cc272a4d0ca9190bbf1a328e57d13e4168e14ef
   languageName: node
   linkType: hard
 
@@ -38367,6 +38681,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-algebra@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "ts-algebra@npm:1.2.0"
+  checksum: 471d3a049dbceadf2355f980e4d0a4cba413b50e66f0c8fb5eece876c238f7d2a270e1c85aa9ebd04349ae70335715f8e6d87338fd8cf755d12e285e884b3d91
+  languageName: node
+  linkType: hard
+
 "ts-easing@npm:^0.2.0":
   version: 0.2.0
   resolution: "ts-easing@npm:0.2.0"
@@ -38471,10 +38792,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.3.1":
-  version: 2.3.1
-  resolution: "tslib@npm:2.3.1"
-  checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9
+"tslib@npm:2.5.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:~2.5.0":
+  version: 2.5.0
+  resolution: "tslib@npm:2.5.0"
+  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
   languageName: node
   linkType: hard
 
@@ -38485,13 +38806,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tslib@npm:2.5.0"
-  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
-  languageName: node
-  linkType: hard
-
 "tslib@npm:~2.4.0":
   version: 2.4.1
   resolution: "tslib@npm:2.4.1"
@@ -38681,12 +38995,12 @@ __metadata:
   linkType: hard
 
 "typescript@npm:~5.0.0":
-  version: 5.0.3
-  resolution: "typescript@npm:5.0.3"
+  version: 5.0.4
+  resolution: "typescript@npm:5.0.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 3cce0576d218cb4277ff8b6adfef1a706e9114a98b4261a38ad658a7642f1b274a8396394f6cbff8c0ba852996d7ed2e233e9b8431d5d55ac7c2f6fea645af02
+  checksum: 82b94da3f4604a8946da585f7d6c3025fff8410779e5bde2855ab130d05e4fd08938b9e593b6ebed165bda6ad9292b230984f10952cf82f0a0ca07bbeaa08172
   languageName: node
   linkType: hard
 
@@ -38701,12 +39015,12 @@ __metadata:
   linkType: hard
 
 "typescript@patch:typescript@~5.0.0#~builtin<compat/typescript>":
-  version: 5.0.3
-  resolution: "typescript@patch:typescript@npm%3A5.0.3#~builtin<compat/typescript>::version=5.0.3&hash=a1c5e5"
+  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: 9ec0a8eed38d46cc2c8794555b7674e413604c56c159f71b8ff21ce7f17334a44127a68724cb2ef8221ff3b19369f8f05654e8a5266621d7d962aeed889bd630
+  checksum: 6a1fe9a77bb9c5176ead919cc4a1499ee63e46b4e05bf667079f11bf3a8f7887f135aa72460a4c3b016e6e6bb65a822cb8689a6d86cbfe92d22cc9f501f09213
   languageName: node
   linkType: hard
 
@@ -38756,6 +39070,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uid@npm:2.0.1":
+  version: 2.0.1
+  resolution: "uid@npm:2.0.1"
+  dependencies:
+    "@lukeed/csprng": ^1.0.0
+  checksum: 0a3c697d8dd1f3b647afa35c411b11fd8fa2fb6dbd8a49fe109a4aa5214068c2c58781aa6e4516dfd16f0fc524fb7bba0833e9c1dc1ed3f1965b520349be9ad5
+  languageName: node
+  linkType: hard
+
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
@@ -39214,15 +39537,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:8.3.2, uuid@npm:^8.0.0, uuid@npm:^8.2.0, uuid@npm:^8.3.0, uuid@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "uuid@npm:8.3.2"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^3.3.2":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
@@ -39232,6 +39546,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^8.0.0, uuid@npm:^8.2.0, uuid@npm:^8.3.0, uuid@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "uuid@npm:8.3.2"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^9.0.0":
   version: 9.0.0
   resolution: "uuid@npm:9.0.0"
@@ -39473,14 +39796,14 @@ __metadata:
   linkType: hard
 
 "vm2@npm:^3.9.11":
-  version: 3.9.14
-  resolution: "vm2@npm:3.9.14"
+  version: 3.9.16
+  resolution: "vm2@npm:3.9.16"
   dependencies:
     acorn: ^8.7.0
     acorn-walk: ^8.2.0
   bin:
     vm2: bin/vm2
-  checksum: 1ed7481e07ce8e03055101b382bfbf0d725a5c9b9bbe8bf75f71501cb43a6bd22f6a0a151975ff7cea8cad136d47e66d64f0a3248913f6d3ca3c405db12bacc0
+  checksum: 646b45dca721acb3c8e4ae0742129f13612972387911c2475f3c06ac2b4232000cab0bdaaa65d97d6ea8dc70880e039542618b1b3d04adea79cd94803cbc4ab3
   languageName: node
   linkType: hard
 
@@ -39700,8 +40023,8 @@ __metadata:
   linkType: hard
 
 "webpack-dev-server@npm:^4.7.3":
-  version: 4.13.1
-  resolution: "webpack-dev-server@npm:4.13.1"
+  version: 4.13.2
+  resolution: "webpack-dev-server@npm:4.13.2"
   dependencies:
     "@types/bonjour": ^3.5.9
     "@types/connect-history-api-fallback": ^1.3.5
@@ -39742,7 +40065,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: f70611544b7d964a31eb3d934d7c2b376b97e6927a89e03b2e21cfa5812bb639625cd18fd350de1604ba6c455b324135523a894032f28c69d90d90682e4f3b7d
+  checksum: 9bf573abf05b0e0f1e8219820f6264e25a0f8ee6aebed3c0d0449c24a37f88b575972e0a2bec426112ee37d48c8f5090e7754aa1873206d3c9b6344a54718232
   languageName: node
   linkType: hard
 
@@ -40233,6 +40556,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
+
 "xml@npm:=1.0.1":
   version: 1.0.1
   resolution: "xml@npm:1.0.1"