diff --git a/.changeset/beige-chicken-type.md b/.changeset/beige-chicken-type.md
new file mode 100644
index 0000000000..d73500a7f9
--- /dev/null
+++ b/.changeset/beige-chicken-type.md
@@ -0,0 +1,5 @@
+---
+'yarn-plugin-backstage': patch
+---
+
+Use yarn's built-in http utilities for fetching release manifests
diff --git a/.changeset/brave-maps-deliver.md b/.changeset/brave-maps-deliver.md
new file mode 100644
index 0000000000..51b60af153
--- /dev/null
+++ b/.changeset/brave-maps-deliver.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated Dockerfile to include `backstage.json` file
diff --git a/.changeset/brave-teachers-mate.md b/.changeset/brave-teachers-mate.md
new file mode 100644
index 0000000000..22f768b441
--- /dev/null
+++ b/.changeset/brave-teachers-mate.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/backend-defaults': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Updated dependency `@opentelemetry/api` to `^1.9.0`.
diff --git a/.changeset/brown-monkeys-ring.md b/.changeset/brown-monkeys-ring.md
new file mode 100644
index 0000000000..5aaf738d38
--- /dev/null
+++ b/.changeset/brown-monkeys-ring.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+If the Backstage yarn plugin is installed, it will now be automatically updated as part of `versions:bump`.
diff --git a/.changeset/chatty-weeks-impress.md b/.changeset/chatty-weeks-impress.md
new file mode 100644
index 0000000000..21beb168e9
--- /dev/null
+++ b/.changeset/chatty-weeks-impress.md
@@ -0,0 +1,44 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Added a new Quick Start Card to `plugin-home`, which can display basic info to get users the info they need to onboard to the Catalog.
+
+```
+import { QuickStartCard } from '@backstage/plugin-home';
+<QuickStartCard
+  title="Onboarding to the Catalog"
+  modalTitle="Onboarding Quick Start"
+  docsLinkTitle="Learn more with getting started docs"
+  docsLink="https://backstage.io/docs/getting-started"
+  image={
+    <img
+      src={ContentImage}
+      alt="quick start"
+      width="100%"
+      height="100%"
+    />
+  }
+  cardDescription="Backstage system model will help you create new entities"
+  video={
+    <video
+      controls
+      preload="auto"
+      poster={"./videoPoster.png"}
+    >
+      <source src={"OnboardingDemo.mp4"} type="video/mp4" />
+    </video>
+  }
+  downloadImage={
+    <Button
+      href={QuickStartPDF}
+      target={'_blank'}
+      download={true}
+    >
+      Download infographic button
+    </Button>
+  }
+/>
+```
+
+See the [storybook examples](https://backstage.io/storybook/?path=/story/plugins-home-components-quickstartcard--default)
diff --git a/.changeset/chilled-taxis-dance.md b/.changeset/chilled-taxis-dance.md
deleted file mode 100644
index e2a5dcecee..0000000000
--- a/.changeset/chilled-taxis-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-The check for `react-dom/client` in the Jest configuration will now properly always run from the target directory.
diff --git a/.changeset/chilly-games-trade.md b/.changeset/chilly-games-trade.md
new file mode 100644
index 0000000000..259063776f
--- /dev/null
+++ b/.changeset/chilly-games-trade.md
@@ -0,0 +1,7 @@
+---
+'@backstage/backend-defaults': minor
+---
+
+Added a new `backend.health.headers` configuration that can be used to set additional headers to include in health check responses.
+
+**BREAKING CONSUMERS**: As part of this change the `createHealthRouter` function exported from `@backstage/backend-defaults/rootHttpRouter` now requires the root config service to be passed through the `config` option.
diff --git a/.changeset/cold-icons-worry.md b/.changeset/cold-icons-worry.md
new file mode 100644
index 0000000000..4e0b461b24
--- /dev/null
+++ b/.changeset/cold-icons-worry.md
@@ -0,0 +1,6 @@
+---
+'@backstage/cli': patch
+---
+
+Remove special-casing for `@types` packages when generating dependency entries
+during templating
diff --git a/.changeset/cold-jeans-stare.md b/.changeset/cold-jeans-stare.md
new file mode 100644
index 0000000000..c0356db3ad
--- /dev/null
+++ b/.changeset/cold-jeans-stare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated the template to use `@backstage/cli/config/prettier` instead of `@spotify/prettier-config`.
diff --git a/.changeset/cool-days-sparkle.md b/.changeset/cool-days-sparkle.md
new file mode 100644
index 0000000000..1dc9a76df7
--- /dev/null
+++ b/.changeset/cool-days-sparkle.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend-module-bitbucket-server': minor
+'@backstage/backend-defaults': minor
+---
+
+Throttles Bitbucket Server API calls
diff --git a/.changeset/cuddly-chicken-wink.md b/.changeset/cuddly-chicken-wink.md
new file mode 100644
index 0000000000..79843ba64d
--- /dev/null
+++ b/.changeset/cuddly-chicken-wink.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Export `PluginTokenHandler` and `pluginTokenHandlerDecoratorServiceRef` to allow for custom decoration of the plugin token handler without having to re-implement the entire handler.
diff --git a/.changeset/cuddly-schools-scream.md b/.changeset/cuddly-schools-scream.md
new file mode 100644
index 0000000000..533d3d1d4e
--- /dev/null
+++ b/.changeset/cuddly-schools-scream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Pass in a default schedule to the `GithubEntityProvider` if none is provided
diff --git a/.changeset/curly-hats-tell.md b/.changeset/curly-hats-tell.md
new file mode 100644
index 0000000000..c0e061c99b
--- /dev/null
+++ b/.changeset/curly-hats-tell.md
@@ -0,0 +1,18 @@
+---
+'@backstage/backend-defaults': minor
+'@backstage/backend-test-utils': minor
+---
+
+**BREAKING** Upgraded @keyv/redis and keyv packages to resolve a bug related to incorrect resolution of cache keys.
+
+This is a breaking change for clients using the `redis` store for cache with `useRedisSets` option set to false since cache keys will be calculated differently (without the sets:namespace: prefix). For clients with default configuration (or useRedisSets set to false) the cache keys will stay the same, but since @keyv/redis library no longer supports redis sets they won't be utilised anymore.
+
+If you were using `useRedisSets` option in configuration make sure to remove it from `app-config.yaml`:
+
+```diff
+backend:
+  cache:
+    store: redis
+    connection: redis://user:pass@cache.example.com:6379
+-   useRedisSets: false
+```
diff --git a/.changeset/cyan-rocks-divide.md b/.changeset/cyan-rocks-divide.md
new file mode 100644
index 0000000000..8576e515d8
--- /dev/null
+++ b/.changeset/cyan-rocks-divide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': minor
+---
+
+Add the integration for Azure blob storage to read the credentials to access the storage account and provide the default credential provider.
diff --git a/.changeset/cyan-trees-bow.md b/.changeset/cyan-trees-bow.md
deleted file mode 100644
index 6f23f67f55..0000000000
--- a/.changeset/cyan-trees-bow.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-events-node': patch
----
-
-Fixed an issue where subscribing to events threw an error and gave up too easily. Calling the subscribe method will cause the background polling loop to keep trying to connect to the events backend, even if the initial request fails.
-
-By default the events service will attempt to publish and subscribe to events from the events bus API in the events backend, but if it fails due to the events backend not being installed, it will bail and never try calling the API again. There is now a new `events.useEventBus` configuration and option for the `DefaultEventsService` that lets you control this behavior. You can set it to `'never'` to disabled API calls to the events backend completely, or `'always'` to never allow it to be disabled.
diff --git a/.changeset/dry-badgers-prove.md b/.changeset/dry-badgers-prove.md
new file mode 100644
index 0000000000..efd2011a7b
--- /dev/null
+++ b/.changeset/dry-badgers-prove.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Perform the by-query count inlined with the main query
diff --git a/.changeset/dry-needles-taste.md b/.changeset/dry-needles-taste.md
new file mode 100644
index 0000000000..472bc0edb3
--- /dev/null
+++ b/.changeset/dry-needles-taste.md
@@ -0,0 +1,6 @@
+---
+'@backstage/core-app-api': patch
+'@backstage/plugin-app': patch
+---
+
+The OAuth 2 client implementations will now attempt to refresh the session when the existing session doesn't have the required scopes. The previous behavior was to only try to refresh the session of it was missing, and otherwise directly request a new session. This fixes an issue where some auth providers will not return access tokens with certain scopes unless explicitly requested, leading to an auth popup even if the underlying session already had been granted the requested scopes.
diff --git a/.changeset/dull-bulldogs-learn.md b/.changeset/dull-bulldogs-learn.md
new file mode 100644
index 0000000000..0892ecb6ba
--- /dev/null
+++ b/.changeset/dull-bulldogs-learn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The user and plugin token verification in the default `AuthService` implementation will no longer forward verification errors to the caller, and instead log them as warnings.
diff --git a/.changeset/dull-ties-film.md b/.changeset/dull-ties-film.md
new file mode 100644
index 0000000000..4463d59d91
--- /dev/null
+++ b/.changeset/dull-ties-film.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': minor
+---
+
+Adds an optional columns attribute to HasSubdomainsCardProps and changes its default columns
diff --git a/.changeset/empty-bugs-deliver.md b/.changeset/empty-bugs-deliver.md
new file mode 100644
index 0000000000..5b26f4eaca
--- /dev/null
+++ b/.changeset/empty-bugs-deliver.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Export `DefaultHttpAuthService` to allow for custom token extraction logic.
diff --git a/.changeset/empty-colts-promise.md b/.changeset/empty-colts-promise.md
new file mode 100644
index 0000000000..9f7f979b98
--- /dev/null
+++ b/.changeset/empty-colts-promise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Use a join based strategy for filtering, when having small page sizes
diff --git a/.changeset/empty-ways-push.md b/.changeset/empty-ways-push.md
new file mode 100644
index 0000000000..11a67985d8
--- /dev/null
+++ b/.changeset/empty-ways-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+---
+
+Update the ElasticSearchSearchEngine translator to handle phrase searches.
diff --git a/.changeset/fast-cheetahs-deliver.md b/.changeset/fast-cheetahs-deliver.md
new file mode 100644
index 0000000000..ce87a68409
--- /dev/null
+++ b/.changeset/fast-cheetahs-deliver.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Deprecate old-backend-system `IncrementalCatalogBuilder`
diff --git a/.changeset/few-colts-train.md b/.changeset/few-colts-train.md
new file mode 100644
index 0000000000..1dc6becad1
--- /dev/null
+++ b/.changeset/few-colts-train.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-ldap': minor
+---
+
+Updated fix for ldap entity mapping which doesn't require extra config setting of dnCaseSensitive
diff --git a/.changeset/few-pillows-remember.md b/.changeset/few-pillows-remember.md
new file mode 100644
index 0000000000..8f13651a70
--- /dev/null
+++ b/.changeset/few-pillows-remember.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fixed an issue causing the `EntityOwnerPicker` to reset scrolling when more elements are loaded.
diff --git a/.changeset/fifty-countries-decide.md b/.changeset/fifty-countries-decide.md
new file mode 100644
index 0000000000..9c4553f3be
--- /dev/null
+++ b/.changeset/fifty-countries-decide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Implement `/entities` in terms of `queryEntities` to not run into memory and performance problems on large catalogs
diff --git a/.changeset/five-goats-travel.md b/.changeset/five-goats-travel.md
new file mode 100644
index 0000000000..361c530fca
--- /dev/null
+++ b/.changeset/five-goats-travel.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Log request and response metadata so it can be used for filtering log messages.
+The format of the request date was also changed from `clf` to `utc`.
diff --git a/.changeset/fluffy-cobras-sort.md b/.changeset/fluffy-cobras-sort.md
new file mode 100644
index 0000000000..363281a6c5
--- /dev/null
+++ b/.changeset/fluffy-cobras-sort.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': minor
+---
+
+Implemented `AzureBlobStorageUrlReader` to read from the url of committed location from the entity provider
diff --git a/.changeset/fluffy-falcons-shout.md b/.changeset/fluffy-falcons-shout.md
new file mode 100644
index 0000000000..7cdce8229c
--- /dev/null
+++ b/.changeset/fluffy-falcons-shout.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-auth-backend': patch
+'@backstage/plugin-auth-node': patch
+---
+
+Improved error forwarding for OAuth refresh endpoints
diff --git a/.changeset/fluffy-zebras-cheer.md b/.changeset/fluffy-zebras-cheer.md
new file mode 100644
index 0000000000..308f12d10a
--- /dev/null
+++ b/.changeset/fluffy-zebras-cheer.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-scaffolder-common': patch
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
diff --git a/.changeset/forty-apples-complain.md b/.changeset/forty-apples-complain.md
new file mode 100644
index 0000000000..5aa177a63f
--- /dev/null
+++ b/.changeset/forty-apples-complain.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-plugin-api': patch
+'@backstage/backend-app-api': patch
+---
+
+Removed unused `express` dependencies.
diff --git a/.changeset/forty-pets-wave.md b/.changeset/forty-pets-wave.md
deleted file mode 100644
index 1b96867e7d..0000000000
--- a/.changeset/forty-pets-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-module-catalog': patch
----
-
-Fixed a bug where the `filter` setting of the collator was not permitted to be an array.
diff --git a/.changeset/forty-ravens-fry.md b/.changeset/forty-ravens-fry.md
new file mode 100644
index 0000000000..8deb149441
--- /dev/null
+++ b/.changeset/forty-ravens-fry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The default `authServiceFactory` now correctly depends on the plugin scoped `Logger` services rather than the root scoped one.
diff --git a/.changeset/friendly-dots-thank.md b/.changeset/friendly-dots-thank.md
new file mode 100644
index 0000000000..50337c0a0f
--- /dev/null
+++ b/.changeset/friendly-dots-thank.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-search-backend-module-catalog': patch
+'@backstage/plugin-search-backend-module-explore': patch
+---
+
+Update README
diff --git a/.changeset/gold-crabs-agree.md b/.changeset/gold-crabs-agree.md
new file mode 100644
index 0000000000..1f345a8c10
--- /dev/null
+++ b/.changeset/gold-crabs-agree.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Use a faster count method on pg when computing some metrics
diff --git a/.changeset/gold-stingrays-cross.md b/.changeset/gold-stingrays-cross.md
new file mode 100644
index 0000000000..f2a8da99b3
--- /dev/null
+++ b/.changeset/gold-stingrays-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fix a bug where sometimes the `by-query` endpoint could return nulls for entities that were not yet stitched.
diff --git a/.changeset/gorgeous-panthers-count.md b/.changeset/gorgeous-panthers-count.md
new file mode 100644
index 0000000000..f6c05d743b
--- /dev/null
+++ b/.changeset/gorgeous-panthers-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+The --no-node-snapshot check needs to be done against process.execArgv instead of process.argv
diff --git a/.changeset/great-buttons-cross.md b/.changeset/great-buttons-cross.md
new file mode 100644
index 0000000000..02247b94bf
--- /dev/null
+++ b/.changeset/great-buttons-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-app-backend': patch
+---
+
+Fixed a bug where config would not be injected on the `/` and `/index.html` paths.
diff --git a/.changeset/green-carpets-smell.md b/.changeset/green-carpets-smell.md
new file mode 100644
index 0000000000..0cda68de22
--- /dev/null
+++ b/.changeset/green-carpets-smell.md
@@ -0,0 +1,7 @@
+---
+'@backstage/backend-plugin-api': patch
+---
+
+The `RootLifecycleService` now has a new `addBeforeShutdownHook` method, and hooks added through this method will run immediately when a termination event is received.
+
+The backend will not proceed with the shutdown and run the `Shutdown` hooks until all `BeforeShutdown` hooks have completed.
diff --git a/.changeset/green-tools-arrive.md b/.changeset/green-tools-arrive.md
deleted file mode 100644
index 78eed180d4..0000000000
--- a/.changeset/green-tools-arrive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-react': patch
----
-
-Fix issue with form state not refreshing when updating
diff --git a/.changeset/happy-forks-listen.md b/.changeset/happy-forks-listen.md
new file mode 100644
index 0000000000..4274c830f1
--- /dev/null
+++ b/.changeset/happy-forks-listen.md
@@ -0,0 +1,5 @@
+---
+'@backstage/release-manifests': patch
+---
+
+Switch to native fetch for loading release manifests
diff --git a/.changeset/healthy-lions-judge.md b/.changeset/healthy-lions-judge.md
deleted file mode 100644
index f9ead85d2e..0000000000
--- a/.changeset/healthy-lions-judge.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-auth-backend-module-aws-alb-provider': minor
-'@backstage/plugin-auth-backend': minor
----
-
-**BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
diff --git a/.changeset/healthy-years-begin.md b/.changeset/healthy-years-begin.md
new file mode 100644
index 0000000000..a1952b6648
--- /dev/null
+++ b/.changeset/healthy-years-begin.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-search': patch
+---
+
+Use Select from core-components and update Lifecycle filter to use Select instead checkboxes.
diff --git a/.changeset/heavy-needles-poke.md b/.changeset/heavy-needles-poke.md
new file mode 100644
index 0000000000..91a98a9102
--- /dev/null
+++ b/.changeset/heavy-needles-poke.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-defaults': patch
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Add task metrics as two gauges that track the last start and end timestamps as epoch seconds.
diff --git a/.changeset/heavy-tomatoes-laugh.md b/.changeset/heavy-tomatoes-laugh.md
new file mode 100644
index 0000000000..9a4740e209
--- /dev/null
+++ b/.changeset/heavy-tomatoes-laugh.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': minor
+---
+
+Service factories added by feature loaders now have lower priority and will be ignored if a factory for the same service is added directly by `backend.add(serviceFactory)`.
diff --git a/.changeset/honest-hornets-double.md b/.changeset/honest-hornets-double.md
new file mode 100644
index 0000000000..6c2bffa5af
--- /dev/null
+++ b/.changeset/honest-hornets-double.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-node': minor
+---
+
+Updated the `catalogServiceMock` return type to match both `CatalogService` and `CatalogApi`
diff --git a/.changeset/hungry-hairs-wait.md b/.changeset/hungry-hairs-wait.md
new file mode 100644
index 0000000000..ed4cd01ac7
--- /dev/null
+++ b/.changeset/hungry-hairs-wait.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Generated OpenAPI clients now support paths with tags.
diff --git a/.changeset/itchy-elephants-trade.md b/.changeset/itchy-elephants-trade.md
deleted file mode 100644
index 8ac6aaeeb9..0000000000
--- a/.changeset/itchy-elephants-trade.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-events-backend': patch
-'@backstage/plugin-events-node': patch
----
-
-Fix `events.useEventBus` by propagating config to `DefaultEventsService`
diff --git a/.changeset/itchy-rats-pump.md b/.changeset/itchy-rats-pump.md
new file mode 100644
index 0000000000..3b9073da77
--- /dev/null
+++ b/.changeset/itchy-rats-pump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Compute deltas more efficiently, which generally leads to less wasted processing cycles
diff --git a/.changeset/itchy-ravens-punch.md b/.changeset/itchy-ravens-punch.md
new file mode 100644
index 0000000000..7d4cb9cd92
--- /dev/null
+++ b/.changeset/itchy-ravens-punch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Implement `/entities/by-name/:kind/:namespace/:name` using `getEntitiesByRefs`
diff --git a/.changeset/khaki-fireants-march.md b/.changeset/khaki-fireants-march.md
deleted file mode 100644
index ec84fe1b63..0000000000
--- a/.changeset/khaki-fireants-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Added `--alwaysPack` as a replacement for the now hidden `--alwaysYarnPack` flag for the `build-workspace` command.
diff --git a/.changeset/khaki-ladybugs-swim.md b/.changeset/khaki-ladybugs-swim.md
new file mode 100644
index 0000000000..79cc1358df
--- /dev/null
+++ b/.changeset/khaki-ladybugs-swim.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-events-node': patch
+---
+
+Clarified purpose of subscriber ID in TSDoc for `EventsServiceSubscribeOptions`.
diff --git a/.changeset/khaki-shrimps-tease.md b/.changeset/khaki-shrimps-tease.md
new file mode 100644
index 0000000000..a4dd3bc8e0
--- /dev/null
+++ b/.changeset/khaki-shrimps-tease.md
@@ -0,0 +1,9 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': minor
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder-node': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Added the autocomplete feature to GitlabRepoUrlPicker
diff --git a/.changeset/large-birds-watch.md b/.changeset/large-birds-watch.md
new file mode 100644
index 0000000000..24d63492bc
--- /dev/null
+++ b/.changeset/large-birds-watch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Mock the new `RootLifecycleService.addBeforeShutdownHook` method.
diff --git a/.changeset/late-kings-wave.md b/.changeset/late-kings-wave.md
deleted file mode 100644
index 01877f2732..0000000000
--- a/.changeset/late-kings-wave.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Added a new `"rejectFrontendNetworkRequests"` configuration flag that can be set in the `"jest"` field in the root `package.json`:
-
-```json
-{
-  "jest": {
-    "rejectFrontendNetworkRequests": true
-  }
-}
-```
-
-This flag causes rejection of any form of network requests that are attempted to be made in frontend or common package tests. This flag can only be set in the root `package.json` and can not be overridden in individual package configurations.
diff --git a/.changeset/lazy-pants-attack.md b/.changeset/lazy-pants-attack.md
new file mode 100644
index 0000000000..87a5fadb45
--- /dev/null
+++ b/.changeset/lazy-pants-attack.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Fix issue with `jwks` endpoint returning invalid data with `firestore`
diff --git a/.changeset/lazy-years-float.md b/.changeset/lazy-years-float.md
new file mode 100644
index 0000000000..23bd77a0bb
--- /dev/null
+++ b/.changeset/lazy-years-float.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fix catalog filtering to allow searching entities by display name
diff --git a/.changeset/lemon-bulldogs-study.md b/.changeset/lemon-bulldogs-study.md
new file mode 100644
index 0000000000..7bb15b8193
--- /dev/null
+++ b/.changeset/lemon-bulldogs-study.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': minor
+---
+
+Consistent title behaviour across CatalogTable, CursorPaginatedCatalogTable, and OffsetPaginatedCatalogTable.
diff --git a/.changeset/loud-trainers-yawn.md b/.changeset/loud-trainers-yawn.md
deleted file mode 100644
index b48f773caa..0000000000
--- a/.changeset/loud-trainers-yawn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-The `--successCache` option for the `repo test` and `repo lint` commands now use an additive store that keeps old entries around for a week before they are cleaned up automatically.
diff --git a/.changeset/lucky-crabs-vanish.md b/.changeset/lucky-crabs-vanish.md
new file mode 100644
index 0000000000..158200fb7e
--- /dev/null
+++ b/.changeset/lucky-crabs-vanish.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-scaffolder-backend-module-github': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/create-app': patch
+---
+
+Add github backend module to create-app and improve error messages
diff --git a/.changeset/mean-shirts-design.md b/.changeset/mean-shirts-design.md
new file mode 100644
index 0000000000..ea89c6ecfd
--- /dev/null
+++ b/.changeset/mean-shirts-design.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli-node': patch
+---
+
+add PackageManager and Lockfile interfaces for future use
diff --git a/.changeset/mean-years-deliver.md b/.changeset/mean-years-deliver.md
deleted file mode 100644
index 82b4a12688..0000000000
--- a/.changeset/mean-years-deliver.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Fix issue with token not being available because it's now non-enumerable
diff --git a/.changeset/mighty-birds-rest.md b/.changeset/mighty-birds-rest.md
new file mode 100644
index 0000000000..79f1bdd075
--- /dev/null
+++ b/.changeset/mighty-birds-rest.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-notifications': minor
+---
+
+Switched to using the new `/notifications` endpoints. Be sure to update the `notifications` plugin backend before deploying this frontend plugin change.
diff --git a/.changeset/mighty-jobs-unite.md b/.changeset/mighty-jobs-unite.md
deleted file mode 100644
index c8e880ba3e..0000000000
--- a/.changeset/mighty-jobs-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-api-docs': patch
----
-
-Uses theme values to style the API definition schema so that theme overrides apply.
diff --git a/.changeset/mighty-spoons-suffer.md b/.changeset/mighty-spoons-suffer.md
deleted file mode 100644
index 5b03378568..0000000000
--- a/.changeset/mighty-spoons-suffer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
----
-
-Avoid page re-rendering when clicking on anchor links in the same documentation page.
diff --git a/.changeset/neat-insects-cough.md b/.changeset/neat-insects-cough.md
new file mode 100644
index 0000000000..fbdf214edb
--- /dev/null
+++ b/.changeset/neat-insects-cough.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Be more aggressive in dequeueing entities for stitching
diff --git a/.changeset/new-pandas-perform.md b/.changeset/new-pandas-perform.md
new file mode 100644
index 0000000000..797f34d6df
--- /dev/null
+++ b/.changeset/new-pandas-perform.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': minor
+---
+
+Fix invalid path and malformed flags bugs in api-reports.ts
diff --git a/.changeset/new-rules-teach.md b/.changeset/new-rules-teach.md
new file mode 100644
index 0000000000..cae0215bfc
--- /dev/null
+++ b/.changeset/new-rules-teach.md
@@ -0,0 +1,8 @@
+---
+'@backstage/catalog-client': minor
+'@backstage/plugin-catalog-backend': minor
+'@backstage/plugin-events-backend': minor
+'@backstage/plugin-search-backend': minor
+---
+
+Internal updates to generated code.
diff --git a/.changeset/ninety-shirts-float.md b/.changeset/ninety-shirts-float.md
deleted file mode 100644
index 4ff9a39560..0000000000
--- a/.changeset/ninety-shirts-float.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Align with type declaration of template filter/global function by supporting undefined as return value.
diff --git a/.changeset/odd-apples-explain.md b/.changeset/odd-apples-explain.md
new file mode 100644
index 0000000000..324d98b0f6
--- /dev/null
+++ b/.changeset/odd-apples-explain.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-auth-node': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-devtools-backend': patch
+'@backstage/plugin-signals-backend': patch
+---
+
+Restrict `@types/express` version range from `*` to `^4.17.6`.
diff --git a/.changeset/odd-days-push.md b/.changeset/odd-days-push.md
new file mode 100644
index 0000000000..fd46de029f
--- /dev/null
+++ b/.changeset/odd-days-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-notifications-backend': patch
+---
+
+Deprecated root '/' endpoints, moving them under `/notifications` instead.
diff --git a/.changeset/odd-worms-peel.md b/.changeset/odd-worms-peel.md
new file mode 100644
index 0000000000..90e05f1e51
--- /dev/null
+++ b/.changeset/odd-worms-peel.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Correctly report stitching queue length
diff --git a/.changeset/old-pandas-act.md b/.changeset/old-pandas-act.md
new file mode 100644
index 0000000000..7b88652342
--- /dev/null
+++ b/.changeset/old-pandas-act.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-github': patch
+---
+
+Minor spell fix in action parameters
diff --git a/.changeset/old-taxis-exist.md b/.changeset/old-taxis-exist.md
new file mode 100644
index 0000000000..f2c7ac1f02
--- /dev/null
+++ b/.changeset/old-taxis-exist.md
@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-events-backend': patch
+'@backstage/plugin-events-node': patch
+---
+
+Allow configuring a timeout for event bus polling requests. This can be set like so in your app-config:
+
+```yaml
+events:
+  notifyTimeoutMs: 30000
+```
diff --git a/.changeset/olive-berries-jump.md b/.changeset/olive-berries-jump.md
new file mode 100644
index 0000000000..d8e9fb1da6
--- /dev/null
+++ b/.changeset/olive-berries-jump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Added support for the Search bar in docs residing in the entity page tab, and not only the global "/docs" page.
diff --git a/.changeset/orange-coins-confess.md b/.changeset/orange-coins-confess.md
new file mode 100644
index 0000000000..8e8aefb096
--- /dev/null
+++ b/.changeset/orange-coins-confess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-devtools-backend': minor
+---
+
+**BREAKING** Removed support for what is known as the legacy backend, please use the New Backend System.
diff --git a/.changeset/orange-moles-kick.md b/.changeset/orange-moles-kick.md
new file mode 100644
index 0000000000..6e6054418e
--- /dev/null
+++ b/.changeset/orange-moles-kick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+---
+
+Emit scaffolder events using the optional `EventsService`
diff --git a/.changeset/perfect-fishes-kick.md b/.changeset/perfect-fishes-kick.md
new file mode 100644
index 0000000000..b9e7ade993
--- /dev/null
+++ b/.changeset/perfect-fishes-kick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-notifications-backend': minor
+---
+
+**BREAKING**: Removed redundant `/health` endpoint, switch to using [the built-in endpoint instead](https://backstage.io/docs/backend-system/core-services/root-health).
diff --git a/.changeset/perfect-goats-mate.md b/.changeset/perfect-goats-mate.md
deleted file mode 100644
index 6ad2884d08..0000000000
--- a/.changeset/perfect-goats-mate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core-components': minor
----
-
-The SupportButton component will now be hidden if no support config is specified in app-config
diff --git a/.changeset/pink-bees-shake.md b/.changeset/pink-bees-shake.md
new file mode 100644
index 0000000000..2d87b7ef6c
--- /dev/null
+++ b/.changeset/pink-bees-shake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-node': patch
+---
+
+Make sure that isomorphic git push commands are not proxied.
diff --git a/.changeset/pink-pets-jump.md b/.changeset/pink-pets-jump.md
new file mode 100644
index 0000000000..d9bb97e36e
--- /dev/null
+++ b/.changeset/pink-pets-jump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Support `connection.type: cloudsql` in database client for usage with `@google-cloud/cloud-sql-connector` and `iam` auth
diff --git a/.changeset/forty-spoons-burn.md b/.changeset/polite-foxes-buy.md
similarity index 59%
rename from .changeset/forty-spoons-burn.md
rename to .changeset/polite-foxes-buy.md
index 627cb31970..a67af204e0 100644
--- a/.changeset/forty-spoons-burn.md
+++ b/.changeset/polite-foxes-buy.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Fix tasks listing with postgres
+Add fs:readdir to scaffolder startup
diff --git a/.changeset/poor-hounds-jump.md b/.changeset/poor-hounds-jump.md
new file mode 100644
index 0000000000..2f1abb8ce8
--- /dev/null
+++ b/.changeset/poor-hounds-jump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Bumped the version range for `html-webpack-plugin` to fix the `htmlPluginExports.getCompilationHooks is not a function` error when using experimental Rspack.
diff --git a/.changeset/popular-donkeys-rhyme.md b/.changeset/popular-donkeys-rhyme.md
new file mode 100644
index 0000000000..90195ff999
--- /dev/null
+++ b/.changeset/popular-donkeys-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added `@backstage/cli/config/prettier` as a replacement for `@spotify/prettier-config`, but with the same configuration.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 9a94b5f4e9..241667c2c5 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -2,197 +2,313 @@
   "mode": "pre",
   "tag": "next",
   "initialVersions": {
-    "example-app": "0.2.102",
-    "@backstage/app-defaults": "1.5.12",
-    "example-app-next": "0.0.16",
-    "app-next-example-plugin": "0.0.16",
-    "example-backend": "0.0.31",
-    "@backstage/backend-app-api": "1.0.1",
-    "@backstage/backend-defaults": "0.5.1",
+    "example-app": "0.2.103",
+    "@backstage/app-defaults": "1.5.13",
+    "example-app-next": "0.0.17",
+    "app-next-example-plugin": "0.0.17",
+    "example-backend": "0.0.32",
+    "@backstage/backend-app-api": "1.0.2",
+    "@backstage/backend-defaults": "0.5.3",
     "@backstage/backend-dev-utils": "0.1.5",
-    "@backstage/backend-dynamic-feature-service": "0.4.2",
-    "example-backend-legacy": "0.2.103",
-    "@backstage/backend-openapi-utils": "0.2.0",
-    "@backstage/backend-plugin-api": "1.0.1",
-    "@backstage/backend-test-utils": "1.0.1",
-    "@backstage/catalog-client": "1.7.1",
-    "@backstage/catalog-model": "1.7.0",
-    "@backstage/cli": "0.28.0",
-    "@backstage/cli-common": "0.1.14",
-    "@backstage/cli-node": "0.2.9",
-    "@backstage/codemods": "0.1.51",
-    "@backstage/config": "1.2.0",
-    "@backstage/config-loader": "1.9.1",
-    "@backstage/core-app-api": "1.15.1",
-    "@backstage/core-compat-api": "0.3.1",
-    "@backstage/core-components": "0.15.1",
-    "@backstage/core-plugin-api": "1.10.0",
-    "@backstage/create-app": "0.5.21",
-    "@backstage/dev-utils": "1.1.2",
-    "e2e-test": "0.2.21",
+    "@backstage/backend-dynamic-feature-service": "0.5.0",
+    "example-backend-legacy": "0.2.104",
+    "@backstage/backend-openapi-utils": "0.3.0",
+    "@backstage/backend-plugin-api": "1.0.2",
+    "@backstage/backend-test-utils": "1.1.0",
+    "@backstage/catalog-client": "1.8.0",
+    "@backstage/catalog-model": "1.7.1",
+    "@backstage/cli": "0.29.0",
+    "@backstage/cli-common": "0.1.15",
+    "@backstage/cli-node": "0.2.10",
+    "@backstage/codemods": "0.1.52",
+    "@backstage/config": "1.3.0",
+    "@backstage/config-loader": "1.9.2",
+    "@backstage/core-app-api": "1.15.2",
+    "@backstage/core-compat-api": "0.3.2",
+    "@backstage/core-components": "0.16.0",
+    "@backstage/core-plugin-api": "1.10.1",
+    "@backstage/create-app": "0.5.22",
+    "@backstage/dev-utils": "1.1.3",
+    "e2e-test": "0.2.22",
     "@backstage/e2e-test-utils": "0.1.1",
-    "@backstage/errors": "1.2.4",
+    "@backstage/errors": "1.2.5",
     "@backstage/eslint-plugin": "0.1.10",
-    "@backstage/frontend-app-api": "0.10.0",
-    "@backstage/frontend-defaults": "0.1.1",
-    "@internal/frontend": "0.0.2",
-    "@backstage/frontend-plugin-api": "0.9.0",
-    "@backstage/frontend-test-utils": "0.2.1",
-    "@backstage/integration": "1.15.1",
-    "@backstage/integration-aws-node": "0.1.12",
-    "@backstage/integration-react": "1.2.0",
+    "@backstage/frontend-app-api": "0.10.1",
+    "@backstage/frontend-defaults": "0.1.2",
+    "@internal/frontend": "0.0.3",
+    "@backstage/frontend-plugin-api": "0.9.1",
+    "@backstage/frontend-test-utils": "0.2.2",
+    "@backstage/integration": "1.15.2",
+    "@backstage/integration-aws-node": "0.1.13",
+    "@backstage/integration-react": "1.2.1",
     "@internal/opaque": "0.0.1",
     "@backstage/release-manifests": "0.0.11",
-    "@backstage/repo-tools": "0.10.0",
-    "@internal/scaffolder": "0.0.2",
-    "@techdocs/cli": "1.8.20",
-    "techdocs-cli-embedded-app": "0.2.101",
-    "@backstage/test-utils": "1.7.0",
-    "@backstage/theme": "0.6.0",
-    "@backstage/types": "1.1.1",
+    "@backstage/repo-tools": "0.11.0",
+    "@internal/scaffolder": "0.0.3",
+    "@techdocs/cli": "1.8.22",
+    "techdocs-cli-embedded-app": "0.2.102",
+    "@backstage/test-utils": "1.7.1",
+    "@backstage/theme": "0.6.1",
+    "@backstage/types": "1.2.0",
     "@backstage/version-bridge": "1.0.10",
-    "yarn-plugin-backstage": "0.0.2",
-    "@backstage/plugin-api-docs": "0.11.11",
+    "yarn-plugin-backstage": "0.0.3",
+    "@backstage/plugin-api-docs": "0.12.0",
     "@backstage/plugin-api-docs-module-protoc-gen-doc": "0.1.8",
-    "@backstage/plugin-app": "0.1.1",
-    "@backstage/plugin-app-backend": "0.3.76",
-    "@backstage/plugin-app-node": "0.1.26",
-    "@backstage/plugin-app-visualizer": "0.1.11",
-    "@backstage/plugin-auth-backend": "0.23.1",
-    "@backstage/plugin-auth-backend-module-atlassian-provider": "0.3.1",
-    "@backstage/plugin-auth-backend-module-auth0-provider": "0.1.1",
-    "@backstage/plugin-auth-backend-module-aws-alb-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-azure-easyauth-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-bitbucket-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-bitbucket-server-provider": "0.1.1",
-    "@backstage/plugin-auth-backend-module-cloudflare-access-provider": "0.3.1",
-    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "0.3.1",
-    "@backstage/plugin-auth-backend-module-github-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-gitlab-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-google-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-microsoft-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-oauth2-provider": "0.3.1",
-    "@backstage/plugin-auth-backend-module-oauth2-proxy-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-oidc-provider": "0.3.1",
-    "@backstage/plugin-auth-backend-module-okta-provider": "0.1.1",
-    "@backstage/plugin-auth-backend-module-onelogin-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-pinniped-provider": "0.2.1",
-    "@backstage/plugin-auth-backend-module-vmware-cloud-provider": "0.4.0",
-    "@backstage/plugin-auth-node": "0.5.3",
-    "@backstage/plugin-auth-react": "0.1.7",
-    "@backstage/plugin-bitbucket-cloud-common": "0.2.24",
-    "@backstage/plugin-catalog": "1.24.0",
-    "@backstage/plugin-catalog-backend": "1.27.0",
-    "@backstage/plugin-catalog-backend-module-aws": "0.4.3",
-    "@backstage/plugin-catalog-backend-module-azure": "0.2.3",
-    "@backstage/plugin-catalog-backend-module-backstage-openapi": "0.4.1",
-    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.4.0",
-    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.2.3",
-    "@backstage/plugin-catalog-backend-module-gcp": "0.3.1",
-    "@backstage/plugin-catalog-backend-module-gerrit": "0.2.3",
-    "@backstage/plugin-catalog-backend-module-github": "0.7.5",
-    "@backstage/plugin-catalog-backend-module-github-org": "0.3.2",
-    "@backstage/plugin-catalog-backend-module-gitlab": "0.4.3",
-    "@backstage/plugin-catalog-backend-module-gitlab-org": "0.2.1",
-    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.5.5",
-    "@backstage/plugin-catalog-backend-module-ldap": "0.9.1",
-    "@backstage/plugin-catalog-backend-module-logs": "0.1.2",
-    "@backstage/plugin-catalog-backend-module-msgraph": "0.6.3",
-    "@backstage/plugin-catalog-backend-module-openapi": "0.2.2",
-    "@backstage/plugin-catalog-backend-module-puppetdb": "0.2.3",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.1",
-    "@backstage/plugin-catalog-backend-module-unprocessed": "0.5.1",
-    "@backstage/plugin-catalog-common": "1.1.0",
-    "@backstage/plugin-catalog-graph": "0.4.11",
-    "@backstage/plugin-catalog-import": "0.12.5",
-    "@backstage/plugin-catalog-node": "1.13.1",
-    "@backstage/plugin-catalog-react": "1.14.0",
-    "@backstage/plugin-catalog-unprocessed-entities": "0.2.9",
-    "@backstage/plugin-catalog-unprocessed-entities-common": "0.0.4",
-    "@backstage/plugin-config-schema": "0.1.60",
-    "@backstage/plugin-devtools": "0.1.19",
-    "@backstage/plugin-devtools-backend": "0.4.1",
-    "@backstage/plugin-devtools-common": "0.1.12",
-    "@backstage/plugin-events-backend": "0.3.13",
-    "@backstage/plugin-events-backend-module-aws-sqs": "0.4.3",
-    "@backstage/plugin-events-backend-module-azure": "0.2.12",
-    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.2.12",
-    "@backstage/plugin-events-backend-module-gerrit": "0.2.12",
-    "@backstage/plugin-events-backend-module-github": "0.2.12",
-    "@backstage/plugin-events-backend-module-gitlab": "0.2.12",
-    "@backstage/plugin-events-backend-test-utils": "0.1.36",
-    "@backstage/plugin-events-node": "0.4.1",
-    "@internal/plugin-todo-list": "1.0.32",
-    "@internal/plugin-todo-list-backend": "1.0.32",
-    "@internal/plugin-todo-list-common": "1.0.21",
-    "@backstage/plugin-home": "0.8.0",
-    "@backstage/plugin-home-react": "0.1.18",
-    "@backstage/plugin-kubernetes": "0.11.16",
-    "@backstage/plugin-kubernetes-backend": "0.18.7",
-    "@backstage/plugin-kubernetes-cluster": "0.0.17",
-    "@backstage/plugin-kubernetes-common": "0.8.3",
-    "@backstage/plugin-kubernetes-node": "0.1.20",
-    "@backstage/plugin-kubernetes-react": "0.4.4",
-    "@backstage/plugin-notifications": "0.3.2",
-    "@backstage/plugin-notifications-backend": "0.4.1",
-    "@backstage/plugin-notifications-backend-module-email": "0.3.1",
-    "@backstage/plugin-notifications-common": "0.0.5",
-    "@backstage/plugin-notifications-node": "0.2.7",
-    "@backstage/plugin-org": "0.6.31",
-    "@backstage/plugin-org-react": "0.1.30",
-    "@backstage/plugin-permission-backend": "0.5.50",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "0.2.1",
-    "@backstage/plugin-permission-common": "0.8.1",
-    "@backstage/plugin-permission-node": "0.8.4",
-    "@backstage/plugin-permission-react": "0.4.27",
-    "@backstage/plugin-proxy-backend": "0.5.7",
-    "@backstage/plugin-scaffolder": "1.26.0",
-    "@backstage/plugin-scaffolder-backend": "1.26.0",
-    "@backstage/plugin-scaffolder-backend-module-azure": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-bitbucket": "0.3.1",
-    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.3.1",
-    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.3.1",
-    "@backstage/plugin-scaffolder-backend-module-gcp": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-gerrit": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-gitea": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-github": "0.5.1",
-    "@backstage/plugin-scaffolder-backend-module-gitlab": "0.6.0",
-    "@backstage/plugin-scaffolder-backend-module-notifications": "0.1.1",
-    "@backstage/plugin-scaffolder-backend-module-rails": "0.5.1",
-    "@backstage/plugin-scaffolder-backend-module-sentry": "0.2.1",
-    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.4.1",
-    "@backstage/plugin-scaffolder-common": "1.5.6",
-    "@backstage/plugin-scaffolder-node": "0.5.0",
-    "@backstage/plugin-scaffolder-node-test-utils": "0.1.13",
-    "@backstage/plugin-scaffolder-react": "1.13.0",
-    "@backstage/plugin-search": "1.4.18",
-    "@backstage/plugin-search-backend": "1.6.0",
-    "@backstage/plugin-search-backend-module-catalog": "0.2.3",
-    "@backstage/plugin-search-backend-module-elasticsearch": "1.6.0",
-    "@backstage/plugin-search-backend-module-explore": "0.2.3",
-    "@backstage/plugin-search-backend-module-pg": "0.5.36",
-    "@backstage/plugin-search-backend-module-stack-overflow-collator": "0.3.1",
-    "@backstage/plugin-search-backend-module-techdocs": "0.3.0",
-    "@backstage/plugin-search-backend-node": "1.3.3",
-    "@backstage/plugin-search-common": "1.2.14",
-    "@backstage/plugin-search-react": "1.8.1",
-    "@backstage/plugin-signals": "0.0.11",
-    "@backstage/plugin-signals-backend": "0.2.1",
-    "@backstage/plugin-signals-node": "0.1.12",
-    "@backstage/plugin-signals-react": "0.0.6",
-    "@backstage/plugin-techdocs": "1.11.0",
-    "@backstage/plugin-techdocs-addons-test-utils": "1.0.40",
-    "@backstage/plugin-techdocs-backend": "1.11.0",
+    "@backstage/plugin-app": "0.1.2",
+    "@backstage/plugin-app-backend": "0.4.0",
+    "@backstage/plugin-app-node": "0.1.27",
+    "@backstage/plugin-app-visualizer": "0.1.12",
+    "@backstage/plugin-auth-backend": "0.24.0",
+    "@backstage/plugin-auth-backend-module-atlassian-provider": "0.3.2",
+    "@backstage/plugin-auth-backend-module-auth0-provider": "0.1.2",
+    "@backstage/plugin-auth-backend-module-aws-alb-provider": "0.3.0",
+    "@backstage/plugin-auth-backend-module-azure-easyauth-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-bitbucket-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-bitbucket-server-provider": "0.1.2",
+    "@backstage/plugin-auth-backend-module-cloudflare-access-provider": "0.3.2",
+    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "0.3.2",
+    "@backstage/plugin-auth-backend-module-github-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-google-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-microsoft-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-oauth2-provider": "0.3.2",
+    "@backstage/plugin-auth-backend-module-oauth2-proxy-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-oidc-provider": "0.3.2",
+    "@backstage/plugin-auth-backend-module-okta-provider": "0.1.2",
+    "@backstage/plugin-auth-backend-module-onelogin-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-pinniped-provider": "0.2.2",
+    "@backstage/plugin-auth-backend-module-vmware-cloud-provider": "0.4.1",
+    "@backstage/plugin-auth-node": "0.5.4",
+    "@backstage/plugin-auth-react": "0.1.8",
+    "@backstage/plugin-bitbucket-cloud-common": "0.2.25",
+    "@backstage/plugin-catalog": "1.25.0",
+    "@backstage/plugin-catalog-backend": "1.28.0",
+    "@backstage/plugin-catalog-backend-module-aws": "0.4.5",
+    "@backstage/plugin-catalog-backend-module-azure": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-backstage-openapi": "0.4.2",
+    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.4.2",
+    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-gcp": "0.3.2",
+    "@backstage/plugin-catalog-backend-module-gerrit": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-github": "0.7.7",
+    "@backstage/plugin-catalog-backend-module-github-org": "0.3.4",
+    "@backstage/plugin-catalog-backend-module-gitlab": "0.5.0",
+    "@backstage/plugin-catalog-backend-module-gitlab-org": "0.2.3",
+    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.6.0",
+    "@backstage/plugin-catalog-backend-module-ldap": "0.10.0",
+    "@backstage/plugin-catalog-backend-module-logs": "0.1.4",
+    "@backstage/plugin-catalog-backend-module-msgraph": "0.6.4",
+    "@backstage/plugin-catalog-backend-module-openapi": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-puppetdb": "0.2.4",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.2",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "0.5.2",
+    "@backstage/plugin-catalog-common": "1.1.1",
+    "@backstage/plugin-catalog-graph": "0.4.12",
+    "@backstage/plugin-catalog-import": "0.12.6",
+    "@backstage/plugin-catalog-node": "1.14.0",
+    "@backstage/plugin-catalog-react": "1.14.1",
+    "@backstage/plugin-catalog-unprocessed-entities": "0.2.10",
+    "@backstage/plugin-catalog-unprocessed-entities-common": "0.0.5",
+    "@backstage/plugin-config-schema": "0.1.61",
+    "@backstage/plugin-devtools": "0.1.20",
+    "@backstage/plugin-devtools-backend": "0.4.2",
+    "@backstage/plugin-devtools-common": "0.1.13",
+    "@backstage/plugin-events-backend": "0.3.16",
+    "@backstage/plugin-events-backend-module-aws-sqs": "0.4.5",
+    "@backstage/plugin-events-backend-module-azure": "0.2.14",
+    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.2.14",
+    "@backstage/plugin-events-backend-module-gerrit": "0.2.14",
+    "@backstage/plugin-events-backend-module-github": "0.2.14",
+    "@backstage/plugin-events-backend-module-gitlab": "0.2.14",
+    "@backstage/plugin-events-backend-test-utils": "0.1.38",
+    "@backstage/plugin-events-node": "0.4.5",
+    "@internal/plugin-todo-list": "1.0.33",
+    "@internal/plugin-todo-list-backend": "1.0.33",
+    "@internal/plugin-todo-list-common": "1.0.22",
+    "@backstage/plugin-home": "0.8.1",
+    "@backstage/plugin-home-react": "0.1.19",
+    "@backstage/plugin-kubernetes": "0.12.0",
+    "@backstage/plugin-kubernetes-backend": "0.19.0",
+    "@backstage/plugin-kubernetes-cluster": "0.0.18",
+    "@backstage/plugin-kubernetes-common": "0.9.0",
+    "@backstage/plugin-kubernetes-node": "0.2.0",
+    "@backstage/plugin-kubernetes-react": "0.5.0",
+    "@backstage/plugin-notifications": "0.4.0",
+    "@backstage/plugin-notifications-backend": "0.4.3",
+    "@backstage/plugin-notifications-backend-module-email": "0.3.3",
+    "@backstage/plugin-notifications-common": "0.0.6",
+    "@backstage/plugin-notifications-node": "0.2.9",
+    "@backstage/plugin-org": "0.6.32",
+    "@backstage/plugin-org-react": "0.1.31",
+    "@backstage/plugin-permission-backend": "0.5.51",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "0.2.2",
+    "@backstage/plugin-permission-common": "0.8.2",
+    "@backstage/plugin-permission-node": "0.8.5",
+    "@backstage/plugin-permission-react": "0.4.28",
+    "@backstage/plugin-proxy-backend": "0.5.8",
+    "@backstage/plugin-scaffolder": "1.27.0",
+    "@backstage/plugin-scaffolder-backend": "1.27.0",
+    "@backstage/plugin-scaffolder-backend-module-azure": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket": "0.3.2",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.3.2",
+    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.3.3",
+    "@backstage/plugin-scaffolder-backend-module-gcp": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-gerrit": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-gitea": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-github": "0.5.2",
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "0.6.1",
+    "@backstage/plugin-scaffolder-backend-module-notifications": "0.1.3",
+    "@backstage/plugin-scaffolder-backend-module-rails": "0.5.2",
+    "@backstage/plugin-scaffolder-backend-module-sentry": "0.2.2",
+    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.4.3",
+    "@backstage/plugin-scaffolder-common": "1.5.7",
+    "@backstage/plugin-scaffolder-node": "0.6.0",
+    "@backstage/plugin-scaffolder-node-test-utils": "0.1.15",
+    "@backstage/plugin-scaffolder-react": "1.14.0",
+    "@backstage/plugin-search": "1.4.19",
+    "@backstage/plugin-search-backend": "1.7.0",
+    "@backstage/plugin-search-backend-module-catalog": "0.2.5",
+    "@backstage/plugin-search-backend-module-elasticsearch": "1.6.2",
+    "@backstage/plugin-search-backend-module-explore": "0.2.5",
+    "@backstage/plugin-search-backend-module-pg": "0.5.38",
+    "@backstage/plugin-search-backend-module-stack-overflow-collator": "0.3.3",
+    "@backstage/plugin-search-backend-module-techdocs": "0.3.2",
+    "@backstage/plugin-search-backend-node": "1.3.5",
+    "@backstage/plugin-search-common": "1.2.15",
+    "@backstage/plugin-search-react": "1.8.2",
+    "@backstage/plugin-signals": "0.0.12",
+    "@backstage/plugin-signals-backend": "0.2.3",
+    "@backstage/plugin-signals-node": "0.1.14",
+    "@backstage/plugin-signals-react": "0.0.7",
+    "@backstage/plugin-techdocs": "1.11.1",
+    "@backstage/plugin-techdocs-addons-test-utils": "1.0.41",
+    "@backstage/plugin-techdocs-backend": "1.11.2",
     "@backstage/plugin-techdocs-common": "0.1.0",
-    "@backstage/plugin-techdocs-module-addons-contrib": "1.1.16",
-    "@backstage/plugin-techdocs-node": "1.12.12",
-    "@backstage/plugin-techdocs-react": "1.2.9",
-    "@backstage/plugin-user-settings": "0.8.14",
-    "@backstage/plugin-user-settings-backend": "0.2.25",
-    "@backstage/plugin-user-settings-common": "0.0.1"
+    "@backstage/plugin-techdocs-module-addons-contrib": "1.1.17",
+    "@backstage/plugin-techdocs-node": "1.12.13",
+    "@backstage/plugin-techdocs-react": "1.2.10",
+    "@backstage/plugin-user-settings": "0.8.15",
+    "@backstage/plugin-user-settings-backend": "0.2.27",
+    "@backstage/plugin-user-settings-common": "0.0.1",
+    "@backstage/canon": "0.0.0"
   },
-  "changesets": []
+  "changesets": [
+    "beige-chicken-type",
+    "brave-maps-deliver",
+    "brave-teachers-mate",
+    "brown-monkeys-ring",
+    "chatty-weeks-impress",
+    "chilly-games-trade",
+    "cold-icons-worry",
+    "cold-jeans-stare",
+    "cool-days-sparkle",
+    "cuddly-chicken-wink",
+    "cuddly-schools-scream",
+    "curly-hats-tell",
+    "cyan-rocks-divide",
+    "dry-badgers-prove",
+    "dry-needles-taste",
+    "dull-bulldogs-learn",
+    "dull-ties-film",
+    "empty-bugs-deliver",
+    "empty-colts-promise",
+    "empty-ways-push",
+    "fast-cheetahs-deliver",
+    "few-colts-train",
+    "few-pillows-remember",
+    "fifty-countries-decide",
+    "five-goats-travel",
+    "fluffy-cobras-sort",
+    "fluffy-falcons-shout",
+    "fluffy-zebras-cheer",
+    "forty-apples-complain",
+    "forty-ravens-fry",
+    "friendly-dots-thank",
+    "gold-crabs-agree",
+    "gold-stingrays-cross",
+    "gorgeous-panthers-count",
+    "great-buttons-cross",
+    "green-carpets-smell",
+    "happy-forks-listen",
+    "healthy-years-begin",
+    "heavy-needles-poke",
+    "heavy-tomatoes-laugh",
+    "honest-hornets-double",
+    "hungry-hairs-wait",
+    "itchy-rats-pump",
+    "itchy-ravens-punch",
+    "khaki-ladybugs-swim",
+    "khaki-shrimps-tease",
+    "large-birds-watch",
+    "lazy-pants-attack",
+    "lazy-years-float",
+    "lemon-bulldogs-study",
+    "lucky-crabs-vanish",
+    "mean-shirts-design",
+    "mighty-birds-rest",
+    "neat-insects-cough",
+    "new-pandas-perform",
+    "new-rules-teach",
+    "odd-apples-explain",
+    "odd-days-push",
+    "odd-worms-peel",
+    "old-taxis-exist",
+    "olive-berries-jump",
+    "orange-coins-confess",
+    "orange-moles-kick",
+    "perfect-fishes-kick",
+    "pink-bees-shake",
+    "pink-pets-jump",
+    "polite-foxes-buy",
+    "poor-hounds-jump",
+    "popular-donkeys-rhyme",
+    "pretty-kiwis-travel",
+    "real-shirts-cry",
+    "renovate-998a490",
+    "renovate-9a9f6ed",
+    "renovate-a5f3bd6",
+    "renovate-e689a2c",
+    "rich-beers-eat",
+    "rich-maps-invite",
+    "rich-suns-drive",
+    "rollup-fix-forward",
+    "rollup-release-borked-packages",
+    "rude-pears-tie",
+    "seven-bulldogs-count",
+    "short-baboons-search",
+    "shy-teachers-count",
+    "silent-pigs-collect",
+    "silver-actors-care",
+    "six-eels-add",
+    "sixty-shirts-rescue",
+    "slow-horses-destroy",
+    "slow-singers-jump",
+    "small-boxes-enjoy",
+    "smart-islands-judge",
+    "smooth-bikes-sparkle",
+    "spotty-shoes-exercise",
+    "stale-hats-exist",
+    "stale-rats-tease",
+    "strange-brooms-check",
+    "strong-papayas-remember",
+    "swift-kangaroos-drop",
+    "tall-comics-heal",
+    "ten-keys-nail",
+    "thick-items-bathe",
+    "thin-hotels-explode",
+    "tiny-mice-run",
+    "twenty-monkeys-applaud",
+    "twenty-parents-judge",
+    "violet-snakes-laugh",
+    "warm-pumpkins-bathe",
+    "weak-avocados-suffer",
+    "weak-meals-doubt",
+    "wet-rats-exist",
+    "young-carrots-collect",
+    "young-cobras-add",
+    "young-months-admire"
+  ]
 }
diff --git a/.changeset/pretty-kiwis-travel.md b/.changeset/pretty-kiwis-travel.md
new file mode 100644
index 0000000000..f3d5cbeb27
--- /dev/null
+++ b/.changeset/pretty-kiwis-travel.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Implements the `DefaultRootLifecycleService.addBeforeShutdownHook` method, and updates `DefaultRootHttpRouterService` and `DefaultRootHealthService` to listen to that event to stop accepting traffic and close service connections.
diff --git a/.changeset/quick-cougars-fry.md b/.changeset/quick-cougars-fry.md
deleted file mode 100644
index 6ae8b66eda..0000000000
--- a/.changeset/quick-cougars-fry.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/plugin-home': patch
----
-
-Improve Starred Entities UI to reduce whitespace and provide more context on the entities:
-
-- Use the Entity Presentation API (via `<EntityDisplayName>`) to display the entity's name
-- Component's `kind` and `spec.type` are displayed as a secondary text
-- List items are condensed to reduce unnecessary spacing
diff --git a/.changeset/real-shirts-cry.md b/.changeset/real-shirts-cry.md
new file mode 100644
index 0000000000..78056368ae
--- /dev/null
+++ b/.changeset/real-shirts-cry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli-node': patch
+---
+
+Internal refactor
diff --git a/.changeset/red-fishes-press.md b/.changeset/red-fishes-press.md
deleted file mode 100644
index 8493ddf446..0000000000
--- a/.changeset/red-fishes-press.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
----
-
-Added DomPurify sanitizer configuration for custom elements implementing RFC https://github.com/backstage/backstage/issues/26988.
-See https://backstage.io/docs/features/techdocs/how-to-guides#how-to-enable-custom-elements-in-techdocs for how to enable it in the configuration.
diff --git a/.changeset/renovate-3d822ce.md b/.changeset/renovate-3d822ce.md
deleted file mode 100644
index 805b924b3b..0000000000
--- a/.changeset/renovate-3d822ce.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-module-elasticsearch': patch
----
-
-Updated dependency `@short.io/opensearch-mock` to `^0.4.0`.
diff --git a/.changeset/renovate-998a490.md b/.changeset/renovate-998a490.md
new file mode 100644
index 0000000000..8def7d49cd
--- /dev/null
+++ b/.changeset/renovate-998a490.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Updated dependency `flatted` to `3.3.2`.
diff --git a/.changeset/renovate-9a9f6ed.md b/.changeset/renovate-9a9f6ed.md
new file mode 100644
index 0000000000..9dad75cc3e
--- /dev/null
+++ b/.changeset/renovate-9a9f6ed.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependency `@module-federation/enhanced` to `^0.8.0`.
diff --git a/.changeset/renovate-a5f3bd6.md b/.changeset/renovate-a5f3bd6.md
new file mode 100644
index 0000000000..9911fd311f
--- /dev/null
+++ b/.changeset/renovate-a5f3bd6.md
@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Updated dependency `@rjsf/utils` to `5.23.1`.
+Updated dependency `@rjsf/core` to `5.23.1`.
+Updated dependency `@rjsf/material-ui` to `5.23.1`.
+Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
diff --git a/.changeset/renovate-e689a2c.md b/.changeset/renovate-e689a2c.md
new file mode 100644
index 0000000000..7e4f999289
--- /dev/null
+++ b/.changeset/renovate-e689a2c.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-compat-api': patch
+---
+
+Updated dependency `@oriflame/backstage-plugin-score-card` to `^0.9.0`.
diff --git a/.changeset/rich-beers-eat.md b/.changeset/rich-beers-eat.md
new file mode 100644
index 0000000000..55115e929e
--- /dev/null
+++ b/.changeset/rich-beers-eat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Wire up the events together in the new backend system
diff --git a/.changeset/rich-maps-invite.md b/.changeset/rich-maps-invite.md
new file mode 100644
index 0000000000..927d8e9382
--- /dev/null
+++ b/.changeset/rich-maps-invite.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-permission-node': patch
+---
+
+The `createPermissionIntegrationRouter` function now detects and prevents the exposure of duplicate permissions.
diff --git a/.changeset/rich-suns-drive.md b/.changeset/rich-suns-drive.md
new file mode 100644
index 0000000000..0b2eb85a5b
--- /dev/null
+++ b/.changeset/rich-suns-drive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': minor
+---
+
+Fixed a Typescript error when trying to use the new OpenAPI server-side generated code.
diff --git a/.changeset/rollup-fix-forward.md b/.changeset/rollup-fix-forward.md
new file mode 100644
index 0000000000..681812a134
--- /dev/null
+++ b/.changeset/rollup-fix-forward.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Update `rollup` to avoid issues with build output when running `backstage-cli package build`.
diff --git a/.changeset/rollup-release-borked-packages.md b/.changeset/rollup-release-borked-packages.md
new file mode 100644
index 0000000000..f13d7d2de7
--- /dev/null
+++ b/.changeset/rollup-release-borked-packages.md
@@ -0,0 +1,12 @@
+---
+'@backstage/cli': patch
+'@backstage/frontend-plugin-api': patch
+'@backstage/repo-tools': patch
+'@backstage/theme': patch
+'@backstage/plugin-app': patch
+'@backstage/plugin-catalog-backend-module-ldap': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket': patch
+'@backstage/plugin-techdocs-node': patch
+---
+
+Fixed a bug that caused missing code in published packages.
diff --git a/.changeset/rude-pears-tie.md b/.changeset/rude-pears-tie.md
new file mode 100644
index 0000000000..c0cb970727
--- /dev/null
+++ b/.changeset/rude-pears-tie.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Remove use of the `stoppable` library on the `DefaultRootHttpRouterService` as Node's native http server [close](https://nodejs.org/api/http.html#serverclosecallback) method already drains requests.
+Also, we pass a new `lifecycleMiddleware` to the `rootHttpRouterServiceFactory` configure function that must be called manually if you don't call `applyDefaults`.
diff --git a/.changeset/seven-bulldogs-count.md b/.changeset/seven-bulldogs-count.md
new file mode 100644
index 0000000000..9fa888767b
--- /dev/null
+++ b/.changeset/seven-bulldogs-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add support for `--output-file` option from ESLint to `package lint` and `repo lint` commands.
diff --git a/.changeset/short-baboons-search.md b/.changeset/short-baboons-search.md
new file mode 100644
index 0000000000..9855ad6df7
--- /dev/null
+++ b/.changeset/short-baboons-search.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': minor
+---
+
+All middleware used by the default `coreServices.http` is now exported for use by custom implementations.
diff --git a/.changeset/shy-pots-speak.md b/.changeset/shy-pots-speak.md
deleted file mode 100644
index 8eceacb9ec..0000000000
--- a/.changeset/shy-pots-speak.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-test-utils': patch
----
-
-Removed unused `msw` dependency.
diff --git a/.changeset/shy-rats-hear.md b/.changeset/shy-rats-hear.md
deleted file mode 100644
index 460d70c56a..0000000000
--- a/.changeset/shy-rats-hear.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-defaults': patch
----
-
-Link to proper package in `rootLoggerServiceFactory` doc string.
diff --git a/.changeset/shy-teachers-count.md b/.changeset/shy-teachers-count.md
new file mode 100644
index 0000000000..7723fe377b
--- /dev/null
+++ b/.changeset/shy-teachers-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': minor
+---
+
+**BREAKING**: Upgraded the `gitbeaker` library to version 41. As part of this, the `scopes` parameter to the `gitlab:projectDeployToken:create` is no longer optional, so you will have to pass it a value (for example `['read_repository']`).
diff --git a/.changeset/silent-pigs-collect.md b/.changeset/silent-pigs-collect.md
new file mode 100644
index 0000000000..9010605ffb
--- /dev/null
+++ b/.changeset/silent-pigs-collect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-node': patch
+---
+
+Removed unnecessary dependency on `@backstage/backend-defaults`.
diff --git a/.changeset/silent-wasps-whisper.md b/.changeset/silent-wasps-whisper.md
deleted file mode 100644
index 33620139e7..0000000000
--- a/.changeset/silent-wasps-whisper.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Revert the change of the option label for `EntityPicker`
diff --git a/.changeset/silver-actors-care.md b/.changeset/silver-actors-care.md
new file mode 100644
index 0000000000..5391a1d57b
--- /dev/null
+++ b/.changeset/silver-actors-care.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fixed an issue where `<CatalogFilterLayout.Filters />` would re-render its children on page load for smaller screens, potentially leading to unnecessary additional backend requests.
diff --git a/.changeset/six-eels-add.md b/.changeset/six-eels-add.md
new file mode 100644
index 0000000000..fa0481b757
--- /dev/null
+++ b/.changeset/six-eels-add.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Remove backend-common package from incremental-ingestion plugin and update related code
diff --git a/.changeset/sixty-shirts-rescue.md b/.changeset/sixty-shirts-rescue.md
new file mode 100644
index 0000000000..b6c1443eea
--- /dev/null
+++ b/.changeset/sixty-shirts-rescue.md
@@ -0,0 +1,41 @@
+---
+'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch
+'@backstage/plugin-auth-backend-module-bitbucket-server-provider': patch
+'@backstage/plugin-search-backend-module-stack-overflow-collator': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket-server': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+'@backstage/plugin-auth-backend-module-microsoft-provider': patch
+'@backstage/plugin-auth-backend-module-aws-alb-provider': patch
+'@backstage/plugin-scaffolder-backend-module-bitbucket': patch
+'@backstage/plugin-scaffolder-backend-module-gerrit': patch
+'@backstage/plugin-scaffolder-backend-module-sentry': patch
+'@backstage/plugin-catalog-backend-module-puppetdb': patch
+'@backstage/plugin-scaffolder-backend-module-gitea': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-catalog-backend-module-gerrit': patch
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+'@backstage/plugin-search-backend-module-explore': patch
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-notifications-backend': patch
+'@backstage/plugin-notifications-node': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/backend-app-api': patch
+'@backstage/plugin-devtools-backend': patch
+'@backstage/plugin-techdocs-backend': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-signals-backend': patch
+'@backstage/config-loader': patch
+'@backstage/plugin-proxy-backend': patch
+'@backstage/plugin-auth-backend': patch
+'@backstage/create-app': patch
+'@backstage/plugin-app-backend': patch
+'@backstage/plugin-auth-node': patch
+'@backstage/cli': patch
+'@backstage/backend-defaults': patch
+'@backstage/plugin-catalog-backend-module-github': patch
+'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
+---
+
+Use native fetch instead of node-fetch
diff --git a/.changeset/slimy-jobs-scream.md b/.changeset/slimy-jobs-scream.md
deleted file mode 100644
index e20119fed4..0000000000
--- a/.changeset/slimy-jobs-scream.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-techdocs-react': patch
-'@backstage/plugin-techdocs': patch
----
-
-Fix an issue that caused the current documentation page to be re-rendered when navigating to
-another one.
diff --git a/.changeset/slow-horses-destroy.md b/.changeset/slow-horses-destroy.md
new file mode 100644
index 0000000000..fe23d6cf27
--- /dev/null
+++ b/.changeset/slow-horses-destroy.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Create a `dev/index.ts` entrypoint for `yarn start`
diff --git a/.changeset/slow-mayflies-sleep.md b/.changeset/slow-mayflies-sleep.md
deleted file mode 100644
index ebfb9d12d4..0000000000
--- a/.changeset/slow-mayflies-sleep.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': minor
----
-
-Adds a `--watch` mode to the `schema openapi generate` command for a better local schema writing experience.
diff --git a/.changeset/slow-shrimps-call.md b/.changeset/slow-shrimps-call.md
deleted file mode 100644
index 7e04633307..0000000000
--- a/.changeset/slow-shrimps-call.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-notifications-backend': patch
-'@backstage/plugin-notifications-common': patch
-'@backstage/plugin-notifications': patch
----
-
-Add support for user specific notification settings
diff --git a/.changeset/slow-singers-jump.md b/.changeset/slow-singers-jump.md
new file mode 100644
index 0000000000..2eef032d7b
--- /dev/null
+++ b/.changeset/slow-singers-jump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Fetch all facets in a single database query
diff --git a/.changeset/small-boxes-enjoy.md b/.changeset/small-boxes-enjoy.md
new file mode 100644
index 0000000000..819e247d49
--- /dev/null
+++ b/.changeset/small-boxes-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+When parsing filters, do not make redundant `anyOf` and `allOf` nodes when there's only a single entry within them
diff --git a/.changeset/smart-islands-judge.md b/.changeset/smart-islands-judge.md
new file mode 100644
index 0000000000..8b21666c4c
--- /dev/null
+++ b/.changeset/smart-islands-judge.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Scaffolder field extensions registered with `FormFieldBlueprint` are now collected in the `useCustomFieldExtensions` hook, enabling them for use in the scaffolder.
diff --git a/.changeset/smooth-bikes-sparkle.md b/.changeset/smooth-bikes-sparkle.md
new file mode 100644
index 0000000000..0c1eba172b
--- /dev/null
+++ b/.changeset/smooth-bikes-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gitlab': minor
+---
+
+Implemented discovery for top-level groups defined in config.group or if undefined global top-level group in Gitlab
diff --git a/.changeset/spotty-shoes-exercise.md b/.changeset/spotty-shoes-exercise.md
new file mode 100644
index 0000000000..92e0825c9f
--- /dev/null
+++ b/.changeset/spotty-shoes-exercise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Support changing location keys on existing entities, in delta mutations
diff --git a/.changeset/spotty-snails-worry.md b/.changeset/spotty-snails-worry.md
deleted file mode 100644
index 3ecf2e9b35..0000000000
--- a/.changeset/spotty-snails-worry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-signals-backend': patch
----
-
-The signals backend now supports scaled deployments where clients may be connecting to one of many signal backend instances.
diff --git a/.changeset/stale-hats-exist.md b/.changeset/stale-hats-exist.md
new file mode 100644
index 0000000000..227656cd5b
--- /dev/null
+++ b/.changeset/stale-hats-exist.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Avoid extra ordering in by-query when the user doesn't ask for it
diff --git a/.changeset/stale-rats-tease.md b/.changeset/stale-rats-tease.md
new file mode 100644
index 0000000000..3564742cc6
--- /dev/null
+++ b/.changeset/stale-rats-tease.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-google-provider': patch
+---
+
+Pass through `includeGrantedScopes` in order to persist scopes across refresh calls
diff --git a/.changeset/strange-brooms-check.md b/.changeset/strange-brooms-check.md
new file mode 100644
index 0000000000..b6cb897170
--- /dev/null
+++ b/.changeset/strange-brooms-check.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fixed an issue where the `EntityOwnerPicker` component failed to load when the `mode` prop was set to `owners-only`. In this mode, the `EntityOwnerPicker` does not load details about the owners, such as `displayName` or `title`. To display these details, use `mode=all` instead.
diff --git a/.changeset/strong-papayas-remember.md b/.changeset/strong-papayas-remember.md
new file mode 100644
index 0000000000..7787258c58
--- /dev/null
+++ b/.changeset/strong-papayas-remember.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-api-docs': patch
+---
+
+Fix link styling in ProvidedApisCard component so it aligns with other card components.
diff --git a/.changeset/swift-kangaroos-drop.md b/.changeset/swift-kangaroos-drop.md
new file mode 100644
index 0000000000..77d837deba
--- /dev/null
+++ b/.changeset/swift-kangaroos-drop.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-client': patch
+---
+
+Fixed a bug in the `queryEntities` method where errors were not being handled properly.
diff --git a/.changeset/swift-laws-applaud.md b/.changeset/swift-laws-applaud.md
deleted file mode 100644
index 320fb27e52..0000000000
--- a/.changeset/swift-laws-applaud.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Update upgrade-helper link in `versions:bump` command to include `yarnPlugin` param when the yarn plugin is installed
diff --git a/.changeset/tall-comics-heal.md b/.changeset/tall-comics-heal.md
new file mode 100644
index 0000000000..3d65caee67
--- /dev/null
+++ b/.changeset/tall-comics-heal.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': minor
+---
+
+Added the Azure Blob Storage as catalog entity provider to import all the desired entities from storage account provided in app-config.yaml
diff --git a/.changeset/ten-keys-nail.md b/.changeset/ten-keys-nail.md
new file mode 100644
index 0000000000..0662e4a346
--- /dev/null
+++ b/.changeset/ten-keys-nail.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Fixed an issue in the WinstonLogger where Errors thrown and given to logger.error with field values that could not be cast to a string would throw a TypeError
diff --git a/.changeset/thick-items-bathe.md b/.changeset/thick-items-bathe.md
new file mode 100644
index 0000000000..455718ed1c
--- /dev/null
+++ b/.changeset/thick-items-bathe.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Added data-testid to placeholder rendered by Progress component to simplify assertions in tests
diff --git a/.changeset/thin-hotels-explode.md b/.changeset/thin-hotels-explode.md
new file mode 100644
index 0000000000..f06b512cc5
--- /dev/null
+++ b/.changeset/thin-hotels-explode.md
@@ -0,0 +1,5 @@
+---
+'@backstage/errors': patch
+---
+
+Trim `error.cause.stack` in addition to `error.stack` when trimming stack traces from serialized errors.
diff --git a/.changeset/three-mangos-dance.md b/.changeset/three-mangos-dance.md
deleted file mode 100644
index 0135869611..0000000000
--- a/.changeset/three-mangos-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-openapi-utils': patch
----
-
-Moves msw from dependencies to devDependencies
diff --git a/.changeset/tiny-mice-run.md b/.changeset/tiny-mice-run.md
new file mode 100644
index 0000000000..4829ef7390
--- /dev/null
+++ b/.changeset/tiny-mice-run.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+The `generate-patch` command will now add a single resolution entry for all versions of the patched package, rather than separate entries for each version query.
diff --git a/.changeset/twenty-monkeys-applaud.md b/.changeset/twenty-monkeys-applaud.md
new file mode 100644
index 0000000000..a1b0c1d338
--- /dev/null
+++ b/.changeset/twenty-monkeys-applaud.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Resolved an issue where the `templateManagementPermission` was not being exposed through the `/permissions/metadata` endpoint.
diff --git a/.changeset/twenty-parents-judge.md b/.changeset/twenty-parents-judge.md
new file mode 100644
index 0000000000..a639f83ba1
--- /dev/null
+++ b/.changeset/twenty-parents-judge.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-app-backend': patch
+---
+
+Fix root route handling when query parameters are present
diff --git a/.changeset/two-donuts-float.md b/.changeset/two-donuts-float.md
deleted file mode 100644
index d9df082910..0000000000
--- a/.changeset/two-donuts-float.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/catalog-client': patch
----
-
-Fix for certain filter fields in the `catalogApiMock` being case sensitive.
diff --git a/.changeset/violet-ears-dance.md b/.changeset/violet-ears-dance.md
deleted file mode 100644
index dba3671338..0000000000
--- a/.changeset/violet-ears-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': minor
----
-
-**BREAKING**: The `LEGACY_BACKEND_START` flag has been removed, along with support for `src/run.ts` as the development entry point.
diff --git a/.changeset/violet-snakes-laugh.md b/.changeset/violet-snakes-laugh.md
new file mode 100644
index 0000000000..7002cfeaf0
--- /dev/null
+++ b/.changeset/violet-snakes-laugh.md
@@ -0,0 +1,5 @@
+---
+'@backstage/release-manifests': patch
+---
+
+Allow overriding the fetch function used inside getManifestByVersion
diff --git a/.changeset/warm-pumpkins-bathe.md b/.changeset/warm-pumpkins-bathe.md
new file mode 100644
index 0000000000..93fa603342
--- /dev/null
+++ b/.changeset/warm-pumpkins-bathe.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Open links in the scaffolder entity and step descriptions in a new tab, to ensure consistency and improve user experience
diff --git a/.changeset/weak-avocados-suffer.md b/.changeset/weak-avocados-suffer.md
new file mode 100644
index 0000000000..01142aa927
--- /dev/null
+++ b/.changeset/weak-avocados-suffer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-ldap': minor
+---
+
+Add new ldap vendor config 'LLDAP'
diff --git a/.changeset/weak-meals-doubt.md b/.changeset/weak-meals-doubt.md
new file mode 100644
index 0000000000..42199ed296
--- /dev/null
+++ b/.changeset/weak-meals-doubt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Ensure that the scheduled worker task doesn't run at an unreasonably high frequency
diff --git a/.changeset/wet-rats-exist.md b/.changeset/wet-rats-exist.md
new file mode 100644
index 0000000000..08bcc1c28f
--- /dev/null
+++ b/.changeset/wet-rats-exist.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+Decrease OAuth2 token refresh grace period
diff --git a/.changeset/wild-experts-unite.md b/.changeset/wild-experts-unite.md
deleted file mode 100644
index 872a3aa8de..0000000000
--- a/.changeset/wild-experts-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Bump the Webpack dependency range to `^5.94.0`, as our current configuration is not compatible with some older versions.
diff --git a/.changeset/witty-bobcats-push.md b/.changeset/witty-bobcats-push.md
deleted file mode 100644
index c2b357a860..0000000000
--- a/.changeset/witty-bobcats-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Add example template for notification sending
diff --git a/.changeset/young-carrots-collect.md b/.changeset/young-carrots-collect.md
new file mode 100644
index 0000000000..1350400d39
--- /dev/null
+++ b/.changeset/young-carrots-collect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Compute some metrics using search table facet aggregations instead of reading the full refresh state
diff --git a/.changeset/young-cobras-add.md b/.changeset/young-cobras-add.md
new file mode 100644
index 0000000000..f9172d3800
--- /dev/null
+++ b/.changeset/young-cobras-add.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+As soon as a backend termination signal is received, call before shutting down root lifecycle hooks.
diff --git a/.changeset/young-months-admire.md b/.changeset/young-months-admire.md
new file mode 100644
index 0000000000..a2062b3f88
--- /dev/null
+++ b/.changeset/young-months-admire.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-app-api': minor
+'@backstage/backend-plugin-api': minor
+---
+
+**EXPERIMENTAL**: Adds a new `instanceMetadataService` to hold information about a specific backend instance.
diff --git a/.changeset/young-penguins-act.md b/.changeset/young-penguins-act.md
deleted file mode 100644
index bae2fe089f..0000000000
--- a/.changeset/young-penguins-act.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/catalog-client': minor
----
-
-The client now automatically splits up very large `getEntitiesByRefs` calls into several smaller requests behind the scenes when needed. This ensures that each individual request does not exceed common Express.js request body limits or overload the server.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e2c9aa8058..c7326c5f4e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,7 +9,7 @@ yarn.lock                                         @backstage/maintainers @backst
 */yarn.lock                                       @backstage/maintainers @backstage-service
 /.changeset/*.md
 /beps/0001-notifications-system                   @backstage/maintainers @backstage/notifications-maintainers
-/docs/*.md                                        @backstage/documentation-maintainers
+/docs                                             @backstage/maintainers @backstage/documentation-maintainers
 /docs/assets/search                               @backstage/search-maintainers
 /docs/features/search                             @backstage/search-maintainers
 /docs/features/techdocs                           @backstage/techdocs-maintainers
@@ -18,15 +18,8 @@ yarn.lock                                         @backstage/maintainers @backst
 /packages/backend-openapi-utils                   @backstage/maintainers @backstage/reviewers @backstage/openapi-tooling-maintainers
 /packages/techdocs-cli                            @backstage/techdocs-maintainers
 /packages/techdocs-cli-embedded-app               @backstage/techdocs-maintainers
-/plugins/adr                                      @backstage/maintainers @backstage/reviewers @kuangp
-/plugins/adr-*                                    @backstage/maintainers @backstage/reviewers @kuangp
 /plugins/api-docs                                 @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/azure-devops                             @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/azure-devops-backend                     @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/azure-devops-common                      @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/analytics-module-newrelic-browser        @backstage/maintainers @backstage/reviewers @jmezach
 /plugins/bitbucket-cloud-common                   @backstage/maintainers @backstage/reviewers @pjungermann
-/plugins/bitrise                                  @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/catalog                                  @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
 /plugins/catalog-*                                @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
 /plugins/catalog-backend-module-aws               @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @pjungermann
@@ -35,53 +28,26 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/catalog-backend-module-msgraph           @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @pjungermann
 /plugins/catalog-backend-module-puppetdb          @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers
 /plugins/catalog-graph                            @backstage/maintainers @backstage/reviewers @backstage/catalog-maintainers @backstage/sda-se-reviewers
-/plugins/cicd-statistics                          @backstage/sharks
-/plugins/circleci                                 @backstage/maintainers @backstage/reviewers @adamdmharvey
-/plugins/code-coverage                            @backstage/maintainers @backstage/reviewers @alde
-/plugins/code-coverage-backend                    @backstage/maintainers @backstage/reviewers @alde
-/plugins/cost-insights                            @backstage/maintainers @backstage/reviewers @backstage/silver-lining
-/plugins/cost-insights-*                          @backstage/maintainers @backstage/reviewers @backstage/silver-lining
 /plugins/devtools                                 @backstage/maintainers @backstage/reviewers @awanlin
 /plugins/devtools-backend                         @backstage/maintainers @backstage/reviewers @awanlin
 /plugins/devtools-common                          @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/entity-feedback                          @backstage/maintainers @backstage/reviewers @kuangp
-/plugins/entity-feedback-*                        @backstage/maintainers @backstage/reviewers @kuangp
 /plugins/events-*                                 @backstage/maintainers @backstage/reviewers @backstage/events-maintainers
-/plugins/explore                                  @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/explore-react                            @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/fossa                                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/git-release-manager                      @backstage/maintainers @backstage/reviewers @erikengervall
 /plugins/home                                     @backstage/home-maintainers
 /plugins/home-*                                   @backstage/home-maintainers
-/plugins/kafka                                    @backstage/maintainers @backstage/reviewers @andrewthauer
-/plugins/kafka-backend                            @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/kubernetes                               @backstage/kubernetes-maintainers
 /plugins/kubernetes-*                             @backstage/kubernetes-maintainers
-/plugins/linguist                                 @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/linguist-backend                         @backstage/maintainers @backstage/reviewers @awanlin
-/plugins/linguist-common                          @backstage/maintainers @backstage/reviewers @awanlin
 /plugins/notifications                            @backstage/maintainers @backstage/notifications-maintainers
 /plugins/notifications-*                          @backstage/maintainers @backstage/notifications-maintainers
 /plugins/scaffolder-backend-module-notifications  @backstage/maintainers @backstage/notifications-maintainers
-/plugins/octopus-deploy                           @backstage/maintainers @backstage/reviewers @jmezach
 /plugins/permission-*                             @backstage/permission-maintainers
-/plugins/playlist                                 @backstage/maintainers @backstage/reviewers @kuangp
-/plugins/playlist-*                               @backstage/maintainers @backstage/reviewers @kuangp
-/plugins/rollbar                                  @backstage/maintainers @backstage/reviewers @andrewthauer
-/plugins/rollbar-backend                          @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/scaffolder                               @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
 /plugins/scaffolder-*                             @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
 /plugins/search                                   @backstage/search-maintainers
 /plugins/search-*                                 @backstage/search-maintainers
 /plugins/signals                                  @backstage/maintainers @backstage/notifications-maintainers
 /plugins/signals-*                                @backstage/maintainers @backstage/notifications-maintainers
-/plugins/sonarqube                                @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/techdocs                                 @backstage/techdocs-maintainers
 /plugins/techdocs-*                               @backstage/techdocs-maintainers
+/plugins/user-settings                            @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/user-settings-backend                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/tech-insights-backend                    @backstage/maintainers @backstage/reviewers @xantier
-/plugins/tech-insights-backend-module-jsonfc      @backstage/maintainers @backstage/reviewers @xantier
-/plugins/tech-insights-tech-insights-common       @backstage/maintainers @backstage/reviewers @xantier
-/plugins/tech-insights-tech-insights-node         @backstage/maintainers @backstage/reviewers @xantier
-
-knip-report.md
+/plugins/user-settings-common                     @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
diff --git a/.github/vale/config/vocabularies/Backstage/accept.txt b/.github/vale/config/vocabularies/Backstage/accept.txt
index 2cbcc484f7..e0389f0adb 100644
--- a/.github/vale/config/vocabularies/Backstage/accept.txt
+++ b/.github/vale/config/vocabularies/Backstage/accept.txt
@@ -74,11 +74,14 @@ configmaps
 configs
 const
 cookiecutter
+corepack
 Corti
 cron
 cronjobs
 crontab
 css
+cve
+CVEs
 daemonsets
 Datadog
 dataflow
@@ -100,6 +103,8 @@ Deutsche
 dev
 devops
 devs
+dequeue
+dequeueing
 dialogs
 discoverability
 Discoverability
@@ -176,6 +181,7 @@ idempotency
 Iglesias
 iLert
 img
+impactful
 incentivised
 Indal
 indexable
@@ -335,6 +341,7 @@ rebase
 rebasing
 Recharts
 Redash
+redis
 renderer
 renderers
 replicasets
@@ -368,6 +375,8 @@ scaffolded
 scaffolder
 Scaffolder
 scrollbar
+SCM
+SCMs
 sdks
 seb
 semlas
diff --git a/.github/workflows/api-breaking-changes-comment.yml b/.github/workflows/api-breaking-changes-comment.yml
index 038061adac..1210db0ccf 100644
--- a/.github/workflows/api-breaking-changes-comment.yml
+++ b/.github/workflows/api-breaking-changes-comment.yml
@@ -22,7 +22,7 @@ jobs:
       action: ${{ steps.event.outputs.ACTION }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           disable-sudo: true
           egress-policy: block
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       # Identify comment to be updated
       - name: Find comment for API Changes
diff --git a/.github/workflows/api-breaking-changes.yml b/.github/workflows/api-breaking-changes.yml
index 62195b155e..744c9e62c3 100644
--- a/.github/workflows/api-breaking-changes.yml
+++ b/.github/workflows/api-breaking-changes.yml
@@ -14,11 +14,11 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Fetch the commit that's merged into the base rather than the target ref
           # This will let us diff only the contents of the PR, without fetching more history
@@ -27,15 +27,15 @@ jobs:
         run: git fetch --depth 1 origin ${{ github.base_ref }}
 
       - name: setup-node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: linux-v18
+          cache-prefix: linux-v20
 
       - name: breaking changes check
         run: |
diff --git a/.github/workflows/automate_area-labels.yml b/.github/workflows/automate_area-labels.yml
index 89e1adc3c3..4529b54c16 100644
--- a/.github/workflows/automate_area-labels.yml
+++ b/.github/workflows/automate_area-labels.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/automate_changeset_feedback.yml b/.github/workflows/automate_changeset_feedback.yml
index a0c0e44902..1a29795cce 100644
--- a/.github/workflows/automate_changeset_feedback.yml
+++ b/.github/workflows/automate_changeset_feedback.yml
@@ -23,18 +23,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Fetch the commit that's merged into the base rather than the target ref
           # This will let us diff only the contents of the PR, without fetching more history
           ref: 'refs/pull/${{ github.event.pull_request.number }}/merge'
       - name: fetch base
         run: git fetch --depth 1 origin ${{ github.base_ref }}
-      - uses: backstage/actions/changeset-feedback@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+      - uses: backstage/actions/changeset-feedback@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         name: Generate feedback
         with:
           diff-ref: 'origin/master'
diff --git a/.github/workflows/automate_merge_message.yml b/.github/workflows/automate_merge_message.yml
index 4b388d7850..7923496b3f 100644
--- a/.github/workflows/automate_merge_message.yml
+++ b/.github/workflows/automate_merge_message.yml
@@ -24,11 +24,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: '${{ github.event.pull_request.merge_commit_sha }}'
 
diff --git a/.github/workflows/automate_stale.yml b/.github/workflows/automate_stale.yml
index b7adc5235a..e61ca20620 100644
--- a/.github/workflows/automate_stale.yml
+++ b/.github/workflows/automate_stale.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/ci-noop.yml b/.github/workflows/ci-noop.yml
index 321e4b57e7..a769ce7d50 100644
--- a/.github/workflows/ci-noop.yml
+++ b/.github/workflows/ci-noop.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     name: Verify ${{ matrix.node-version }}
     steps:
@@ -35,12 +35,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     name: Test ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 824889528e..24e74ff0f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
@@ -28,20 +28,20 @@ jobs:
     name: Install ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
@@ -64,20 +64,20 @@ jobs:
     name: Verify ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -153,7 +153,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     name: Test ${{ matrix.node-version }}
     services:
@@ -202,14 +202,14 @@ jobs:
 
     env:
       CI: true
-      NODE_OPTIONS: ${{ matrix.node-version == '20.x' && '--max-old-space-size=8192 --no-node-snapshot' || '--max-old-space-size=8192' }}
+      NODE_OPTIONS: --max-old-space-size=8192 --no-node-snapshot
       INTEGRATION_TEST_GITHUB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITHUB_TOKEN }}
       INTEGRATION_TEST_GITLAB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITLAB_TOKEN }}
       INTEGRATION_TEST_BITBUCKET_TOKEN: ${{ secrets.INTEGRATION_TEST_BITBUCKET_TOKEN }}
       INTEGRATION_TEST_AZURE_TOKEN: ${{ secrets.INTEGRATION_TEST_AZURE_TOKEN }}
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: fetch master branch
         run: git fetch origin master
 
@@ -219,13 +219,13 @@ jobs:
         run: git fetch origin ${{ github.event.pull_request.base.ref }}
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -235,7 +235,7 @@ jobs:
 
       # Use the lower-level cache actions for the success cache, so that we can store the cache even on failed builds
       - name: restore backstage-cli cache
-        uses: actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
+        uses: actions/cache/restore@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: .cache/backstage-cli
           key: ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-${{ github.run_id }}
@@ -256,7 +256,7 @@ jobs:
 
       # Always save success cache even if there were failures, that way it can be used in re-triggered builds
       - name: save backstage-cli cache
-        uses: actions/cache/save@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
+        uses: actions/cache/save@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         if: always()
         with:
           path: .cache/backstage-cli
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 48ac1db289..5961a9155f 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -10,11 +10,11 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: backstage/actions/cron@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+      - uses: backstage/actions/cron@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
           private-key: ${{ secrets.BACKSTAGE_GOALIE_PRIVATE_KEY }}
diff --git a/.github/workflows/deploy_docker-image.yml b/.github/workflows/deploy_docker-image.yml
index a9524b5c98..a7ac58b76a 100644
--- a/.github/workflows/deploy_docker-image.yml
+++ b/.github/workflows/deploy_docker-image.yml
@@ -16,28 +16,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: backstage
           ref: ${{ github.event.client_payload.version && env.RELEASE_VERSION || github.ref }}
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/deploy_microsite.yml b/.github/workflows/deploy_microsite.yml
index 92c5f28498..1f18c6ed15 100644
--- a/.github/workflows/deploy_microsite.yml
+++ b/.github/workflows/deploy_microsite.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
@@ -54,20 +54,20 @@ jobs:
           result-encoding: string
 
       - name: checkout latest release
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: refs/tags/${{ steps.find-release.outputs.result }}
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: ${{ runner.os }}-v18.x
+          cache-prefix: ${{ runner.os }}-v20.x
 
       - name: build API reference
         run: yarn build:api-docs
@@ -91,23 +91,23 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: ${{ runner.os }}-v18.x
+          cache-prefix: ${{ runner.os }}-v20.x
 
       - name: build API reference
         run: yarn build:api-docs
@@ -158,19 +158,19 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       # Stable docs
       - name: checkout latest release
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: refs/tags/${{ needs.stable.outputs.release }}
 
@@ -198,7 +198,7 @@ jobs:
 
       # Next docs
       - name: checkout master
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           clean: false
 
@@ -225,7 +225,7 @@ jobs:
         run: ls microsite/build && ls microsite/build/storybook
 
       - name: Deploy both microsite and storybook to gh-pages
-        uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29 # v4.6.8
+        uses: JamesIves/github-pages-deploy-action@62fec3add6773ec5dbbf18d2ee4260911aa35cf4 # v4.6.9
         with:
           branch: gh-pages
           folder: microsite/build
diff --git a/.github/workflows/deploy_packages.yml b/.github/workflows/deploy_packages.yml
index 37b5b376e8..c66206ca8d 100644
--- a/.github/workflows/deploy_packages.yml
+++ b/.github/workflows/deploy_packages.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     services:
       postgres16:
@@ -61,22 +61,22 @@ jobs:
 
     env:
       CI: true
-      NODE_OPTIONS: ${{ matrix.node-version == '20.x' && '--max-old-space-size=8192 --no-node-snapshot' || '--max-old-space-size=8192' }}
+      NODE_OPTIONS: --max-old-space-size=8192 --no-node-snapshot
       INTEGRATION_TEST_GITHUB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITHUB_TOKEN }}
       INTEGRATION_TEST_GITLAB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITLAB_TOKEN }}
       INTEGRATION_TEST_BITBUCKET_TOKEN: ${{ secrets.INTEGRATION_TEST_BITBUCKET_TOKEN }}
       INTEGRATION_TEST_AZURE_TOKEN: ${{ secrets.INTEGRATION_TEST_AZURE_TOKEN }}
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -94,7 +94,7 @@ jobs:
         run: yarn backstage-cli config:check --lax
 
       - name: backstage-cli cache
-        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
         with:
           path: .cache/backstage-cli
           key: ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-${{ github.run_id }}
@@ -143,11 +143,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/issue.yaml b/.github/workflows/issue.yaml
index 2cd355b75e..c10f248f6d 100644
--- a/.github/workflows/issue.yaml
+++ b/.github/workflows/issue.yaml
@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'backstage/backstage'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/pr-review-comment-trigger.yaml b/.github/workflows/pr-review-comment-trigger.yaml
index 9ebfbee3b0..b5027d78be 100644
--- a/.github/workflows/pr-review-comment-trigger.yaml
+++ b/.github/workflows/pr-review-comment-trigger.yaml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/pr-review-comment.yaml b/.github/workflows/pr-review-comment.yaml
index 517a978a83..18c39ebbd1 100644
--- a/.github/workflows/pr-review-comment.yaml
+++ b/.github/workflows/pr-review-comment.yaml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # Inspired by https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
@@ -40,7 +40,7 @@ jobs:
             const prNumber = artifact.name.slice('pr_number-'.length)
             core.setOutput('pr-number', prNumber);
 
-      - uses: backstage/actions/re-review@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+      - uses: backstage/actions/re-review@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
           private-key: ${{ secrets.BACKSTAGE_GOALIE_PRIVATE_KEY }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 7639ac14db..5b8673858b 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -18,12 +18,12 @@ jobs:
     if: github.repository == 'backstage/backstage' && ( github.event.pull_request || github.event.issue.pull_request )
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: PR sync
-        uses: backstage/actions/pr-sync@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/pr-sync@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           github-token: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN  }}
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ec00a3a6b8..49f199cc57 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,12 +29,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: 'Checkout code'
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/sync_canon.yml b/.github/workflows/sync_canon.yml
new file mode 100644
index 0000000000..189e43215e
--- /dev/null
+++ b/.github/workflows/sync_canon.yml
@@ -0,0 +1,56 @@
+name: Sync Canon Storybook
+on:
+  push:
+    branches: [master]
+
+jobs:
+  sync-canon-storybook:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        with:
+          egress-policy: audit
+
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        with:
+          node-version: 20.x
+          registry-url: https://registry.npmjs.org/ # Needed for auth
+
+      - name: yarn install
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
+        with:
+          cache-prefix: ${{ runner.os }}-v20.x
+
+      - name: Checkout backstage/canon-storybook
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: backstage/canon-storybook
+          path: canon-storybook
+          token: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN }}
+
+      - name: Configure Git
+        run: |
+          git config --global user.email noreply@backstage.io
+          git config --global user.name 'Github Canon Storybook workflow'
+
+      - name: Build Canon Storybook
+        run: |
+          yarn workspace @backstage/canon run build-storybook
+
+      - name: Replace contents of canon-storybook repo with Storybook build output
+        working-directory: canon-storybook
+        run: |
+          git rm -rf .
+          cp -R ../packages/canon/storybook-static/. .
+
+      - name: Commit to canon-storybook repo
+        working-directory: canon-storybook
+        run: |
+          git add .
+          git commit -am "Canon Storybook build for backstage/backstage@${{ github.sha }}"
+          git push
diff --git a/.github/workflows/sync_code-formatting.yml b/.github/workflows/sync_code-formatting.yml
index 2aa84bb208..6658f8b850 100644
--- a/.github/workflows/sync_code-formatting.yml
+++ b/.github/workflows/sync_code-formatting.yml
@@ -10,22 +10,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # Fetch changes to previous commit - required for 'only_changed' in Prettier action
           fetch-depth: 0
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/sync_dependabot-changesets.yml b/.github/workflows/sync_dependabot-changesets.yml
index a89ab7629a..2c2d5a51d0 100644
--- a/.github/workflows/sync_dependabot-changesets.yml
+++ b/.github/workflows/sync_dependabot-changesets.yml
@@ -11,12 +11,12 @@ jobs:
     if: github.actor == 'dependabot[bot]' && github.repository == 'backstage/backstage'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/sync_release-manifest.yml b/.github/workflows/sync_release-manifest.yml
index 4b209739c7..d4fe6e2fa0 100644
--- a/.github/workflows/sync_release-manifest.yml
+++ b/.github/workflows/sync_release-manifest.yml
@@ -8,26 +8,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # 'v' prefix is added here for the tag, we keep it out of the manifest logic
           ref: v${{ github.event.client_payload.version }}
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: ${{ runner.os }}-v18.x
+          cache-prefix: ${{ runner.os }}-v20.x
 
       - name: Build yarn plugin
         working-directory: packages/yarn-plugin
@@ -35,7 +35,7 @@ jobs:
 
       # Checkout backstage/versions into /backstage/versions, which is where store the output
       - name: Checkout versions
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: backstage/versions
           path: versions
diff --git a/.github/workflows/sync_renovate-changesets.yml b/.github/workflows/sync_renovate-changesets.yml
index 1c9b4a6186..e4d60777cd 100644
--- a/.github/workflows/sync_renovate-changesets.yml
+++ b/.github/workflows/sync_renovate-changesets.yml
@@ -11,12 +11,12 @@ jobs:
     if: github.actor == 'renovate[bot]' && github.repository == 'backstage/backstage'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index 1390b4ec61..9084593052 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -12,21 +12,21 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: ${{ runner.os }}-v18.x
+          cache-prefix: ${{ runner.os }}-v20.x
 
       - name: Create Snyk report
         uses: snyk/actions/node@cdb760004ba9ea4d525f2e043745dfe85bb9077e # master
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index 008010472b..fdcf23c21c 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -25,11 +25,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Monitor and Synchronize Snyk Policies
         uses: snyk/actions/node@cdb760004ba9ea4d525f2e043745dfe85bb9077e # master
         with:
@@ -58,6 +58,6 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=7168
       - name: Upload Snyk report
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: snyk.sarif
diff --git a/.github/workflows/sync_version-packages.yml b/.github/workflows/sync_version-packages.yml
index 77fb5f951e..479f65a53a 100644
--- a/.github/workflows/sync_version-packages.yml
+++ b/.github/workflows/sync_version-packages.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 20000
           fetch-tags: true
diff --git a/.github/workflows/verify_accessibility-noop.yml b/.github/workflows/verify_accessibility-noop.yml
index 37ce3513e9..9af85ec2d1 100644
--- a/.github/workflows/verify_accessibility-noop.yml
+++ b/.github/workflows/verify_accessibility-noop.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_accessibility.yml b/.github/workflows/verify_accessibility.yml
index 29ff740f68..1c326bc880 100644
--- a/.github/workflows/verify_accessibility.yml
+++ b/.github/workflows/verify_accessibility.yml
@@ -20,19 +20,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
-          cache-prefix: ${{ runner.os }}-v18.x
+          cache-prefix: ${{ runner.os }}-v20.x
       - name: run Lighthouse CI
         run: |
           yarn dlx @lhci/cli@0.11.x autorun
diff --git a/.github/workflows/verify_codeql.yml b/.github/workflows/verify_codeql.yml
index 22eb62d4c0..c8a7d032ac 100644
--- a/.github/workflows/verify_codeql.yml
+++ b/.github/workflows/verify_codeql.yml
@@ -42,12 +42,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -55,7 +55,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -80,4 +80,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
diff --git a/.github/workflows/verify_docs-quality.yml b/.github/workflows/verify_docs-quality.yml
index 9a902b6108..9a93be4090 100644
--- a/.github/workflows/verify_docs-quality.yml
+++ b/.github/workflows/verify_docs-quality.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # Vale does not support file excludes, so we use the script to generate a list of files instead
       # The action also does not allow args or a local config file to be passed in, so the files array
diff --git a/.github/workflows/verify_e2e-linux-noop.yml b/.github/workflows/verify_e2e-linux-noop.yml
index f4f24f14f5..4e3eeb2a8c 100644
--- a/.github/workflows/verify_e2e-linux-noop.yml
+++ b/.github/workflows/verify_e2e-linux-noop.yml
@@ -24,12 +24,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     name: E2E Linux ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_e2e-linux.yml b/.github/workflows/verify_e2e-linux.yml
index 0c487429e9..ef24955b0e 100644
--- a/.github/workflows/verify_e2e-linux.yml
+++ b/.github/workflows/verify_e2e-linux.yml
@@ -8,6 +8,8 @@ on:
       - 'docs/**'
       - 'microsite/**'
       - 'beps/**'
+  push:
+    branches: [master]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -32,20 +34,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
-      NODE_OPTIONS: ${{ matrix.node-version == '20.x' && '--max-old-space-size=8192 --no-node-snapshot' || '--max-old-space-size=8192' }}
+      NODE_OPTIONS: --max-old-space-size=8192 --no-node-snapshot
 
     name: E2E Linux ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure Git
         run: |
@@ -53,12 +55,12 @@ jobs:
           git config --global user.name 'GitHub e2e user'
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/verify_e2e-techdocs.yml b/.github/workflows/verify_e2e-techdocs.yml
index f6b300af7e..454c4c011e 100644
--- a/.github/workflows/verify_e2e-techdocs.yml
+++ b/.github/workflows/verify_e2e-techdocs.yml
@@ -7,6 +7,8 @@ on:
       - 'packages/techdocs-cli/**'
       - 'packages/techdocs-cli-embedded-app/**'
       - 'plugins/techdocs/**'
+  push:
+    branches: [master]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
@@ -30,12 +32,12 @@ jobs:
     name: Techdocs
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: '3.9'
 
diff --git a/.github/workflows/verify_e2e-windows-noop.yml b/.github/workflows/verify_e2e-windows-noop.yml
index b3998522c9..78d4c1e37f 100644
--- a/.github/workflows/verify_e2e-windows-noop.yml
+++ b/.github/workflows/verify_e2e-windows-noop.yml
@@ -20,12 +20,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     name: E2E Windows ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_e2e-windows.yml b/.github/workflows/verify_e2e-windows.yml
index b6bfef51e5..3817af2d8a 100644
--- a/.github/workflows/verify_e2e-windows.yml
+++ b/.github/workflows/verify_e2e-windows.yml
@@ -11,6 +11,8 @@ on:
       - 'packages/cli/**'
       - 'packages/e2e-test/**'
       - 'packages/create-app/**'
+  push:
+    branches: [master]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,16 +24,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
-      NODE_OPTIONS: ${{ matrix.node-version == '20.x' && '--max-old-space-size=8192 --no-node-snapshot' || '--max-old-space-size=8192' }}
+      NODE_OPTIONS: --max-old-space-size=8192 --no-node-snapshot
 
     name: E2E Windows ${{ matrix.node-version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
@@ -42,7 +44,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Configure Git
         run: |
@@ -50,13 +52,13 @@ jobs:
           git config --global user.name 'GitHub e2e user'
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: setup python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: '3.10'
 
@@ -78,7 +80,7 @@ jobs:
         uses: browser-actions/setup-chrome@803ef6dfb4fdf22089c9563225d95e4a515820a0 # latest
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/verify_fossa.yml b/.github/workflows/verify_fossa.yml
index 5deaeafeaf..126d70b9c8 100644
--- a/.github/workflows/verify_fossa.yml
+++ b/.github/workflows/verify_fossa.yml
@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install Fossa
         run: "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash"
diff --git a/.github/workflows/verify_microsite-noop.yml b/.github/workflows/verify_microsite-noop.yml
index f4c5ea4104..85cb1e3fee 100644
--- a/.github/workflows/verify_microsite-noop.yml
+++ b/.github/workflows/verify_microsite-noop.yml
@@ -21,7 +21,7 @@ jobs:
     name: Microsite
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_microsite.yml b/.github/workflows/verify_microsite.yml
index 1d6aac21ca..2507428ec8 100644
--- a/.github/workflows/verify_microsite.yml
+++ b/.github/workflows/verify_microsite.yml
@@ -24,17 +24,17 @@ jobs:
     name: Microsite
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: use node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
-      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
+          node-version: 20.x
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
         with:
           python-version: '3.9'
 
diff --git a/.github/workflows/verify_microsite_accessibility-noop.yml b/.github/workflows/verify_microsite_accessibility-noop.yml
index 49721e7f51..7d4028e2dd 100644
--- a/.github/workflows/verify_microsite_accessibility-noop.yml
+++ b/.github/workflows/verify_microsite_accessibility-noop.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_microsite_accessibility.yml b/.github/workflows/verify_microsite_accessibility.yml
index 6626f4def9..e22241b3e3 100644
--- a/.github/workflows/verify_microsite_accessibility.yml
+++ b/.github/workflows/verify_microsite_accessibility.yml
@@ -15,16 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - name: top-level install
         run: yarn install --immutable
diff --git a/.github/workflows/verify_storybook-noop.yml b/.github/workflows/verify_storybook-noop.yml
index 115c79c9c3..5b41d76e4c 100644
--- a/.github/workflows/verify_storybook-noop.yml
+++ b/.github/workflows/verify_storybook-noop.yml
@@ -28,7 +28,7 @@ jobs:
     name: Storybook
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/verify_storybook.yml b/.github/workflows/verify_storybook.yml
index a3333b9bb1..bffb57e691 100644
--- a/.github/workflows/verify_storybook.yml
+++ b/.github/workflows/verify_storybook.yml
@@ -23,26 +23,26 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [18.x]
+        node-version: [20.x]
 
     name: Storybook
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0 # Required to retrieve git history
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@25145dd4117d50e1da9330e9ed2893bc6b75373e # v0.6.15
+        uses: backstage/actions/yarn-install@c5c3b91fe86c59a87cf9782de1f89e48e19d4492 # v0.6.16
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
       - name: storybook yarn install
@@ -51,7 +51,7 @@ jobs:
 
       - run: yarn build-storybook
 
-      - uses: chromaui/action@1b04e0322aba2604aa23c6714aa6f704bdb301ad # v11
+      - uses: chromaui/action@0efa3230f403b7848d5d65c6ce140b617fb68380 # v11
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           # projectToken intentionally shared to allow collaborators to run Chromatic on forks
diff --git a/.github/workflows/verify_windows.yml b/.github/workflows/verify_windows.yml
index d184bdca08..e3f6959929 100644
--- a/.github/workflows/verify_windows.yml
+++ b/.github/workflows/verify_windows.yml
@@ -17,11 +17,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     env:
       CI: true
-      NODE_OPTIONS: ${{ matrix.node-version == '20.x' && '--max-old-space-size=8192 --no-node-snapshot' || '--max-old-space-size=8192' }}
+      NODE_OPTIONS: --max-old-space-size=8192 --no-node-snapshot
       INTEGRATION_TEST_GITHUB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITHUB_TOKEN }}
       INTEGRATION_TEST_GITLAB_TOKEN: ${{ secrets.INTEGRATION_TEST_GITLAB_TOKEN }}
       INTEGRATION_TEST_BITBUCKET_TOKEN: ${{ secrets.INTEGRATION_TEST_BITBUCKET_TOKEN }}
@@ -29,14 +29,14 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 771596692b..b31e621938 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -276,4 +276,7 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [Cigna](https://www.cigna.com/) / [Evernorth](https://www.evernorth.com/) | [@raphtalia](https://github.com/raphtalia), [Devon Paluso](mailto:Devon.Paluso@evernorth.com), [Bryan Rego](mailto:Bryan.Rego@evernorth.com), [Ian Skillings](mailto:Ian.Skillings@evernorth.com) | Internal developer portal providing TechDocs, software templates, centralized secret management, with information consolidation from ServiceNow, Okta, GitHub, GitLab, and WebEx. |
 | [Infobip](https://www.infobip.com/) | [Antonio Ereiz](https://github.com/SonilPro) | Visual representation of all our entities registered within an existing internal catalog, along with a UI for editing their manifests. It serves as the go-to place for new internal tools that require a user interface and provides standardization of new components using Software Templates.
 | [CloudScript](https://www.cloudscript.com.br/) | [Helias Rodrigues](https://github.com/xcloudscript) | We use it to centralize and organize the components of our internal development platform. In addition, it provides an integrated experience for developers by using all the core modules and some plugins.
-
+| [Alauda](https://www.alauda.io/) | [Mario](https://github.com/mario-mui) | We use it to centralize and organize the components of our internal development platform. In addition, it provides environment templates for developers to create development testing or others environments 
+| [New10](https://www.new10.com/) | [Cleber Gasparoto](https://github.com/chgasparoto) | We use Backstage as our internal developer portal to catalog services across teams, implement custom Tech Insights for ensuring service standards adoption, and centralize API specifications to streamline development processes and cross-team collaboration.
+| [Tele2 Kazakhstan](https://tele2.kz/) / [Altel Digital](https://digital.altel.kz/) | [Kuanysh Bekkulov](https://www.linkedin.com/in/kuanysh-bekkulov/), [Alexandr Puzeyev](https://www.linkedin.com/in/alexandr-puzeyev/) | Developer portal: services, components, APIs, and resources; includes documentation (Docs-as-Code), service templates, and plugins for integration with internal systems and tools.
+| [Axelerant](https://www.axelerant.com/) | [Zeshan Ziya](https://github.com/zeshanziya) | Developer portal, main gateway to infrastructure, documentation, internal tooling, and service catalog with a focus on project visibility.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1a0283f09..58f894447b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -135,13 +135,14 @@ yarn build:backend # Build the backend package, depends on tsc
 yarn build:all # Build published versions of packages, depends on tsc
 yarn build:api-reports # Build API Reports used for documentation
 
-yarn lint # lint packages that have changed since later commit on origin/master
-yarn lint:all # lint all packages
-yarn lint:docs # lint all the Markdown files
-yarn lint:type-deps # verify that @types/* dependencies are placed correctly in packages
+yarn lint # Lint packages that have changed since later commit on origin/master
+yarn lint:all # Lint all packages
+yarn lint:docs # Lint all the Markdown files
+yarn lint:type-deps # Verify that @types/* dependencies are placed correctly in packages
 
-yarn test # test packages that have changed since later commit on origin/master
-yarn test:all # test all packages
+yarn test # Test packages that have changed since later commit on origin/master
+yarn test --no-watch # Test packages and include unchanged ones
+yarn test:all # Test all packages
 
 yarn clean # Remove all output folders and @backstage/cli cache
 
diff --git a/OWNERS.md b/OWNERS.md
index 2f7942792a..58672a20da 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -10,7 +10,6 @@ Team: @backstage/maintainers
 | Patrik Oldsberg | Spotify      | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019` |
 | Fredrik Adelöw  | Spotify      | [freben](https://github.com/freben)             | `freben#3926` |
 | Ben Lambert     | Spotify      | [benjdlambert](https://github.com/benjdlambert) | `blam#2159`   |
-| Johan Haals     | Spotify      | [jhaals](https://github.com/jhaals)             | `Johan#0679`  |
 
 ## Project Areas
 
@@ -27,7 +26,6 @@ Scope: The catalog plugin and catalog model
 | Ben Lambert          | Spotify      | Cubic Belugas | [benjdlambert](https://github.com/benjdlambert) | `blam#2159`     |
 | Camila Loiola        | Spotify      | Cubic Belugas | [camilaibs](http://github.com/camilaibs)        | `camilal#0226`  |
 | Fredrik Adelöw       | Spotify      | Cubic Belugas | [freben](https://github.com/freben)             | `freben#3926`   |
-| Johan Haals          | Spotify      | Cubic Belugas | [jhaals](https://github.com/jhaals)             | `Johan#0679`    |
 | Mihai Tabara         | Spotify      | Cubic Belugas | [MihaiTabara](http://github.com/MihaiTabara)    | `mihait#3107`   |
 | Patrik Oldsberg      | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019`   |
 | Vincenzo Scamporlino | Spotify      | Cubic Belugas | [vinzscam](http://github.com/vinzscam)          | `vinzscam#6944` |
@@ -91,7 +89,6 @@ Scope: The Permission Framework and plugins integrating with the permission fram
 | Ben Lambert          | Spotify      | Cubic Belugas | [benjdlambert](https://github.com/benjdlambert) | `blam#2159`     |
 | Camila Loiola        | Spotify      | Cubic Belugas | [camilaibs](http://github.com/camilaibs)        | `camilal#0226`  |
 | Fredrik Adelöw       | Spotify      | Cubic Belugas | [freben](https://github.com/freben)             | `freben#3926`   |
-| Johan Haals          | Spotify      | Cubic Belugas | [jhaals](https://github.com/jhaals)             | `Johan#0679`    |
 | Mihai Tabara         | Spotify      | Cubic Belugas | [MihaiTabara](http://github.com/MihaiTabara)    | `mihait#3107`   |
 | Patrik Oldsberg      | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019`   |
 | Vincenzo Scamporlino | Spotify      | Cubic Belugas | [vinzscam](http://github.com/vinzscam)          | `vinzscam#6944` |
@@ -204,6 +201,7 @@ Scope: The Backstage Documentation
 | Irma Solakovic                 | Roadie.io                 | [Irma12](https://github.com/Irma12)                   | `Irma#7629`                    |
 | Jorge Lainfiesta               | Roadie.io                 | [jorgelainfiesta](https://github.com/jorgelainfiesta) | `jorgel#8733`                  |
 | Jussi Hallila                  | Roadie.io                 | [Xantier](https://github.com/Xantier)                 | `Xantier#0086`                 |
+| Kashish Mittal                 | Red Hat                   | [04kash](https://github.com/04kash)                   | `kashh._.`                     |
 | 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`             |
@@ -217,6 +215,7 @@ Scope: The Backstage Documentation
 | Maintainer   | Organization | GitHub                                        | Discord        |
 | ------------ | ------------ | --------------------------------------------- | -------------- |
 | Stefan Ålund | Spotify      | [stefanalund](https://github.com/stefanalund) | `stalund#9602` |
+| Johan Haals  | Spotify      | [jhaals](https://github.com/jhaals)           | `Johan#0679`   |
 
 ## Emeritus End User Sponsors
 
diff --git a/app-config.yaml b/app-config.yaml
index cb70170541..64c2fa5c4c 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -221,6 +221,17 @@ integrations:
   #   apiBaseUrl: server.bitbucket.com
   #   username: ${BITBUCKET_SERVER_USERNAME}
   #   appPassword: ${BITBUCKET_SERVER_APP_PASSWORD}
+
+  # azureBlobStorage:
+  #   - accountName: ${ACCOUNT_NAME} # required
+  #     endpoint: ${CUSTOM_ENDPOINT} # custom endpoint will require either aadCredentials or sasToken
+  #     sasToken: ${SAS_TOKEN}
+  #     aadCredential:
+  #       clientId: ${CLIENT_ID}
+  #       tenantId: ${TENANT_ID}
+  #       clientSecret: ${CLIENT_SECRET}
+  #     accountKey: ${ACCOUNT_KEY}
+
   azure:
     - host: dev.azure.com
       token: ${AZURE_TOKEN}
@@ -245,6 +256,14 @@ catalog:
         - Domain
         - Location
   providers:
+    azureBlob:
+      accountName: ${ACCOUNT_NAME}
+      containerName: ${CONTAINER_NAME}
+      schedule: # same options as in TaskScheduleDefinition
+        # supports cron, ISO duration, "human duration" as used in code
+        frequency: { minutes: 30 }
+        # supports ISO duration, "human duration" as used in code
+        timeout: { minutes: 3 }
     backstageOpenapi:
       plugins:
         - catalog
diff --git a/beps/NNNN-template/README.md b/beps/NNNN-template/README.md
index 3ecb1ffb4e..2fce6ecd95 100644
--- a/beps/NNNN-template/README.md
+++ b/beps/NNNN-template/README.md
@@ -1,6 +1,6 @@
 ---
 title: BEP Title
-status: provisional
+status: implementable
 authors:
   - '@ghost'
 owners:
@@ -13,16 +13,10 @@ creation-date: yyyy-mm-dd
 
 <!--
 **Note:** When your BEP is complete, all these pre-existing comments should be removed
-
-When editing BEPs, aim for tightly-scoped, single-topic PRs to keep discussions focused. If you disagree with what is already in a document, open a new PR with suggested changes.
 -->
 
 # BEP: <!-- Your short, descriptive title -->
 
-<!-- Before merging the initial BEP PR, create a feature issue and update the below link. You can wait with this step until the BEP is ready to be merged. -->
-
-[**Discussion Issue**](https://github.com/backstage/backstage/issues/NNNNN)
-
 - [Summary](#summary)
 - [Motivation](#motivation)
   - [Goals](#goals)
diff --git a/beps/README.md b/beps/README.md
index 531bd15f50..84bf967b5c 100644
--- a/beps/README.md
+++ b/beps/README.md
@@ -4,19 +4,18 @@ A Backstage Enhancement Proposal (BEP) is a way to propose, communicate and coor
 
 ## Quick start for the BEP process
 
-1. Discuss the idea with the community and maintainers. Either here on GitHub, Discord, or during community sessions or SIG meetings.
-   Make sure that others think the work is worth taking up and will help review the BEP and any code changes required.
+1. Discuss the idea with the community and maintainers. Either here on GitHub, Discord, or during community sessions or SIG meetings. Make sure that others think the work is worth taking up and will help review the BEP and any code changes required.
 1. Make a copy of the [BEP template](./NNNN-template/) directory as `beps/NNNN-short-descriptive-title`, where `NNNN` is the next available number padded with leading zeroes.
 1. Fill out as much of the YAML metadata as you can.
 1. Fill out the template as best you can.
 1. If you want the BEP to be owned by a particular project area, add an entry for the BEP folder to [CODEOWNERS](../.github/CODEOWNERS).
-1. Create a PR for the BEP. Title it "BEP: &lt;title&gt;". Aim to get the high level goals clarified and avoid getting hung up on specific details. The PR can be merged early and iterated on.
-1. Once the BEP is ready to be merged, create a [feature issue](https://github.com/backstage/backstage/issues/new?template=feature.yaml) titled "BEP: &lt;title&gt;". Use the summary of the BEP as description and link to the BEP PR in the context section. Once the PR is merged, the issue should be updated to link to the BEP folder instead. This issue will serve as a general discussion issue for the BEP.
-1. Once the initial BEP is merged you should keep iterating on it until it is ready to leave that `provisional` state. Leaving the `provisional` state is a decision made by the project area maintainers.
+1. Create a PR for the BEP. Title it "BEP: &lt;title&gt;". Aim to get the high level goals clarified and avoid getting hung up on specific details. The PR can be iterated on until the BEP is ready to be merged.
+1. The relevant maintainers will review the BEP and provide feedback. It can also be useful to join relevant SIG meetings to discuss the BEP, to help drive it forward faster.
+1. Let the maintainers know when you think the BEP is ready to be merged. At this point the BEP should be fully filled out and ready for implementation, along with a clear owner for the work.
 
-Just because a BEP is merged does not mean it is complete or approved for implementation. Any BEP marked as `provisional` is a working document and subject to change.
+The merging of a BEP means that it is approved for implementation and has an owner that is responsible for said implementation. Up until that point, the author(s) of the BEP are responsible for driving the BEP forward.
 
-The authors of the BEP are also responsible for driving the BEP forward all the way to implementation. The approval of a BEP is not a commitment to implement it.
+While the BEP PR is open the owner can open separate PRs to ship experimental features in support of the BEP to help drive the design forward, and these may be merged pending usual PR review. If the BEP is withdrawn or rejected these features should generally be removed.
 
 ## FAQs
 
@@ -38,7 +37,7 @@ No, except for plugins that implement core features of Backstage. The BEP proces
 
 ### Can I update an existing BEP?
 
-Yes! As long as the BEP is still in the `provisional` state you should keep iterating on it. Please keep each PR focused on a single topic and avoid long-running and overly broad PRs.
+Yes! As long as the BEP is in the `implementable` state. Updates should however only be done based on new discoveries during the implementation phase. If you want to make a significant change to a BEP that has already been approved, you should open a new BEP to replace the old one.
 
 ### Can I update a BEP that was submitted by someone else?
 
@@ -48,6 +47,10 @@ Yes! BEPs are living documents and anyone can suggest changes to them. We encour
 
 Architecture Decision Records (ADRs) are used to document decisions made for development within the Backstage project. They are not intended to be used for proposing new features or changes to Backstage.
 
+### What's does it mean for a BEP to be in "provisional" state?
+
+This is a state from an older version of the BEP process, and means that it has been approved as work to be done but the exact design is not yet agreed upon. BEPs in this state need to be moved to the `implementable` state before they can be implemented.
+
 ### My FAQ isn't answered here!
 
 The BEP process is still evolving!
@@ -72,13 +75,10 @@ At the start of each BEP is a YAML document that contains metadata about the BEP
 
 The BEP Status is critical to clearly communicate the status of each BEP. Each BEP must have its status field set to one of the following values:
 
-- `provisional`: The BEP has been proposed and is actively being defined. The BEP as been approved by the owning project area maintainers as work to be done.
-- `implementable`: The approvers have approved this BEP for implementation.
-- `implemented`: The BEP has been implemented and is no longer actively changed.
-- `deferred`: The BEP is proposed but not actively being worked on.
-- `rejected`: The approvers and authors have decided that this BEP is not moving forward.
-  The BEP is kept around as a historical document.
-- `withdrawn`: The authors have withdrawn the BEP.
+- `implementable`: The BEP has been approved for implementation by the owning project area maintainers.
+- `implemented`: The BEP has been implemented.
+- `deferred`: The BEP was approved but is no longer being actively worked on. If anyone wishes to pick up the work they can move it back to the `implementable` state.
+- `rejected`: The approvers and authors have decided that this BEP is not moving forward. The BEP is kept around as a historical document.
 - `replaced`: The BEP has been replaced by a new BEP.
 
 ### Prior Art
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 6de6fd3426..8b5326e3e8 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -20,4 +20,4 @@ metadata:
 spec:
   type: library
   owner: CNCF
-  lifecycle: experimental
+  lifecycle: production
diff --git a/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild b/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
index fa8e42482b..47fd506a34 100644
--- a/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
+++ b/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
@@ -35,7 +35,7 @@
 
 
 
-FROM node:16-buster AS build
+FROM node:20-buster AS build
 
 RUN mkdir /app
 COPY . /app
diff --git a/docs/deployment/flightcontrol.md b/contrib/docs/tutorials/flightcontrol-deployment.md
similarity index 98%
rename from docs/deployment/flightcontrol.md
rename to contrib/docs/tutorials/flightcontrol-deployment.md
index df0c9284fb..aee915ba2f 100644
--- a/docs/deployment/flightcontrol.md
+++ b/contrib/docs/tutorials/flightcontrol-deployment.md
@@ -1,9 +1,4 @@
----
-id: flightcontrol
-title: Deploying with Flightcontrol
-sidebar_label: AWS Fargate via Flightcontrol
-description: Deploying Backstage to AWS Fargate via Flightcontrol
----
+# Deploying Backstage to AWS with Flightcontrol
 
 This guide explains how to deploy Backstage to [Flightcontrol](https://www.flightcontrol.dev?ref=backstage), a platform that fully automates deployments to Amazon Web Services (AWS). Flightcontrol supports git-driven and image registry deployments.
 
diff --git a/docs/deployment/heroku.md b/contrib/docs/tutorials/heroku-deployment.md
similarity index 96%
rename from docs/deployment/heroku.md
rename to contrib/docs/tutorials/heroku-deployment.md
index 8961848894..2dea1f021c 100644
--- a/docs/deployment/heroku.md
+++ b/contrib/docs/tutorials/heroku-deployment.md
@@ -1,9 +1,4 @@
----
-id: heroku
-title: Deploying with Heroku
-sidebar_label: Heroku
-description: How to deploy Backstage to Heroku
----
+# Deploying Backstage to Heroku
 
 Heroku is a Platform as a Service (PaaS) designed to simplify application deployment.
 
diff --git a/docs/deployment/koyeb.md b/contrib/docs/tutorials/koyeb-deployment.md
similarity index 86%
rename from docs/deployment/koyeb.md
rename to contrib/docs/tutorials/koyeb-deployment.md
index 3e30881752..75d42d8814 100644
--- a/docs/deployment/koyeb.md
+++ b/contrib/docs/tutorials/koyeb-deployment.md
@@ -1,9 +1,4 @@
----
-id: koyeb
-title: Deploying with Koyeb
-sidebar_label: Koyeb
-description: How to deploy Backstage to Koyeb
----
+# Deploying Backstage to Koyeb
 
 This guide explains how to deploy Backstage to [Koyeb](https://www.koyeb.com/), a serverless platform that provides the fastest way to deploy applications globally. Koyeb supports git-driven and container-based deployments.
 
@@ -31,7 +26,7 @@ backend:
 
 ## Push and deploy Backstage to Koyeb
 
-Push your Backstage application with its [Dockerfile](docker.md) to Koyeb using the following command:
+Push your Backstage application with its [Dockerfile](https://backstage.io/docs/deployment/docker) to Koyeb using the following command:
 
 ```bash
 koyeb app init example-backstage \
diff --git a/contrib/scaffolder/template-testing-dry-run.md b/contrib/scaffolder/template-testing-dry-run.md
index 70e0c572ab..12c4210ed6 100644
--- a/contrib/scaffolder/template-testing-dry-run.md
+++ b/contrib/scaffolder/template-testing-dry-run.md
@@ -26,7 +26,6 @@ import { readFile, writeFile } from 'node:fs/promises';
 import { gzipSync } from 'node:zlib';
 import { ensureDir } from 'fs-extra';
 import { program } from 'commander';
-import fetch from 'node-fetch';
 import ora from 'ora';
 import readdir from 'recursive-readdir';
 import { parse } from 'yaml';
diff --git a/docs/architecture-decisions/adr001-add-adr-log.md b/docs/architecture-decisions/adr001-add-adr-log.md
index d1bf0f83f5..de4283319a 100644
--- a/docs/architecture-decisions/adr001-add-adr-log.md
+++ b/docs/architecture-decisions/adr001-add-adr-log.md
@@ -7,14 +7,14 @@ description: Architecture Decision Record (ADR) logs as a reference point for th
 
 ## Decision
 
-A decision was made to store ADRs in a log in the project repository
+A decision was made to store ADRs in a log in the project repository.
 
 ## Discussion
 
 There is a need to store big decisions made in a log as a reference point for
-the team, help with onboarding new members and give context to others interested
+the team, help with onboarding new members, and give context to others interested
 in the project.
 
 ## Risks
 
-People stop adding ADRs to the log and context gets lost
+People stop adding ADRs to the log and context gets lost.
diff --git a/docs/architecture-decisions/adr002-default-catalog-file-format.md b/docs/architecture-decisions/adr002-default-catalog-file-format.md
index d0a657fe46..3b606cf46b 100644
--- a/docs/architecture-decisions/adr002-default-catalog-file-format.md
+++ b/docs/architecture-decisions/adr002-default-catalog-file-format.md
@@ -7,9 +7,9 @@ description: Architecture Decision Record (ADR) log on Default Software Catalog
 
 ## Background
 
-Backstage comes with a software catalog functionality, that you can use to track
+Backstage comes with software catalog functionality that you can use to track
 all your software components and more. It can be powered by data from various
-sources, and one of them that is included with the package, is a custom database
+sources, and one of them that is included with the package is a custom database
 backed catalog. It has the ability to keep itself updated automatically based on
 the contents of little descriptor files in your version control system of
 choice. Developers create these files and maintain them side by side with their
@@ -21,15 +21,15 @@ This ADR describes the default format of these descriptor files.
 
 Internally at Spotify, a homegrown software catalog system is used heavily and
 forms a core part of Backstage and other important pieces of the infrastructure.
-The user experience, learnings and certain pieces of metadata from that catalog
+The user experience, learnings, and certain pieces of metadata from that catalog
 are being carried over to the open source effort.
 
-The file format described herein, also draws heavy inspiration from the
+The file format described herein also draws heavy inspiration from the
 [kubernetes object format](https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/).
 
 ### Core Concepts
 
-There are a number of descriptor files, all of whose locations (e.g. within a
+There are a number of descriptor files, all of whose locations (e.g., within a
 version control system) are registered with the software catalog. The method of
 registration is not covered in this document; it could happen either manually
 inside Backstage, or by push events from a CI/CD pipelines, or by webhook
@@ -45,7 +45,7 @@ Entities have distinct names, and they may reference each other by those names.
 ## Format
 
 Descriptor files use the [YAML](https://yaml.org/spec/1.2/spec.html) format.
-They may be written by hand, or created using automated tools. Each file may
+They may be written by hand or created using automated tools. Each file may
 consist of several YAML documents (separated by `---`), where each document
 describes a single entity.
 
@@ -71,7 +71,7 @@ spec:
 ```
 
 The root fields `apiVersion`, `kind`, `metadata`, and `spec` are part of the
-_envelope_, defining the overall structure of all kinds of entity. Likewise, the
+_envelope_, defining the overall structure of all kinds of entities. Likewise, the
 `name`, `namespace`, `labels`, and `annotations` metadata fields are of special
 significance and have reserved purposes and distinct shapes.
 
@@ -87,23 +87,23 @@ The `kind` is the high level entity type being described, typically from the
 [Backstage system model](https://github.com/backstage/backstage/issues/390). The
 first versions of the catalog will focus on the `Component` kind.
 
-The `apiVersion`is the version of specification format for that particular
+The `apiVersion` is the version of the specification format for that particular
 entity that this file is written against. The version is used for being able to
 evolve the format, and the tuple of `apiVersion` and `kind` should be enough for
 a parser to know how to interpret the contents of the rest of the document.
 
 Backstage specific entities have an `apiVersion` that is prefixed with
-`backstage.io/`, to distinguish them from other types of object that share the
+`backstage.io/`, to distinguish them from other types of objects that share the
 same type of structure. This may be relevant when co-hosting these
-specifications with e.g. kubernetes object manifests.
+specifications with, e.g., Kubernetes object manifests.
 
-Early versions of the catalog will be using alpha/beta versions, e.g.
-`backstage.io/v1alpha1`, to signal that the format may still change. After that,
+Early versions of the catalog will be using alpha/beta versions, e.g.,
+`backstage.io/v1alpha1` to signal that the format may still change. After that,
 we will be using `backstage.io/v1` and up.
 
 ### `metadata`
 
-A structure that contains metadata about the entity, i.e. things that aren't
+A structure that contains metadata about the entity, i.e., things that aren't
 directly part of the entity specification itself. See below for more details
 about this structure.
 
@@ -142,40 +142,40 @@ Example: `visits-tracking-service`, `CircleciBuildsDs_avro_gcs`
 
 ### `namespace`
 
-The `name` of a namespace that the entity belongs to. This field is optional,
+The `name` of a namespace that the entity belongs to. This field is optional
 and currently has no special semantics apart from bounding the name uniqueness
 constraint if specified. It is reserved for future use and may get broader
 semantic implication.
 
-Namespaces may also be part of the catalog, and are `v1` / `Namespace` entities,
-i.e. not Backstage specific but the same as in Kubernetes.
+Namespaces may also be part of the catalog and are `v1` / `Namespace` entities,
+i.e., not Backstage specific but the same as in Kubernetes.
 
 ### `description`
 
-A human readable description of the entity, to be shown in Backstage. Should be
+A human readable description of the entity to be shown in Backstage. Should be
 kept short and informative, suitable to give an overview of the entity's purpose
 at a glance. More detailed explanations and documentation should be placed
 elsewhere.
 
 ### `labels`
 
-Labels are optional key/value pairs of that are attached to the entity, and
+Labels are optional key/value pairs that are attached to the entity, and
 their use is identical to
 [kubernetes object labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/).
 
-Their main purpose is for references to other entities, and for information that
+Their main purpose is for references to other entities and for information that
 is in one way or another classifying for the current entity. They are often used
 as values in queries or filters.
 
 Both the key and the value are strings, subject to the following restrictions.
 
-Keys have an optional prefix followed by a slash, and then the name part which
+Keys have an optional prefix followed by a slash, and then the name part, which
 is required. The prefix must be a valid lowercase domain name, at most 253
 characters in total. The name part must be sequences of `[a-zA-Z0-9]` separated
 by any of `[-_.]`, at most 63 characters in total.
 
 The `backstage.io/` prefix is reserved for use by Backstage core components.
-Some keys such as `system` also have predefined semantics.
+Some keys, such as `system` also have predefined semantics.
 
 Values are strings that follow the same restrictions as `name` above.
 
@@ -186,19 +186,19 @@ identical in use to
 [kubernetes object annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).
 
 Their purpose is mainly, but not limited, to reference into external systems.
-This could for example be a reference to the git ref the entity was ingested
+This could, for example, be a reference to the git ref the entity was ingested
 from, to monitoring and logging systems, to pagerduty schedules, etc.
 
 Both the key and the value are strings, subject to the following restrictions.
 
-Keys have an optional prefix followed by a slash, and then the name part which
+Keys have an optional prefix followed by a slash, and then the name part, which
 is required. The prefix must be a valid lowercase domain name, at most 253
 characters in total. The name part must be sequences of `[a-zA-Z0-9]` separated
 by any of `[-_.]`, at most 63 characters in total.
 
 The `backstage.io/` prefix is reserved for use by Backstage core components.
 
-Values can be of any length, but are limited to being strings.
+Values can be of any length but are limited to being strings.
 
 ## Component
 
diff --git a/docs/architecture-decisions/adr003-avoid-default-exports.md b/docs/architecture-decisions/adr003-avoid-default-exports.md
index 8ab79a451f..24445f0be1 100644
--- a/docs/architecture-decisions/adr003-avoid-default-exports.md
+++ b/docs/architecture-decisions/adr003-avoid-default-exports.md
@@ -16,7 +16,7 @@ thing well". The module would be consumed
 structure.
 
 Now, `ESModules` are the primary authoring format. They have numerous benefits,
-such as compile-time verification of exports, and standards-defined semantics.
+such as compile-time verification of exports and standards-defined semantics.
 They have a similar mechanism known as "default exports", which allows for a
 consumer to `import localName from 'the-module';`. This is implicitly the same
 as `import { default as localName } from 'the-module';`.
@@ -43,8 +43,8 @@ A summary:
 Using named exports helps prevent needing to rename symbols, which has myriad
 benefits. A few are:
 
-- IDE tools like "Find All References" and "Go To Definition" function
-- Manual codebase searching ("grep", etc) is easier with a unique symbol
+- IDE tools like "Find All References" and the "Go To Definition" function.
+- Manual codebase searching ("grep", etc) is easier with a unique symbol.
 
 ## Decision
 
diff --git a/docs/architecture-decisions/adr009-entity-references.md b/docs/architecture-decisions/adr009-entity-references.md
index 254ae7ac1d..7cac946388 100644
--- a/docs/architecture-decisions/adr009-entity-references.md
+++ b/docs/architecture-decisions/adr009-entity-references.md
@@ -45,8 +45,8 @@ Of these, only `name` is always required. Optionality of `kind` and `namespace`
 are contextual, and they may or may not have default contextual fallback values.
 All other possible key values in this structure are reserved for future use.
 
-A system or user wanting to express a full entity name that is always valid,
-shall supply the entire triplet whether using the string form or the compound
+A system or user wanting to express a full entity name that is always valid
+shall supply the entire triplet, whether using the string form or the compound
 form.
 
 A full description of the format can be found
@@ -62,7 +62,7 @@ containing the reference shall take the following form:
 ```
 
 All three parts are required under all circumstances. The default value for the
-`namespace` in the catalog is the string `"default"`, if the entity does not
+`namespace` in the catalog is the string `"default"` if the entity does not
 specify one explicitly in `metadata.namespace`.
 
 This means that we do not encourage the string form of entity references to be
diff --git a/docs/architecture-decisions/adr013-use-node-fetch.md b/docs/architecture-decisions/adr013-use-node-fetch.md
index d802988ae4..e65cf0a97b 100644
--- a/docs/architecture-decisions/adr013-use-node-fetch.md
+++ b/docs/architecture-decisions/adr013-use-node-fetch.md
@@ -1,10 +1,16 @@
 ---
 id: adrs-adr013
-title: 'ADR013: Proper use of HTTP fetching libraries'
+title: 'ADR013: [superseded] Proper use of HTTP fetching libraries'
 # prettier-ignore
 description: Architecture Decision Record (ADR) for the proper use of fetchApiRef, node-fetch, and cross-fetch for data fetching.
 ---
 
+:::note Superseded
+
+This ADR has been superseded by [ADR014](./adr014-use-fetch.md) and no longer applies.
+
+:::
+
 ## Context
 
 Using multiple HTTP packages for data fetching increases the complexity and the
@@ -32,6 +38,8 @@ It uses `cross-fetch` internally. Example:
 
 ```ts
 import { useApi } from '@backstage/core-plugin-api';
+
+// Inside some functional React component...
 const { fetch } = useApi(fetchApiRef);
 
 const response = await fetch('https://example.com/api/v1/users.json');
diff --git a/docs/architecture-decisions/adr014-use-fetch.md b/docs/architecture-decisions/adr014-use-fetch.md
new file mode 100644
index 0000000000..8454e69e7c
--- /dev/null
+++ b/docs/architecture-decisions/adr014-use-fetch.md
@@ -0,0 +1,80 @@
+---
+id: adrs-adr014
+title: 'ADR014: Proper use of HTTP fetching libraries'
+# prettier-ignore
+description: Architecture Decision Record (ADR) for the proper use of fetchApiRef, native fetch, and cross-fetch for data fetching.
+---
+
+## Context
+
+Until now we have been recommending the use of `node-fetch` in Node.js contexts
+through [ADR013](./adr013-use-node-fetch.md). Since then, Backstage has had its
+minimum requirements upgraded to Node.js 20 or newer. The Node.js platform has
+established a stable, reliable `undici` based native `fetch` in these versions.
+Additionally, there are [some issues](https://github.com/backstage/backstage/issues/24590)
+with using third party libraries that only appeared in newer versions of
+Node.js.
+
+## Decision
+
+All code that is executed in Node.js (including backend and CLIs) should use the
+native `fetch` for HTTP data fetching, and `typeof fetch` as the TypeScript type
+in code where a `fetch` implementation can be injected or is referred to.
+Example:
+
+```ts
+import { ResponseError } from '@backstage/errors';
+
+// this is implicitly global.fetch
+const response = await fetch('https://example.com/api/v1/users.json');
+if (!response.ok) {
+  throw await ResponseError.fromResponse(response);
+}
+const users = await response.json();
+```
+
+Frontend plugins and packages should prefer to use the
+[`fetchApiRef`](https://backstage.io/docs/reference/core-plugin-api.fetchapiref).
+
+```ts
+import { useApi } from '@backstage/core-plugin-api';
+
+// Inside some React component...
+const { fetch } = useApi(fetchApiRef);
+
+const response = await fetch('https://example.com/api/v1/users.json');
+if (!response.ok) {
+  throw await ResponseError.fromResponse(response);
+}
+const users = await response.json();
+```
+
+Isomorphic packages should have a dependency on the `cross-fetch` package for
+mocking and type definitions. Preferably, classes and functions in isomorphic
+packages should accept an argument of type `typeof fetch` to let callers supply
+their preferred implementation of `fetch`. This lets them adorn the calls with
+auth or other information, and track metrics etc, in a cross-platform way.
+Example:
+
+```ts
+import crossFetch from 'cross-fetch';
+
+export class MyClient {
+  private readonly fetch: typeof crossFetch;
+
+  constructor(options: { fetch?: typeof crossFetch }) {
+    this.fetch = options.fetch || crossFetch;
+  }
+
+  async users() {
+    return await this.fetch('https://example.com/api/v1/users.json');
+  }
+}
+```
+
+## Consequences
+
+We will gradually transition away from third party `fetch` replacement packages
+such as `node-fetch` and others on the Node.js platform.
+
+The `@mswjs/interceptors` library as used by `msw` version 1.x [does not support native fetch properly](https://github.com/mswjs/msw/issues/1563#issuecomment-1694249010) and likely never will. When you switch to using native fetch, you may see `msw` based tests start to fail to both capture and block traffic. Certain tests may need to be rewritten to use `msw` 2.x or newer instead, which uses a newer version of the interceptors.
diff --git a/docs/auth/google/provider.md b/docs/auth/google/provider.md
index 109c2ddd9f..e03985d432 100644
--- a/docs/auth/google/provider.md
+++ b/docs/auth/google/provider.md
@@ -89,6 +89,6 @@ backend.add(import('@backstage/plugin-auth-backend-module-google-provider'));
 
 ## Adding the provider to the Backstage frontend
 
-To add the provider to the frontend, add the `googleAuthApi` reference and
+To add the provider to the frontend, add the `googleAuthApiRef` reference and
 `SignInPage` component as shown in
 [Adding the provider to the sign-in page](../index.md#sign-in-configuration).
diff --git a/docs/auth/service-to-service-auth.md b/docs/auth/service-to-service-auth.md
index 13516a1117..126b136d0b 100644
--- a/docs/auth/service-to-service-auth.md
+++ b/docs/auth/service-to-service-auth.md
@@ -412,3 +412,31 @@ Each entry has one or more of the following fields:
         # Also supports the shorthand form:
         # action: create, read
   ```
+
+## Adding custom or logic for validation and issuing of tokens
+
+The `pluginTokenHandlerDecoratorServiceRef` can be used to decorate the existing token handler without having to re-implement the entire `AuthService` implementation.
+This is particularly useful when you want to add additional logic to the handler, such as logging or metrics or custom token validation.
+
+The `PluginTokenHandler` interface has two methods:
+
+- `issueToken`: This method is used to issue a token for a plugin. It takes in the `pluginId` and `targetPluginId` as arguments, and an optional `limitedUserToken` object which can be used to issue a token on behalf of another user. The method returns a promise that resolves to an object containing the issued token.
+
+- `verifyToken`: This method is used to verify a token. It takes in the token as an argument and returns a promise that resolves to an object containing the subject of the token and an optional limited user token.
+
+```ts
+import {
+  PluginTokenHandler,
+  pluginTokenHandlerDecoratorServiceRef,
+} from '@backstage/backend-defaults/auth';
+import { createServiceFactory } from '@backstage/backend-plugin-api';
+
+const decoratedPluginTokenHandler = createServiceFactory({
+  service: pluginTokenHandlerDecoratorServiceRef,
+  deps: {},
+  async factory() {
+    return (defaultImplementation: PluginTokenHandler) =>
+      new CustomTokenHandler(defaultImplementation);
+  },
+});
+```
diff --git a/docs/backend-system/architecture/07-feature-loaders.md b/docs/backend-system/architecture/07-feature-loaders.md
index 43954ec443..b2cc574bf9 100644
--- a/docs/backend-system/architecture/07-feature-loaders.md
+++ b/docs/backend-system/architecture/07-feature-loaders.md
@@ -73,6 +73,29 @@ export default createBackendFeatureLoader({
 });
 ```
 
+### Overriding service factories
+
+Service factories registered by feature loaders have lower priority than ones added directly via `backend.add`. This allows you to use a feature loader for a larger number of service implementations, but still override individual services.
+
+The ordering in which different feature loaders or service factories are added does not matter. There is also no priority between feature loaders, if two different feature loaders add a factory for the same service, the backend will fail to start.
+
+```ts
+const backend = createBackend();
+
+backend.add(
+  createBackendFeatureLoader({
+    async *loader() {
+      yield import('./commonDiscoveryService'); // discovery service
+      yield import('./commonRootLoggerService'); // root logger service
+    },
+  }),
+);
+
+backend.add(import('./myDiscoveryService')); // discovery service
+```
+
+The result of the above example is that the backend starts up with `./myDiscoveryService` as the discovery service implementation, while `./commonDiscoveryService` is ignored. The `./commonRootLoggerService` will still be used.
+
 ### Dynamic logic
 
 A feature loader can also be asynchronous, and for example fetch data from an external source to determine which features to load:
diff --git a/docs/backend-system/building-backends/08-migrating.md b/docs/backend-system/building-backends/08-migrating.md
index 71cccab784..a827171ff7 100644
--- a/docs/backend-system/building-backends/08-migrating.md
+++ b/docs/backend-system/building-backends/08-migrating.md
@@ -210,6 +210,25 @@ argument of `createBackend`.
 
 :::
 
+## Removing `@backstage/backend-common`
+
+The `@backstage/backend-common` package has been deprecated as part of moving to the new backend system, an you will need to replace existing usage of it. All exports from the package have been marked as deprecated in the last few releases of the package, and each export has its own deprecation message that explains how to replace that particular export.
+
+These are the deprecation messages for the most common replacements:
+
+- `createLegacyAuthAdapters` - Migrate to use the new backend system and auth services instead.
+- `errorHandler` - Use `MiddlewareFactory.create.error` from `@backstage/backend-defaults/rootHttpRouter` instead.
+- `getRootLogger` - This function will be removed in the future. If you need to get the root logger in the new system, please check out this documentation: https://backstage.io/docs/backend-system/core-services/logger
+- `getVoidLogger` - This function will be removed in the future. If you need to mock the root logger in the new system, please use `mockServices.logger.mock()` from `@backstage/backend-test-utils` instead.
+- `legacyPlugin` - Fully use the new backend system instead.
+- `loadBackendConfig` - Please migrate to the new backend system and use `coreServices.rootConfig` instead, or the [@backstage/config-loader#ConfigSources](https://backstage.io/docs/reference/config-loader.configsources) facilities if required.
+- `loggerToWinstonLogger` - Migrate to use the new `LoggerService` instead.
+- `resolveSafeChildPath` - This function is deprecated and will be removed in a future release, see [#24493](https://github.com/backstage/backstage/issues/24493). Please use the `resolveSafeChildPath` function from the `@backstage/backend-plugin-api` package instead.
+- `ServerTokenManager` - Please [migrate](https://backstage.io/docs/tutorials/auth-service-migration) to the new `coreServices.auth`, `coreServices.httpAuth`, and `coreServices.userInfo` services as needed instead.
+- `useHotMemoize` - Hot module reloading is no longer supported for backends.
+
+If you want to browse all of the deprecations in one place you can look at the `dist/index.d.ts` file in the package, either in `node_modules/@backstage/backend-common/dist/index.d.ts` in your own project, or it can found in the [code tab on npmjs.com](https://www.npmjs.com/package/@backstage/backend-common?activeTab=code).
+
 ## Cleaning Up the Plugins Folder
 
 For plugins that are private and your own, you can follow a [dedicated migration guide](../building-plugins-and-modules/08-migrating.md) as you see fit, at a
diff --git a/docs/backend-system/building-plugins-and-modules/02-testing.md b/docs/backend-system/building-plugins-and-modules/02-testing.md
index 38107f0242..1ec100cff3 100644
--- a/docs/backend-system/building-plugins-and-modules/02-testing.md
+++ b/docs/backend-system/building-plugins-and-modules/02-testing.md
@@ -224,10 +224,7 @@ your test database.
 ```ts
 const { knex, subject } = await createSubject(databaseId);
 const { server } = await startTestBackend({
-  features: [
-    myPlugin(),
-    mockServices.database.mock({ getClient: async () => knex }),
-  ],
+  features: [myPlugin(), mockServices.database.factory({ knex })],
 });
 ```
 
diff --git a/docs/backend-system/building-plugins-and-modules/08-migrating.md b/docs/backend-system/building-plugins-and-modules/08-migrating.md
index 8b2ea17de8..ea86854b18 100644
--- a/docs/backend-system/building-plugins-and-modules/08-migrating.md
+++ b/docs/backend-system/building-plugins-and-modules/08-migrating.md
@@ -39,7 +39,7 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node';
 import { Router } from 'express';
 import { KubernetesBuilder } from './KubernetesBuilder';
 
diff --git a/docs/backend-system/core-services/discovery.md b/docs/backend-system/core-services/discovery.md
index 455e398d8b..4324edbbf9 100644
--- a/docs/backend-system/core-services/discovery.md
+++ b/docs/backend-system/core-services/discovery.md
@@ -16,7 +16,6 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { fetch } from 'node-fetch';
 
 createBackendPlugin({
   pluginId: 'example',
diff --git a/docs/backend-system/core-services/http-auth.md b/docs/backend-system/core-services/http-auth.md
index 13938c921d..f3ce96fb25 100644
--- a/docs/backend-system/core-services/http-auth.md
+++ b/docs/backend-system/core-services/http-auth.md
@@ -102,6 +102,45 @@ or [contribute](https://github.com/backstage/backstage/blob/master/CONTRIBUTING.
 
 :::
 
+### Custom token extraction logic
+
+In some cases, you might want to customize how tokens are extracted from incoming requests. It might be that you want to extract tokens from a different location in the request. To support this you can supply your own slightly modified httpAuth service. The `DefaultHttpAuthService` class is exported from `@backstage/backend-defaults/httpAuth` and it's static `create` method can be used to pass in a custom `getTokenFromRequest` extraction function.
+
+```ts
+import { DefaultHttpAuthService } from '@backstage/backend-defaults/httpAuth';
+import {
+  coreServices,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+
+export const customizedAuthServiceFactory = createServiceFactory({
+  service: coreServices.httpAuth,
+  deps: {
+    auth: coreServices.auth,
+    discovery: coreServices.discovery,
+    plugin: coreServices.pluginMetadata,
+  },
+  async factory({ auth, discovery, plugin }) {
+    return DefaultHttpAuthService.create({
+      auth,
+      discovery,
+      pluginId: plugin.getId(),
+      getTokenFromRequest: req => {
+        let token: string | undefined;
+        const header = req.headers.some_random_header;
+        if (typeof header === 'string') {
+          const parts = header.split(' ');
+          if (parts.length === 2 && parts[0] === 'Bearer') {
+            token = parts[1];
+          }
+        }
+        return { token };
+      },
+    });
+  },
+});
+```
+
 This service has no configuration options, but it abides by the policies you
 have set up using [the `httpRouter` service](./http-router.md) for your routes,
 if any.
diff --git a/docs/backend-system/core-services/http-router.md b/docs/backend-system/core-services/http-router.md
index 6ab8218c83..c354f4fceb 100644
--- a/docs/backend-system/core-services/http-router.md
+++ b/docs/backend-system/core-services/http-router.md
@@ -70,4 +70,67 @@ access the incoming credentials.
 
 ## Configuring the service
 
-This service does not have any configuration options.
+For more advanced customization, there are several APIs from the `@backstage/backend-defaults/httpRouter` package that allow you to customize the implementation of the config service. The default implementation uses all of the middleware exported from `@backstage/backend-defaults/httpRouter`, including `createLifecycleMiddleware`, `createAuthIntegrationRouter`, `createCredentialsBarrier` and `createCookieAuthRefreshMiddleware`. You can use these to create your own `httpRouter` service implementation, for example - here's how you would add a custom health check route to all plugins:
+
+```ts
+import {
+  createLifecycleMiddleware,
+  createCookieAuthRefreshMiddleware,
+  createCredentialsBarrier,
+  createAuthIntegrationRouter,
+} from '@backstage/backend-defaults/httpRouter';
+import { createServiceFactory } from '@backstage/backend-plugin-api';
+
+const backend = createBackend();
+
+backend.add(
+  createServiceFactory({
+    service: coreServices.httpRouter,
+    initialization: 'always',
+    deps: {
+      plugin: coreServices.pluginMetadata,
+      config: coreServices.rootConfig,
+      lifecycle: coreServices.lifecycle,
+      rootHttpRouter: coreServices.rootHttpRouter,
+      auth: coreServices.auth,
+      httpAuth: coreServices.httpAuth,
+    },
+    async factory({
+      auth,
+      httpAuth,
+      config,
+      plugin,
+      rootHttpRouter,
+      lifecycle,
+    }) {
+      const router = PromiseRouter();
+
+      rootHttpRouter.use(`/api/${plugin.getId()}`, router);
+
+      const credentialsBarrier = createCredentialsBarrier({
+        httpAuth,
+        config,
+      });
+
+      router.use(createAuthIntegrationRouter({ auth }));
+      router.use(createLifecycleMiddleware({ lifecycle }));
+      router.use(credentialsBarrier.middleware);
+      router.use(createCookieAuthRefreshMiddleware({ auth, httpAuth }));
+
+      // Add a custom healthcheck endpoint for all plugins.
+      router.use('/health', (_, res) => {
+        res.status(200);
+      });
+
+      return {
+        use(handler: Handler): void {
+          router.use(handler);
+        },
+        addAuthPolicy(policy: HttpRouterServiceAuthPolicy): void {
+          credentialsBarrier.addAuthPolicy(policy);
+        },
+      };
+    },
+  }),
+);
+```
diff --git a/docs/backend-system/core-services/root-health.md b/docs/backend-system/core-services/root-health.md
index 663dd699ae..fa147499a6 100644
--- a/docs/backend-system/core-services/root-health.md
+++ b/docs/backend-system/core-services/root-health.md
@@ -38,3 +38,29 @@ backend.add(
   }),
 );
 ```
+
+### Custom headers in health check responses
+
+While not implemented directly in the root health service, the default implementation of the [RootHttpRouter](./root-http-router.md) service includes a configuration option to set additional headers to include in health check responses. For example, you can add a `service-name` header using the following configuration:
+
+```yaml
+backend:
+  health:
+    headers:
+      service-name: my-service
+```
+
+It can be a good idea to set a header for your health check responses that
+uniquely identifies your service in a multi-service environment. This ensures
+that the health check that is configured for your service is actually hitting
+your service and not another.
+
+For example, if using Envoy you can use the [`service_name_matcher`](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/health_checking#health-check-identity) configuration and
+set the `x-envoy-upstream-healthchecked-cluster` header to a matching value. For example:
+
+```yaml
+backend:
+  health:
+    headers:
+      x-envoy-upstream-healthchecked-cluster: my-service
+```
diff --git a/docs/backend-system/core-services/root-http-router.md b/docs/backend-system/core-services/root-http-router.md
index a2316b957b..9ee8599eb5 100644
--- a/docs/backend-system/core-services/root-http-router.md
+++ b/docs/backend-system/core-services/root-http-router.md
@@ -42,6 +42,29 @@ createBackendPlugin({
 
 ## Configuring the service
 
+### Via `app-config.yaml`
+
+The `app-config.yaml` file provides configurable options that can be adjusted to meet your `RootHttpRouterService` specific requirements:
+
+```yaml
+backend:
+  lifecycle:
+    # (Optional) The maximum time that paused requests will wait for the service to start, before returning an error (defaults to 5 seconds).
+    # Supported formats:
+    # - A string in the format of '1d', '2 seconds' etc. as supported by the `ms` library.
+    # - A standard ISO formatted duration string, e.g. 'P2DT6H' or 'PT1M'.
+    # - An object with individual units (in plural) as keys, e.g. `{ days: 2, hours: 6 }`.
+    startupRequestPauseTimeout: { seconds: 10 }
+    # (Optional) The minimum time that the HTTP server will delay the shutdown of the backend. During this delay health checks will be set to failing, allowing traffic to drain (defaults to 0 seconds).
+    # Supported formats:
+    # - A string in the format of '1d', '2 seconds' etc. as supported by the `ms` library.
+    # - A standard ISO formatted duration string, e.g. 'P2DT6H' or 'PT1M'.
+    # - An object with individual units (in plural) as keys, e.g. `{ days: 2, hours: 6 }`.
+    serverShutdownTimeout: { seconds: 20 }
+```
+
+### Via Code
+
 There's additional options that you can pass to configure the root HTTP Router service. These options are passed when you call `createBackend`.
 
 - `indexPath` - optional path to forward all unmatched requests to. Defaults to `/api/app` which is the `app-backend` plugin responsible for serving the frontend application through the backend.
diff --git a/docs/backend-system/core-services/scheduler.md b/docs/backend-system/core-services/scheduler.md
index e4c67a1199..154878ddfc 100644
--- a/docs/backend-system/core-services/scheduler.md
+++ b/docs/backend-system/core-services/scheduler.md
@@ -16,7 +16,6 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { fetch } from 'node-fetch';
 
 createBackendPlugin({
   pluginId: 'example',
diff --git a/docs/deployment/backstage-deploy/aws.md b/docs/deployment/backstage-deploy/aws.md
deleted file mode 100644
index 818850a6f5..0000000000
--- a/docs/deployment/backstage-deploy/aws.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-id: aws-lightsail
-title: Deploying Backstage on AWS Lightsail
-sidebar_label: AWS Lightsail
-description: How to deploy Backstage on AWS Lightsail
----
-
-> **DISCLAIMER: The `deploy` command is in alpha and still experimental. Do not use the `deploy` command for production deployments.**
-
-Getting started with Backstage often involves setting up an instance on a cloud provider and sharing it with your team so they can experiment. To make this cloud deployment easier, we've built a `deploy` command to stand up a proof-of-concept instance on AWS (using Lightsail).
-
-## What is AWS Lightsail
-
-:::tip
-
-AWS offers a free tier for up to three months on $10 USD/month Container service (Micro -1 node). By default we use the `nano` node, so if you are a new user this approach shouldn't cost you anything. For more information, refer to the [pricing](https://aws.amazon.com/lightsail/pricing/) documentation.
-
-:::
-
-AWS Lightsail offers a simple way to run containers in the cloud. To learn more about AWS Lightsail, please refer to the [official documentation](https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-container-services-deployments).
-
-## Creating user in AWS
-
-- Open the AWS console and navigate to the IAM section
-- In the left side menu click on `Users` and then click on `Add users`
-- Specify a username and then click on `Next`
-- Afterwards you can assign permissions, select `Attach policies directly` and then click on `Create policy`.
-  This should take you to a new window in which you can create a new policy based on `JSON`.
-  Copy over the following:
-
-```json
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "VisualEditor0",
-      "Effect": "Allow",
-      "Action": [
-        "ecr:DescribeImageReplicationStatus",
-        "ecr:ListTagsForResource",
-        "ecr:UploadLayerPart",
-        "ecr:BatchGetRepositoryScanningConfiguration",
-        "ecr:DeleteRepository",
-        "ecr:GetRegistryScanningConfiguration",
-        "ecr:CompleteLayerUpload",
-        "ecr:TagResource",
-        "ecr:DescribeRepositories",
-        "ecr:DeleteRepositoryPolicy",
-        "ecr:BatchCheckLayerAvailability",
-        "ecr:GetLifecyclePolicy",
-        "ecr:GetRegistryPolicy",
-        "ecr:PutLifecyclePolicy",
-        "ecr:DescribeImageScanFindings",
-        "ecr:GetLifecyclePolicyPreview",
-        "ecr:CreateRepository",
-        "ecr:DescribeRegistry",
-        "ecr:GetDownloadUrlForLayer",
-        "ecr:GetAuthorizationToken",
-        "ecr:DeleteLifecyclePolicy",
-        "ecr:PutImage",
-        "ecr:UntagResource",
-        "ecr:SetRepositoryPolicy",
-        "ecr:BatchGetImage",
-        "ecr:InitiateLayerUpload",
-        "ecr:GetRepositoryPolicy",
-        "lightsail:CreateContainerService",
-        "lightsail:GetKeyPair",
-        "lightsail:GetContainerServiceDeployments",
-        "lightsail:CreateContainerServiceRegistryLogin",
-        "lightsail:GetContainerImages",
-        "lightsail:UntagResource",
-        "lightsail:RegisterContainerImage",
-        "lightsail:GetContainerServices",
-        "lightsail:GetContainerServicePowers",
-        "lightsail:GetKeyPairs",
-        "lightsail:CreateContainerServiceDeployment",
-        "lightsail:GetContainerServiceMetricData",
-        "lightsail:GetContainerAPIMetadata",
-        "lightsail:DeleteContainerService",
-        "lightsail:GetContainerLog",
-        "lightsail:TagResource"
-      ],
-      "Resource": "*"
-    },
-    {
-      "Sid": "Statement1",
-      "Effect": "Allow",
-      "Action": [],
-      "Resource": []
-    }
-  ]
-}
-```
-
-Then click on `Next` and give the policy a name and a description of your liking. Afterwards, click on `Create policy`.
-
-- Navigate back to the user creation window and press on the refresh button and search for the policy you just created. Now, create the user.
-- Now you will be redirected to all users, click on the user you just created and click on `Security credentials`
-- Scroll below and click on `Create access key`
-- Choose `Command Line Interface (CLI)`
-- Now export the following values
-
-```bash
-$ export AWS_ACCESS_KEY_ID=... (first value)
-$ export AWS_SECRET_ACCESS_KEY=.... (second secret value)
-```
-
-## Configuring the Pulumi CLI
-
-Second, install the [Pulumi CLI](https://www.pulumi.com/docs/get-started/install/) - `backstage-deploy` uses it to
-simplify the management of cloud resources (Pulumi allows us to simply specify the desired "target cloud state", and
-Pulumi will intelligently create/modify/delete resources to reach that state. Nice!).
-
-Then we need to execute the following commands, to set Pulumi up:
-
-:::tip
-
-Make sure to store your passphrase somewhere safe as it is used to encrypt/decrypt your Pulumi config.
-
-:::
-
-```bash
-$ pulumi login --local
-$ export PULUMI_CONFIG_PASSPHRASE="<your-secret>"
-```
-
-By using `pulumi login --local` we are making sure that Pulumi stores our state on the local file disk. The environment variable `PULUMI_CONFIG_PASSPHRASE` is used by Pulumi to generate a unique key for your stack
-
-## Deploying your instance on Lightsail
-
-:::tip
-
-Make sure that [Docker](https://docs.docker.com/) is running on your machine before you start this section.
-
-:::
-
-After you have made your changes to your local instance, it's time to deploy it on Lightsail.
-
-First, we need to configure a new `app-config` file and update the `baseUrl`.
-
-```bash
-$ touch app-config.deployment.yaml
-```
-
-And then update the file with the following yaml:
-
-```yaml
-app:
-  baseUrl: ${BACKSTAGE_HOST}
-
-backend:
-  baseUrl: ${BACKSTAGE_HOST}
-```
-
-The environment variable `BACKSTAGE_HOST` will be set to the endpoint that AWS Lightsail creates.
-
-Now we can deploy our instance!
-
-```bash
-$ npx backstage-deploy aws --stack backstage-poc --create-dockerfile
-```
-
-In the first part of the command, we are specifying that we want to deploy our instance on AWS. With the [`--stack`](https://www.pulumi.com/docs/reference/cli/pulumi_stack/) option, we are providing Pulumi a reference to our container deployment. Furthermore, with the `--create-dockerfile` option, there will be a `Dockerfile` and `.dockerignore` created in the root of the project.
-
-After running the command, Pulumi will start creating the following resources for you in AWS:
-
-- ECR Repository
-- Lightsail Container Service
-- Lightsail Container Service Deployment
-- Policy that allows Lightsail to pull from ECR
-
-If it's the first time building the Docker image, it might take a while for everything to be fully provisioned. After the command is finished running, your Backstage instance should be up and running on AWS Lightsail! 🎉
-
-### Cleaning up resources
-
-Cleaning up the resources is also done with the deploy command.
-
-```bash
-$ npx backstage-deploy aws --stack backstage-poc --destroy
-```
-
-This will delete everything that was originally created by the `deploy` command.
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index afab8ef54d..546d027b86 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -5,6 +5,10 @@ sidebar_label: Docker
 description: How to build a Backstage Docker image for deployment
 ---
 
+:::note Note
+Before you start this section, it would be good to have a basic understanding of Docker and how it works. If you are new to Docker, you can start with the [Docker overview](https://docs.docker.com/get-started/overview/) guide.
+:::
+
 This section describes how to build a Backstage App into a deployable Docker
 image. It is split into three sections, first covering the host build approach,
 which is recommended due to its speed and more efficient and often simpler
@@ -46,8 +50,7 @@ yarn install --immutable
 yarn tsc
 
 # Build the backend, which bundles it all up into the packages/backend/dist folder.
-# The configuration files here should match the one you use inside the Dockerfile below.
-yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml
+yarn build:backend
 ```
 
 Once the host build is complete, we are ready to build our image. The following
@@ -85,6 +88,7 @@ WORKDIR /app
 # Copy files needed by Yarn
 COPY --chown=node:node .yarn ./.yarn
 COPY --chown=node:node .yarnrc.yml ./
+COPY --chown=node:node backstage.json ./
 
 # This switches many Node.js dependencies to production mode.
 ENV NODE_ENV=production
@@ -181,7 +185,7 @@ the repo root:
 FROM node:20-bookworm-slim AS packages
 
 WORKDIR /app
-COPY package.json yarn.lock ./
+COPY backstage.json package.json yarn.lock ./
 COPY .yarn ./.yarn
 COPY .yarnrc.yml ./
 
@@ -219,6 +223,7 @@ WORKDIR /app
 COPY --from=packages --chown=node:node /app .
 COPY --from=packages --chown=node:node /app/.yarn ./.yarn
 COPY --from=packages --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=packages --chown=node:node /app/backstage.json ./
 
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
     yarn install --immutable
@@ -266,7 +271,9 @@ WORKDIR /app
 # Copy the install dependencies from the build stage and context
 COPY --from=build --chown=node:node /app/.yarn ./.yarn
 COPY --from=build --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=build --chown=node:node /app/backstage.json ./
 COPY --from=build --chown=node:node /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton/ ./
+
 # Note: The skeleton bundle only includes package.json files -- if your app has
 # plugins that define a `bin` export, the bin files need to be copied as well to
 # be linked in node_modules/.bin during yarn install.
diff --git a/docs/deployment/index.md b/docs/deployment/index.md
index 0524e71db8..76c8c12932 100644
--- a/docs/deployment/index.md
+++ b/docs/deployment/index.md
@@ -30,14 +30,7 @@ At Spotify, we deploy software generally by:
 This method is covered in [Building a Docker image](docker.md) and
 [Deploying with Kubernetes](k8s.md).
 
-There is also an example of deploying on [Heroku](heroku.md), which only
-requires the first two steps.
-
-There is also a contrib guide to deploying Backstage with
-[AWS Fargate and Aurora PostgreSQL](https://github.com/backstage/backstage/blob/master/contrib/docs/tutorials/aws-fargate-deployment.md).
-
-Please consider contributing other deployment guides if you get Backstage set up
-on common infrastructure, it would be a great benefit to the community.
+There are many ways to deploy Backstage! You can find more examples in the community contributed guides found [here](https://github.com/backstage/backstage/blob/master/contrib/docs/tutorials/).
 
 If you need to run Backstage behind a corporate proxy, this
 [contributed guide](https://github.com/backstage/backstage/blob/master/contrib/docs/tutorials/help-im-behind-a-corporate-proxy.md)
diff --git a/docs/features/kubernetes/configuration.md b/docs/features/kubernetes/configuration.md
index 7c14c40283..71fdd0be0e 100644
--- a/docs/features/kubernetes/configuration.md
+++ b/docs/features/kubernetes/configuration.md
@@ -17,6 +17,9 @@ The following is a full example entry in `app-config.yaml`:
 
 ```yaml
 kubernetes:
+  frontend:
+    podDelete:
+      enabled: true
   serviceLocatorMethod:
     type: 'multiTenant'
   clusterLocatorMethods:
@@ -48,6 +51,55 @@ kubernetes:
       exposeDashboard: true
 ```
 
+### `frontend` (optional)
+
+This is an array used to configure some frontend features.
+
+Valid values are:
+
+- `podDelete`
+
+#### `podDelete` (optional)
+
+This configures the behavior of the delete pod button in the container panel.
+
+Valid configurations are:
+
+- `enabled`
+
+##### `enabled`
+
+This configuration controls the visibility of this feature.
+
+Valid values are:
+
+- `true`
+- `false`
+
+The default value is `false`.
+
+#### Internationalization
+
+To customize or translate the **Delete Pod** text, use the following approach:
+
+```js
+import { createTranslationMessages } from '@backstage/core-plugin-api/alpha';
+import { kubernetesReactTranslationRef } from '@backstage/plugin-kubernetes-react/alpha';
+
+const app = createApp({
+  __experimentalTranslations: {
+    resources: [
+      createTranslationMessages({
+        ref: kubernetesReactTranslationRef,
+        messages: {
+          "podDrawer.buttons.delete": 'Restart Pod'
+        }
+      })
+    ]
+  },
+  ...
+```
+
 ### `serviceLocatorMethod`
 
 This configures how to determine which clusters a component is running in.
diff --git a/docs/features/software-catalog/configuration.md b/docs/features/software-catalog/configuration.md
index 2d86811b14..6ed5a1d4b6 100644
--- a/docs/features/software-catalog/configuration.md
+++ b/docs/features/software-catalog/configuration.md
@@ -204,7 +204,8 @@ It can be configured with the `stitchingStrategy` app-config parameter.
 
 ```yaml title="app-config.yaml"
 catalog:
-  stitchingStrategy: immediate
+  stitchingStrategy:
+    mode: immediate
 ```
 
 For the `deferred` mode you can set up additional parameters to further tune the process,
@@ -217,9 +218,10 @@ These parameters accept a duration object, similar to the `processingInterval` p
 
 ```yaml title="app-config.yaml"
 catalog:
-  stitchingStrategy: deferred
-  pollingInterval: { seconds: 1 }
-  stitchTimeout: { minutes: 1 };
+  stitchingStrategy:
+    mode: deferred
+    pollingInterval: { seconds: 1 }
+    stitchTimeout: { minutes: 1 };
 ```
 
 ## Subscribing to Catalog Errors
diff --git a/docs/features/software-catalog/faq.md b/docs/features/software-catalog/faq.md
index a8a1a30379..974a4ee119 100644
--- a/docs/features/software-catalog/faq.md
+++ b/docs/features/software-catalog/faq.md
@@ -42,3 +42,29 @@ First, performance. As is described [here](#can-i-call-the-catalog-itself-from-i
 Second, user experience. The catalog is an eventually consistent system that constantly tries to mirror external realities. Users make changes in catalog-info files, or things update in external systems, and those changes get streamed in and settle over time inside the catalog. But throwing an error in a processor, instantly aborts processing of that entity and stops its ingestion. Now imagine being a large organization where these changes happen maybe hundreds of times per day. Owners of catalog-info files will constantly be surprised by their files "breaking" in ingestion, maybe a very long time after they were initially created - they were valid at their time of creation and haven't been touched since! This is very frustrating and slows down your users because things break silently for reasons out of your control.
 
 There are cases where it's fine to throw hard validation errors in processors. Notably, when it doesn't pass a schema test at all and readers of the catalog data will break if the data was let through. Setting the owner to be a number instead of a string could be such an example.
+
+## Can I throw errors when validating entities?
+
+In short: Sometimes. Only if the shape is so wrong that it would not even parse, or violates TypeScript and similar contracts.
+
+Never throw errors due to "soft" errors, in particular relations not matching an existing target ([see above](#can-i-validate-relations-in-processors)). For soft errors, we recommend instead letting them through into the catalog, and then implementing the checks externally and nudging people gently toward fixing their own metadata. A dynamic info bar at the top of an entity page that informs the owners as they visit the page that a certain relation seems wrong and should be fixed, can go a very long way.
+
+To a large degree, this boils down to user experience. The catalog is an eventually consistent system that constantly tries to mirror external realities. Users make changes in catalog-info files, or things update in external systems, and those changes get streamed in and settle over time inside the catalog. But throwing an error in a processor, instantly aborts processing of that entity and stops its ingestion. Now imagine being a large organization where these changes happen maybe hundreds of times per day. Owners of catalog-info files will constantly be surprised by their files "breaking" in ingestion, maybe a very long time after they were initially created - they were valid at their time of creation and haven't been touched since! This is very frustrating and slows down your users because things break silently for reasons out of your control.
+
+You can throw for "hard" errors such as when the basic expectations of the entity shape are broken, for example, if a [`metadata.annotations` value](./descriptor-format.md#annotations-optional) was an array instead of a string. That does not match the TypeScript contract, and if you accepted such an entity into the catalog, readers of those entities are likely to explode when trying to perform string operations on that value.
+
+## Can I represent versions (of APIs, services etc) in the catalog?
+
+We do not recommend trying to represent fine grained versions in the catalog. It does not have builtin facilities for that (by design), and the alternatives that exist for trying to do so anyway, end up being awkward and have significant drawbacks. You can sometimes represent major, breaking versions as separate entities (more on that below).
+
+This response can seem surprising, but there's a clear intent behind it. Catalog entities generally represent the "human concept" of a thing, rather than the exact technical implementation of it. The name and granularity of entries in the catalog often match the way that you think and speak of that thing when talking to others. Then, you attach plugins to that high level concept, that are responsible for showing all of the finer details about it that your users need.
+
+The catalog should contain _rarely changing_, _human curated_ data that is easily overseen and _managed by the owners_ of those entities.
+
+One example is backend services. In a fast moving world, there may be several versions of a service deployed in several environments at the same time, and those can change rapidly. Despite that, when you talk about the service with your colleagues, you probably call it e.g. "the scaffolder". So you catalog it for example as `kind: Component`, `name: scaffolder`, `type: service`. But in your frontend, you can still have rich plugins that directly query your CI/CD systems, log collectors, and similar, to show precise, real-time information about exactly what's going on in your infrastructure in terms of that service. And notably, this happened without putting the burden on your end users to maintain a complex, fast moving set of yaml data just in order to appease those views.
+
+Another example is software libraries. It's tempting to catalog every dependency of every software component, but it's ultimately not a good fit for the catalog. If you develop inner-source libraries that are widely used in your org, then by all means make a single component for them! That lets people search for it, find the owners, and gain similar insights. But if you want to track individual versions and their usages within the ecosystem, then that's a use case better served by a separate solution. Which then, in turn, absolutely could have a nice plugin view in Backstage so that you can see its output right in the view of the library itself!
+
+And finally the example of APIs. This topic can sometimes be the most contentious. It would be unfortunate to have to create entities for every iteration of your API, and it would clobber search and ultimately be confusing.
+
+Especially for APIs, but also the other kinds, you can still end up wanting to make a new catalog entity when a new major version of that thing is released. At that point, in some cases, the new major version is almost like a completely new component, deployed in isolation from the old one, with completely updated contracts, maybe with different documentation etc. If so then sure, make a `kind: API`, `name: customerinfo2` for example. Then you make the choice that there will be two entities popping up in search results when looking for that string, and maybe that is a good thing in this instance.
diff --git a/docs/features/software-templates/experimental.md b/docs/features/software-templates/experimental.md
new file mode 100644
index 0000000000..e37971ad82
--- /dev/null
+++ b/docs/features/software-templates/experimental.md
@@ -0,0 +1,87 @@
+---
+id: experimental
+title: Experimental Features
+# prettier-ignore
+description: Information on Experimental Features that are currently available in the Scaffolder
+---
+
+## Introduction
+
+This section contains information and guides on the experimental features that are currently available in the Scaffolder. Be advised that these features are still in development and may not be fully stable or complete, and are subject to change at any time.
+
+Please leave feedback on these features in the [Backstage Discord](https://discord.com/invite/MUpMjP2) or by [creating an issue](https://github.com/backstage/backstage/issues/new/choose) on the Backstage GitHub repository.
+
+## Retries and Recovery
+
+### TODO
+
+## Form Decorators
+
+Form decorators provide the ability to run arbitrary code before the form is submitted along with secrets to the `scaffolder-backend` plugin. They are provided to the `app` using a Utility API.
+
+#### Installation
+
+To install the Form Decorators, add the following to your `packages/app/src/apis.ts`:
+
+```ts
+  createApiFactory({
+    api: formDecoratorsApiRef,
+    deps: {},
+    factory: () =>
+      DefaultScaffolderFormDecoratorsApi.create({
+        decorators: [
+          // add decorators here
+        ],
+      }),
+  }),
+```
+
+And then you'll also need to define which decorators run in each template using the `EXPERIMENTAL_formDecorators` key in the template's `spec`:
+
+```yaml
+kind: Template
+metadata:
+  name: my-template
+spec:
+  EXPERIMENTAL_formDecorators:
+    - id: my-decorator
+      input:
+        test: something funky
+
+  parameters: ...
+  steps: ...
+```
+
+#### Creating a Decorator
+
+You can create a decorator using the simple helper method `createScaffolderFormDecorator`:
+
+```ts
+export const mockDecorator = createScaffolderFormDecorator({
+  // give the decorator a name
+  id: 'mock-decorator',
+
+  // define the schema for the input that can be proided in `template.yaml`
+  schema: {
+    input: {
+      test: z => z.string(),
+    },
+  },
+  deps: {
+    // define dependencies here
+    githubApi: githubAuthApiRef,
+  },
+  decorator: async (
+    // Context has all the things needed to write simple decorators
+    { setSecrets, setFormState, input: { test } },
+    // Depepdencies injected here
+    { githubApi },
+  ) => {
+    // mutate the form state
+    setFormState(state => ({ ...state, test, mock: 'MOCK' }));
+
+    // mutate the form secrets
+    setSecrets(state => ({ ...state, GITHUB_TOKEN: 'MOCK_TOKEN' }));
+  },
+});
+```
diff --git a/docs/features/software-templates/index.md b/docs/features/software-templates/index.md
index 077090743f..8018b76d91 100644
--- a/docs/features/software-templates/index.md
+++ b/docs/features/software-templates/index.md
@@ -25,7 +25,9 @@ locations like GitHub or GitLab.
 If you're running Backstage with Node 20 or later, you'll need to pass the flag `--no-node-snapshot` to Node in order to
 use the templates feature.
 One way to do this is to specify the `NODE_OPTIONS` environment variable before starting Backstage:
-`export NODE_OPTIONS=--no-node-snapshot`
+`export NODE_OPTIONS="${NODE_OPTIONS:-} --no-node-snapshot"`
+
+> It's important to append to the existing `NODE_OPTIONS` value, if it's already set, rather than overwriting it, since some NodeJS Debugging tools may rely on this environment variable to work properly.
 
 :::
 
diff --git a/docs/features/software-templates/input-examples.md b/docs/features/software-templates/input-examples.md
index ef90013e49..0162ffb8f3 100644
--- a/docs/features/software-templates/input-examples.md
+++ b/docs/features/software-templates/input-examples.md
@@ -198,6 +198,23 @@ parameters:
         ui:widget: checkboxes
 ```
 
+## Markdown text blocks
+
+```yaml
+parameters:
+  - title: Fill in some steps
+    properties:
+      markdown:
+        type: 'null' # Needs to be quoted
+        description: |
+          ## Markdown Text Block
+
+          Standard markdown formatting is supported including *italics*, **bold** and [links](https://example.com)
+
+          * bullet 1
+          * bullet 2
+```
+
 ## Use parameters as condition in steps
 
 Conditions use Javascript equality operators.
@@ -250,6 +267,54 @@ parameters:
                 - lastName
 ```
 
+### Multiple conditional fields with custom ordering
+
+```yaml
+parameters:
+  - title: Fill in some steps
+    ui:order:
+      - includeName
+      - lastName
+      - includeAddress
+      - address
+    properties:
+      includeName:
+        title: Include Name?
+        type: boolean
+        default: true
+      includeAddress:
+        title: Include Address?
+        type: boolean
+        default: true
+    dependencies:
+      includeName:
+        allOf:
+          - if:
+              properties:
+                includeName:
+                  const: true
+            then:
+              properties:
+                lastName:
+                  title: Name
+                  type: string
+              required:
+                - lastName
+      includeAddress:
+        allOf:
+          - if:
+              properties:
+                includeAddress:
+                  const: true
+            then:
+              properties:
+                address:
+                  title: Address
+                  type: string
+              required:
+                - address
+```
+
 ## Conditionally set parameters
 
 The `if` keyword within the parameter uses [nunjucks templating](https://mozilla.github.io/nunjucks/templating.html#if). The `not` keyword is unavailable; instead, use javascript equality.
diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md
index 00a171523c..11e67af07f 100644
--- a/docs/features/software-templates/writing-custom-actions.md
+++ b/docs/features/software-templates/writing-custom-actions.md
@@ -141,6 +141,39 @@ Prefer to use `camelCase` over `snake_case` or `kebab-case` for these actions if
 
 > We're aware that there are some exceptions to this, but try to follow as close as possible. We'll be working on migrating these in the repository over time too.
 
+### Adding a TemplateExample
+
+A TemplateExample is a predefined structure that can be used to create custom actions in your software templates. It serves as a blueprint for users to understand how to use a specific action and its fields as well as to ensure consistency and standardization across different custom actions.
+
+#### Define a TemplateExample and add to your Custom Action
+
+```ts title="With JSON Schema"
+import { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Template Example for Creating an Acme file',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'acme:file:create',
+          name: 'Create an Acme file.',
+          input: {
+            contents: 'file contents...',
+            filename: 'ACME.properties',
+          },
+        },
+      ],
+    }),
+  },
+];
+```
+
+Add the example to the `createTemplateAction` under the object property `examples`:
+
+`return createTemplateAction<{ contents: string; filename: string }>({id: 'acme:file:create', description: 'Create an Acme file', examples, ...};`
+
 ### The context object
 
 When the action `handler` is called, we provide you a `context` as the only
diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md
index feb0f68048..9ccd6cf1b5 100644
--- a/docs/features/software-templates/writing-custom-field-extensions.md
+++ b/docs/features/software-templates/writing-custom-field-extensions.md
@@ -33,6 +33,9 @@ import React from 'react';
 import { FieldExtensionComponentProps } from '@backstage/plugin-scaffolder-react';
 import type { FieldValidation } from '@rjsf/utils';
 import FormControl from '@material-ui/core/FormControl';
+import FormHelperText from '@material-ui/core/FormHelperText';
+import Input from '@material-ui/core/Input';
+import InputLabel from '@material-ui/core/InputLabel';
 /*
  This is the actual component that will get rendered in the form
 */
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index e5cd7d13b7..0f3d0af2e5 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -714,7 +714,7 @@ how to use them in the Scaffolder templates. It's important to mention that Back
 native filters from the Nunjucks library. For a complete list of these native filters and their usage,
 refer to the [Nunjucks documentation](https://mozilla.github.io/nunjucks/templating.html#builtin-filters).
 
-To create your own custom filters, look to the section [Custom Filters](#custom-filters) hereafter.
+To create your own custom filters, look to the section [Custom Filters and Globals](#custom-filters-and-globals) hereafter.
 
 ### parseRepoUrl
 
diff --git a/docs/features/techdocs/addons.md b/docs/features/techdocs/addons.md
index 471e62a57f..fff1f09d71 100644
--- a/docs/features/techdocs/addons.md
+++ b/docs/features/techdocs/addons.md
@@ -186,7 +186,7 @@ import { useShadowRootElements } from '@backstage/plugin-techdocs-react';
 // difference is that you'd set `location` to `TechDocsAddonLocations.Content`.
 export const MakeAllImagesCatGifsAddon = () => {
   // This hook can be used to get references to specific elements. If you need
-  // access to the whole shadow DOM, use the the underlying useShadowRoot()
+  // access to the whole shadow DOM, use the underlying useShadowRoot()
   // hook instead.
   const images = useShadowRootElements<HTMLImageElement>(['img']);
 
diff --git a/docs/features/techdocs/getting-started.md b/docs/features/techdocs/getting-started.md
index 66772c861d..2c365bb5b9 100644
--- a/docs/features/techdocs/getting-started.md
+++ b/docs/features/techdocs/getting-started.md
@@ -297,7 +297,9 @@ You can do so by including the following lines right above `USER node` of your
 `Dockerfile`:
 
 ```Dockerfile
-RUN apt-get update && apt-get install -y python3 python3-pip python3-venv
+RUN apt-get update && \
+    apt-get install -y python3 python3-pip python3-venv && \
+    rm -rf /var/lib/apt/lists/*
 
 ENV VIRTUAL_ENV=/opt/venv
 RUN python3 -m venv $VIRTUAL_ENV
diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index f8be6c9dd5..31d573fdbb 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -600,7 +600,7 @@ Note: To refer external diagram files, we need to include the diagrams directory
 
 ## How to add Mermaid support in TechDocs
 
-There are two options for adding Mermaid support in TechDocs: using [Kroki](https://kroki.io) or by using [markdown-inline-mermaid](https://github.com/johanneswuerbach/markdown-inline-mermaid). We currently use `markdown-inline-mermaid` for the [Mermaid example on the Demo site](https://demo.backstage.io/docs/default/component/backstage-demo/examples/mermaid/).
+There are a few options for adding Mermaid support in TechDocs: using [Kroki](https://kroki.io) or [markdown-inline-mermaid](https://github.com/johanneswuerbach/markdown-inline-mermaid) to generate the diagrams at build time, or the [`backstage-plugin-techdocs-addon-mermaid`](https://github.com/johanneswuerbach/backstage-plugin-techdocs-addon-mermaid) plugin to generate the diagram in the browser. We currently use `backstage-plugin-techdocs-addon-mermaid` plugin for the [Mermaid example on the Demo site](https://demo.backstage.io/docs/default/component/backstage-demo/examples/mermaid/).
 
 ### Using Kroki
 
@@ -706,16 +706,23 @@ Done! Now you have a support of the following diagrams along with mermaid:
 
 To use `markdown-inline-mermaid` to generate your Mermaid diagrams in TechDocs you'll need to do the following:
 
-1. In your Dockerfile you will need to make sure you install `markdown-inline-mermaid` like this: `RUN pip3 install mkdocs-techdocs-core markdown-inline-mermaid`
-2. You will also need to install the `@mermaid-js/mermaid-cli`, to do that add this: `RUN yarn global add @mermaid-js/mermaid-cli`
-3. Now in your `mkdocs.yml` file you will need to add the following section (this is at the root level like `plugins` which you should already have):
+1. In your Dockerfile you will need to make sure you install `markdown-inline-mermaid` and its dependencies, you will also need to install the `@mermaid-js/mermaid-cli`:
+
+   ```dockerfile title="Dockerfile"
+   RUN apt-get install -y chromium
+   RUN pip3 install mkdocs-techdocs-core markdown-inline-mermaid
+   RUN npm install -g @mermaid-js/mermaid-cli
+   ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+   ```
+
+2. Now in your `mkdocs.yml` file you will need to add the following section (this is at the root level like `plugins` which you should already have):
 
    ```yaml title="mkdocs.yml"
    markdown_extensions:
      - markdown_inline_mermaid
    ```
 
-4. With this in place you can now add Mermaid diagrams in your Markdown files like this:
+3. With this in place you can now add Mermaid diagrams in your Markdown files like this:
 
    ````md
    ```mermaid
@@ -726,6 +733,10 @@ To use `markdown-inline-mermaid` to generate your Mermaid diagrams in TechDocs y
    ```
    ````
 
+### Using the `backstage-plugin-techdocs-addon-mermaid` plugin
+
+Please follow the [Getting Started](https://github.com/johanneswuerbach/backstage-plugin-techdocs-addon-mermaid?tab=readme-ov-file#getting-started) instructions in the plugin's README.
+
 ## How to implement a hybrid build strategy
 
 One limitation of the [Recommended deployment](./architecture.md#recommended-deployment) is that
diff --git a/docs/frontend-system/building-apps/06-plugin-conversion.md b/docs/frontend-system/building-apps/06-plugin-conversion.md
index 5e7d431e73..2fab6cf828 100644
--- a/docs/frontend-system/building-apps/06-plugin-conversion.md
+++ b/docs/frontend-system/building-apps/06-plugin-conversion.md
@@ -58,7 +58,7 @@ The following are the known conversion functions provided by various libraries:
 
 ## Putting it all together
 
-Using the plugin converter along with extension converters from various libraries, we can not more fully convert our 3rd-party plugin to be able to install it in an app built with the new frontend system:
+Using the plugin converter along with extension converters from various libraries, we can now more fully convert our 3rd-party plugin to be able to install it in an app built with the new frontend system:
 
 ```ts
 import {
diff --git a/docs/getting-started/concepts.md b/docs/getting-started/concepts.md
deleted file mode 100644
index f8aba8537d..0000000000
--- a/docs/getting-started/concepts.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-id: concepts
-title: Key Concepts
-# prettier-ignore
-description: High level key concepts used in the Backstage project
----
-
-For users of Backstage, there are certain concepts which are central to its
-design and functionality. Being an expert in each of these concepts is not
-necessary, however having a base understanding of each will make administering,
-configuring, and operating Backstage easier.
-
-- CHANGELOG - https://keepachangelog.com
-- Docker - https://www.docker.com/
-- Monorepo - https://semaphoreci.com/blog/what-is-monorepo
-- Node.js - https://nodejs.org
-- React - https://reactjs.org
-- Semantic Versioning - https://semver.org
-- TypeScript - https://www.typescriptlang.org
-- YAML - https://yaml.org
-- Yarn - https://www.pluralsight.com/guides/yarn-a-package-manager-for-node-js
diff --git a/docs/getting-started/config/database.md b/docs/getting-started/config/database.md
index 0fbd66d5a3..699160d550 100644
--- a/docs/getting-started/config/database.md
+++ b/docs/getting-started/config/database.md
@@ -6,13 +6,13 @@ description: How to set up PostgreSQL for your Backstage instance.
 
 Audience: Admins
 
-### Summary
+## Summary
 
-This guide walks through how to set up a PostgreSQL database to host your Backstage data. It assumes you've already have a scaffolded Backstage app from following the [Standalone Install](../index.md) guide.
+This guide walks through how to set up a PostgreSQL database to host your Backstage data. It assumes you've already have a scaffolded Backstage app from following the [Creating your Backstage App](../index.md) guide.
 
 By the end of this tutorial, you will have a working PostgreSQL database hooked up to your Backstage install.
 
-### Prerequisites
+## Prerequisites
 
 This guide assumes a basic understanding of working on a Linux based operating system and have some experience with the terminal, specifically, these commands: `apt-get`, `psql`, `yarn`.
 
@@ -23,7 +23,7 @@ This guide assumes a basic understanding of working on a Linux based operating s
 - If the database is not hosted on the same server as the Backstage app, the
   PostgreSQL port needs to be accessible (the default is `5432` or `5433`)
 
-### 1. Install and configure PostgreSQL
+## 1. Install and Configure PostgreSQL
 
 :::tip Already configured your database?
 
@@ -68,17 +68,9 @@ That's enough database administration to get started. Type `\q`, followed by
 pressing the enter key. Then again type `exit` and press enter. Next, you need
 to install and configure the client.
 
-### 2. Configuring Backstage `pg` Client
+## 2. Configuring Backstage `pg` Client
 
-Go to the root directory of your freshly installed Backstage
-App. Run the following to install the PostgreSQL client into your backend:
-
-```bash title="From your Backstage root directory"
-yarn --cwd packages/backend add pg
-```
-
-Use your favorite editor to open `app-config.yaml` and add your PostgreSQL
-configuration in the root directory of your Backstage app using the credentials from the previous steps.
+Use your favorite editor to open `app-config.yaml` and add your PostgreSQL configuration in the root directory of your Backstage app using the credentials from the previous steps.
 
 ```yaml title="app-config.yaml"
 backend:
@@ -126,6 +118,47 @@ After the Backstage frontend launches, you should notice that nothing has change
 
 We've now made your data persist in your Backstage database.
 
+## Alternatives
+
+You may not want to install Postgres locally, the following sections outline alternatives.
+
+### Docker
+
+You can run Postgres in a Docker container, this is great for local development or getting a Backstage POC up and running quickly, here's how:
+
+First we need to pull down the container image, we'll use Postgres 17, check out the [Postgres Version Policy](../../overview/versioning-policy.md#postgresql-releases) to learn which versions are supported.
+
+```shell
+docker pull postgres:17.0-bookworm
+```
+
+Then we just need to start up the container.
+
+```shell
+docker run -d --name postgres --restart=always -p 5432:5432 -e POSTGRES_PASSWORD=<secret> postgres:17.0-bookworm
+```
+
+This will run Postgres in the background for you, but remember to start it up again when you reboot your system.
+
+### Docker Compose
+
+Another way to run Postgres is to use Docker Compose, here's what that would look like:
+
+```yaml title="docker-compose.local.yaml"
+version: '4'
+
+services:
+  postgres:
+    image: postgres:17.0-bookworm
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: <secret>
+    ports:
+      - 5432:5432
+```
+
+Then you would just run `docker compose -f docker-compose.local.yaml up` to start Postgres.
+
 ## Next Steps
 
 We recommend you read [Setting up authentication](./authentication.md) next.
@@ -136,3 +169,4 @@ If you want to read more about the database configuration, here are some helpful
 
 - [Configuring Plugin Databases](../../tutorials/configuring-plugin-databases.md#privileges)
 - [Read more about Knex](http://knexjs.org/), the database wrapper that we use.
+- [Install `pgAdmin` 4](https://www.pgadmin.org/), a helpful tool for querying your database.
diff --git a/docs/getting-started/configure-app-with-plugins.md b/docs/getting-started/configure-app-with-plugins.md
index 95fd456dc0..c31cdc0a06 100644
--- a/docs/getting-started/configure-app-with-plugins.md
+++ b/docs/getting-started/configure-app-with-plugins.md
@@ -4,6 +4,14 @@ title: Configuring App with plugins
 description: Documentation on How Configuring App with plugins
 ---
 
+Audience: Developers
+
+:::note Note
+Backstage plugins are primarily written using [TypeScript](https://www.typescriptlang.org), [Node.js](https://nodejs.org) and [React](https://reactjs.org). Having an understanding of these technologies will be beneficial on your journey to customizing Backstage!
+:::
+
+## Summary
+
 Backstage plugins customize the app for your needs. There is a
 [plugin directory](https://backstage.io/plugins) with plugins for many common
 infrastructure needs - CI/CD, monitoring, auditing, and more.
diff --git a/docs/getting-started/homepage.md b/docs/getting-started/homepage.md
index d7c9b46faa..03722daedf 100644
--- a/docs/getting-started/homepage.md
+++ b/docs/getting-started/homepage.md
@@ -160,7 +160,7 @@ import React from 'react';
 import Grid from '@material-ui/core/Grid';
 import { HomePageCompanyLogo } from '@backstage/plugin-home';
 
-export const homePage = (
+export const HomePage = () => (
   <Grid container spacing={3}>
     <Grid item xs={12} md={4}>
       <HomePageCompanyLogo />
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index 0d5529f611..687cf0be16 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -7,6 +7,10 @@ description: How to install Backstage for your own use.
 
 Audience: Developers and Admins
 
+:::note Note
+It is not required, although recommended to have a basic understanding of [Yarn](https://www.pluralsight.com/guides/yarn-a-package-manager-for-node-js) and [npm](https://docs.npmjs.com/about-npm) before starting this guide.
+:::
+
 ## Summary
 
 This guide walks through how to get started creating your very own Backstage customizable app. This is the first step in evaluating, developing on, or demoing Backstage.
@@ -21,7 +25,7 @@ If you are planning to contribute a new feature or bug fix to the Backstage proj
 
 ## Prerequisites
 
-This guide assumes a basic understanding of working on a Linux based operating system and have some experience with the terminal, specifically, these commands: `npm`, `yarn`.
+This guide also assumes a basic understanding of working on a Linux based operating system and have some experience with the terminal, specifically, these commands: `npm`, `yarn`.
 
 - Access to a Unix-based operating system, such as Linux, macOS or
   [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)
@@ -30,16 +34,17 @@ This guide assumes a basic understanding of working on a Linux based operating s
   On macOS, you will want to have run `xcode-select --install` to get the XCode command line build tooling in place.
 - An account with elevated rights to install the dependencies
 - `curl` or `wget` installed
-- Node.js [Active LTS Release](https://nodejs.org/en/about/previous-releases) installed using one of these
+- Node.js [Active LTS Release](../overview/versioning-policy.md#nodejs-releases) installed using one of these
   methods:
   - Using `nvm` (recommended)
     - [Installing nvm](https://github.com/nvm-sh/nvm#install--update-script)
     - [Install and change Node version with nvm](https://nodejs.org/en/download/package-manager/#nvm)
+    - Node 20 is a good starting point, this can be installed using `nvm install lts/iron`
   - [Binary Download](https://nodejs.org/en/download/)
   - [Package manager](https://nodejs.org/en/download/package-manager/)
   - [Using NodeSource packages](https://github.com/nodesource/distributions/blob/master/README.md)
-- `yarn` [Installation](https://classic.yarnpkg.com/en/docs/install)
-  - You will need to use Yarn classic to create a new project, but it can then be [migrated to Yarn 3](../tutorials/yarn-migration.md)
+- `yarn` [Installation](https://yarnpkg.com/getting-started/install)
+  - Backstage currently uses Yarn 4.4.1, once you've ran `corepack enable` you'll want to then run `yarn set version 4.4.1`
 - `docker` [installation](https://docs.docker.com/engine/install/)
 - `git` [installation](https://github.com/git-guides/install-git)
 - If the system is not directly accessible over your network the following ports
@@ -142,16 +147,18 @@ Choose the correct next steps for your user role, if you're likely to be deployi
 
 ### Admin
 
-- Deploying a production server
+- Deploying to production
+
+  - [Setting up authentication](./config/authentication.md)
+  - [Configuring a database](./config/database.md)
   - [Deploying with Docker](../deployment/docker.md)
   - [Deploying with Kubernetes](../deployment/k8s.md)
-  - [Deploying with AWS Lightsail](../deployment/backstage-deploy/aws.md)
+
 - Configuring Backstage
-  - [Database](./config/database.md)
-  - [Authentication](./config/authentication.md)
-  - [Plugins](./configure-app-with-plugins.md)
-  - [Theme](./app-custom-theme.md)
-  - [Homepage](./homepage.md)
+
+  - [Adding plugins](./configure-app-with-plugins.md)
+  - [Customizing the theme](./app-custom-theme.md)
+  - [Populating the homepage](./homepage.md)
 
 ### Developer
 
diff --git a/docs/getting-started/keeping-backstage-updated.md b/docs/getting-started/keeping-backstage-updated.md
index 08b89db518..a811a33383 100644
--- a/docs/getting-started/keeping-backstage-updated.md
+++ b/docs/getting-started/keeping-backstage-updated.md
@@ -4,46 +4,19 @@ title: Keeping Backstage Updated
 description: How to keep your Backstage App updated
 ---
 
+Audience: Developers and Admins
+
+:::note Note
+To better understand the concepts in this section, it's recommended to have an understanding of [Monorepos](https://semaphoreci.com/blog/what-is-monorepo), [Semantic Versioning](https://semver.org) and [CHANGELOGs](https://keepachangelog.com).
+:::
+
+## Summary
+
 Backstage is always improving, so it's a good idea to stay in sync with the
 latest releases. Backstage is more of a library than an application or service;
 similar to `create-react-app`, the `@backstage/create-app` tool gives you a
 starting point that's meant to be evolved.
 
-## Managing package versions with the Backstage yarn plugin
-
-The Backstage yarn plugin makes it easier to manage Backstage package versions,
-by determining the appropriate version for each package based on the overall
-Backstage version in backstage.json. This avoids the need to update every
-package.json across your Backstage monorepo, and means that when adding new
-`@backstage` dependencies, you don't need to worry about figuring out the right
-version to use to match the currently-installed release of Backstage.
-
-### Requirements
-
-In order to use the yarn plugin, you'll need to be using yarn 4.1.1 or greater.
-
-### Installation
-
-To install the yarn plugin, run the following command in your Backstage
-monorepo:
-
-```bash
-yarn plugin import https://versions.backstage.io/v1/tags/main/yarn-plugin
-```
-
-The resulting changes in the file system should be committed to your repo.
-
-### Usage
-
-When the yarn plugin is installed, versions for currently-released `@backstage`
-packages can be replaced in package.json with the string `"backstage:^"`. This
-instructs yarn to resolve the version based on the overall Backstage version in
-backstage.json.
-
-The `backstage-cli versions:bump` command documented below will detect the
-installation of the yarn plugin, and when it's installed, will automatically
-migrate dependencies across the monorepo to use it.
-
 ## Updating Backstage versions with backstage-cli
 
 The Backstage CLI has a command to bump all `@backstage` packages and
@@ -57,6 +30,12 @@ yarn backstage-cli versions:bump
 The reason for bumping all `@backstage` packages at once is to maintain the
 dependencies that they have between each other.
 
+:::tip
+
+To make the version bump process even easier and more streamlined we highly recommend using the [Backstage yarn plugin](#managing-package-versions-with-the-backstage-yarn-plugin)
+
+:::
+
 By default the bump command will upgrade `@backstage` packages to the latest `main` release line which is released monthly. For those in a hurry that want to track the `next` release line which releases weekly can do so using the `--release next` option.
 
 ```bash
@@ -87,6 +66,53 @@ for any applicable updates when upgrading packages. As an alternative, the
 a consolidated view of all the changes between two versions of Backstage. You
 can find the current version of your Backstage installation in `backstage.json`.
 
+## Managing package versions with the Backstage yarn plugin
+
+The Backstage yarn plugin makes it easier to manage Backstage package versions,
+by determining the appropriate version for each package based on the overall
+Backstage version in `backstage.json`. This avoids the need to update every
+package.json across your Backstage monorepo, and means that when adding new
+`@backstage` dependencies, you don't need to worry about figuring out the right
+version to use to match the currently-installed release of Backstage.
+
+### Requirements
+
+In order to use the yarn plugin, you'll need to be using yarn 4.1.1 or greater.
+
+### Installation
+
+To install the yarn plugin, run the following command in your Backstage
+monorepo:
+
+```bash
+yarn plugin import https://versions.backstage.io/v1/tags/main/yarn-plugin
+```
+
+The resulting changes in the file system should be committed to your repo.
+
+:::tip
+
+For best results it's ideal to add the Backstage Yarn plugin when you are about to do a Backstage upgrade as it will make it easier to confirm everything is working.
+
+:::
+
+### Usage
+
+When the yarn plugin is installed, versions for currently-released `@backstage`
+packages can be replaced in package.json with the string `"backstage:^"`. This
+instructs yarn to resolve the version based on the overall Backstage version in
+`backstage.json`.
+
+:::tip
+
+The `backstage.json` is key for the plugin to work, make sure this file is included in your CI/CD pipelines and/or any Container builds.
+
+:::
+
+The `backstage-cli versions:bump` command documented above will detect the
+installation of the yarn plugin, and when it's installed, will automatically
+migrate dependencies across the monorepo to use it.
+
 ## More information on dependency mismatches
 
 Backstage is structured as a monorepo with
diff --git a/docs/getting-started/register-a-component.md b/docs/getting-started/register-a-component.md
index c935d25807..4e2076ee8d 100644
--- a/docs/getting-started/register-a-component.md
+++ b/docs/getting-started/register-a-component.md
@@ -6,6 +6,10 @@ description: Start populating your Backstage app with your data.
 
 Audience: Developers
 
+:::note Note
+Entity files are stored in YAML format, if you are not familiar with YAML, you can learn more about it [here](https://yaml.org).
+:::
+
 ## Summary
 
 This guide will walk you through how to pull Backstage data from other locations manually. There are integrations that will automatically do this for you.
diff --git a/docs/integrations/azure-blobStorage/discovery.md b/docs/integrations/azure-blobStorage/discovery.md
new file mode 100644
index 0000000000..32612daf75
--- /dev/null
+++ b/docs/integrations/azure-blobStorage/discovery.md
@@ -0,0 +1,76 @@
+---
+id: discovery
+title: Azure Blob Storage Discovery
+sidebar_label: Discovery
+# prettier-ignore
+description: Automatically discovering catalog entities from an Azure Blob Storage account
+---
+
+:::info
+This documentation is written for [the new backend system](../../backend-system/index.md) which is the default since Backstage [version 1.24](../../releases/v1.24.0.md).
+:::
+
+The Azure Blob Storage account integration has a special entity provider for discovering catalog
+entities located in a storage account container. If you have a container that contains multiple
+catalog files, and you want to automatically discover them, you can use this
+provider. The provider will crawl your Blob Storage account container and register entities
+matching the configured path. This can be useful as an alternative to static
+locations or manually adding things to the catalog.
+
+To use the entity provider, you'll need an Azure Blob Storage account integration
+[set up](locations.md) with `accountName` and either `aadCredential`, `sasToken`, or `accountKey`
+
+At production deployments, you likely manage these with the permissions attached
+to your instance.
+
+In your configuration, you add a provider config per bucket:
+
+```yaml
+# app-config.yaml
+
+catalog:
+  providers:
+    azureBlob:
+      providerId:
+        accountName: ${ACCOUNT_NAME}
+        containerName: ${CONTAINER_NAME}
+        schedule: # same options as in TaskScheduleDefinition
+          # supports cron, ISO duration, "human duration" as used in code
+          frequency: { minutes: 30 }
+          # supports ISO duration, "human duration" as used in code
+          timeout: { minutes: 3 }
+```
+
+For simple setups, you can omit the provider ID at the config
+which has the same effect as using `default` for it.
+
+```yaml
+# app-config.yaml
+
+catalog:
+  providers:
+    azureBlob:
+      accountName: ${ACCOUNT_NAME}
+      containerName: ${CONTAINER_NAME}
+      schedule: # same options as in TaskScheduleDefinition
+        # supports cron, ISO duration, "human duration" as used in code
+        frequency: { minutes: 30 }
+        # supports ISO duration, "human duration" as used in code
+        timeout: { minutes: 3 }
+```
+
+As this provider is not one of the default providers, you will first need to install
+the Azure catalog plugin:
+
+```bash title="From your Backstage root directory"
+yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-azure
+```
+
+Then updated your backend by adding the following line:
+
+```ts title="packages/backend/src/index.ts"
+backend.add(import('@backstage/plugin-catalog-backend'));
+/* highlight-add-start */
+backend.add(import('@backstage/plugin-catalog-backend-module-azure'));
+/* highlight-add-end */
+```
diff --git a/docs/integrations/azure-blobStorage/locations.md b/docs/integrations/azure-blobStorage/locations.md
new file mode 100644
index 0000000000..38d8555c2e
--- /dev/null
+++ b/docs/integrations/azure-blobStorage/locations.md
@@ -0,0 +1,51 @@
+---
+id: locations
+sidebar_label: Locations
+title: Azure Blob Storage account Locations
+# prettier-ignore
+description: Setting up an integration with Azure Blob Storage account
+---
+
+The Azure Blob Storage account integration supports loading catalog entities from an blob storage account container.
+Entities can be added to
+[static catalog configuration](../../features/software-catalog/configuration.md),
+or registered with the
+[catalog-import](https://github.com/backstage/backstage/tree/master/plugins/catalog-import)
+plugin.
+
+## Configuration
+
+To use this integration, add configuration to your `app-config.yaml`:
+
+Using Azure active directory credentials:
+
+```yaml
+integrations:
+  azureBlobStorage:
+    - accountName: ${ACCOUNT_NAME} # required
+      endpoint: ${CUSTOM_ENDPOINT} # custom endpoint will require either aadCredentials or sasToken
+      aadCredential:
+        clientId: ${CLIENT_ID}
+        tenantId: ${TENANT_ID}
+        clientSecret: ${CLIENT_SECRET}
+```
+
+Using Azure storage account SAS token:
+
+```yaml
+integrations:
+  azureBlobStorage:
+    - accountName: ${ACCOUNT_NAME} # required
+      endpoint: ${CUSTOM_ENDPOINT} # custom endpoint will require either aadCredentials or sasToken
+      sasToken: ${SAS_TOKEN}
+```
+
+Using Azure storage account access key:
+
+```yaml
+integrations:
+  azureBlobStorage:
+    - accountName: ${ACCOUNT_NAME} # required
+      endpoint: ${CUSTOM_ENDPOINT} # custom endpoint will require either aadCredentials or sasToken
+      accountKey: ${ACCOUNT_KEY}
+```
diff --git a/docs/integrations/bitbucketServer/discovery--old.md b/docs/integrations/bitbucketServer/discovery--old.md
index d8ef11533b..83fe70da0d 100644
--- a/docs/integrations/bitbucketServer/discovery--old.md
+++ b/docs/integrations/bitbucketServer/discovery--old.md
@@ -1,5 +1,5 @@
 ---
-id: discovery
+id: discovery--old
 title: Bitbucket Server Discovery
 sidebar_label: Discovery
 # prettier-ignore
diff --git a/docs/integrations/gitlab/discovery.md b/docs/integrations/gitlab/discovery.md
index eab590ff11..de35fbcc96 100644
--- a/docs/integrations/gitlab/discovery.md
+++ b/docs/integrations/gitlab/discovery.md
@@ -150,6 +150,7 @@ catalog:
         branch: main # Optional. Used to discover on a specific branch
         fallbackBranch: master # Optional. Fallback to be used if there is no default branch configured at the Gitlab repository. It is only used, if `branch` is undefined. Uses `master` as default
         skipForkedRepos: false # Optional. If the project is a fork, skip repository
+        includeArchivedRepos: false # Optional. If project is archived, include repository
         group: example-group # Optional. Group and subgroup (if needed) to look for repositories. If not present the whole instance will be scanned
         entityFilename: catalog-info.yaml # Optional. Defaults to `catalog-info.yaml`
         projectPattern: '[\s\S]*' # Optional. Filters found projects based on provided patter. Defaults to `[\s\S]*`, which means to not filter anything
@@ -212,3 +213,5 @@ catalog:
 If you don't want create location object if file with component definition do not exists in project, you can set the `skipReposWithoutExactFileMatch` option. That can reduce count of request to gitlab with 404 status code.
 
 If you don't want to create location object if the project is a fork, you can set the `skipForkedRepos` option.
+
+If you want to create location object if the project is archived, you can set the `includeArchivedRepos` option.
diff --git a/docs/integrations/gitlab/org.md b/docs/integrations/gitlab/org.md
index 66ce117aa0..8249a97c24 100644
--- a/docs/integrations/gitlab/org.md
+++ b/docs/integrations/gitlab/org.md
@@ -170,7 +170,7 @@ catalog:
       yourProviderId:
         host: gitlab.com
         orgEnabled: true
-        group: org/teams # Required for gitlab.com when `orgEnabled: true`. Optional for self managed. Must not end with slash. Accepts only groups under the provided path (which will be stripped)
+        group: org/teams # Required for gitlab.com when `orgEnabled: true`. Optional for self managed. Must not end with slash. Accepts only this group and groups under the provided path (which will be stripped)
         relations: # Optional
           - INHERITED # Optional. Members of any ancestor groups will also be considered members of the current group.
           - DESCENDANTS # Optional. Members of any descendant groups will also be considered members of the current group.
@@ -240,7 +240,7 @@ catalog:
       yourProviderId:
         host: gitlab.com ## Could also be self hosted.
         orgEnabled: true
-        group: org/teams # Required for gitlab.com when `orgEnabled: true`. Optional for self managed. Must not end with slash. Accepts only groups under the provided path (which will be stripped)
+        group: org/teams # Required for gitlab.com when `orgEnabled: true`. Optional for self managed. Must not end with slash. Accepts only this group and groups under the provided path (which will be stripped)
         restrictUsersToGroup: true # Optional: Backstage will ingest only users directly assigned to org/teams.
         includeUsersWithoutSeat: false # Optional: Set to true to include users without paid seat, only applicable for SaaS
 ```
diff --git a/docs/integrations/ldap/org.md b/docs/integrations/ldap/org.md
index 50cf74ffb6..4dd7b7d1d8 100644
--- a/docs/integrations/ldap/org.md
+++ b/docs/integrations/ldap/org.md
@@ -55,6 +55,8 @@ backend.add(import('@backstage/plugin-catalog-backend-module-ldap'));
 The following configuration is a small example of how a setup could look for
 importing groups and users from a corporate LDAP server.
 
+Users and Groups can be configured for multiple `dn` entries as an array.
+
 ```yaml
 catalog:
   providers:
@@ -65,25 +67,24 @@ catalog:
           dn: uid=ldap-reader-user,ou=people,ou=example,dc=example,dc=net
           secret: ${LDAP_SECRET}
         users:
-          dn: ou=people,ou=example,dc=example,dc=net
-          options:
-            filter: (uid=*)
-          map:
-            description: l
-          set:
-            metadata.customField: 'hello'
+          - dn: ou=people,ou=example,dc=example,dc=net
+            options:
+              filter: (uid=*)
+            map:
+              description: l
+            set:
+              metadata.customField: 'hello'
         groups:
-          dn: ou=access,ou=groups,ou=example,dc=example,dc=net
-          options:
-            filter: (&(objectClass=some-group-class)(!(groupType=email)))
-          map:
-            description: l
-          set:
-            metadata.customField: 'hello'
+          - dn: ou=access,ou=groups,ou=example,dc=example,dc=net
+            options:
+              filter: (&(objectClass=some-group-class)(!(groupType=email)))
+            map:
+              description: l
+            set:
+              metadata.customField: 'hello'
 ```
 
-These config blocks have a lot of options in them, so we will describe each
-"root" key within the block separately.
+These config blocks have a lot of options in them, so we will describe each "root" key within the block separately.
 
 > NOTE:
 >
@@ -303,6 +304,33 @@ map:
   members: member
 ```
 
+## Optional Vendor Configuration
+
+In case the LDAP vendor isn't automatically detected by the module, an optional `vendor` configuration section is available which allows overriding the location for `dn` and `uuid` settings, and a case sensitivity setting.
+
+#### vendor.dnAttributeName
+
+Allows explicitly defining the name of the attribute that stores each entry's DN.
+
+#### vendor.uuidAttributeName
+
+Allows explicitly defining the name of the attribute that stores each entry's UUID.
+
+#### vendor.dnCaseSensitive
+
+Provides the ability to ignore case sensitivity issues with user/group mappings. If set to true, the ingestion will link user/members to groups whether their `dn`, `member`, or `memberOf` values have the right case or not.
+
+```yaml
+vendor:
+  # Attribute name override for the distinguished name (DN) of an entry.
+  dnAttributeName: dn
+  # Attribute name override for the unique identifier (UUID) of an entry.
+  uuidAttributeName: uuid
+  # Attribute to force values provided from dn and members/memberOf values all to lowercase.
+  # This is to resolve potential user/group mapping issues if case differences on dn strings.
+  dnCaseSensitive: true
+```
+
 ## Customize the Provider
 
 In case you want to customize the ingested entities, the provider allows to pass
diff --git a/docs/notifications/index.md b/docs/notifications/index.md
index b44b04ef4e..bb8a7dc246 100644
--- a/docs/notifications/index.md
+++ b/docs/notifications/index.md
@@ -385,7 +385,7 @@ Refer to the [service-to-service auth documentation](https://backstage.io/docs/a
 An example request for creating a broadcast notification might look like:
 
 ```bash
-curl -X POST https://[BACKSTAGE_BACKEND]/api/notifications -H "Content-Type: application/json" -H "Authorization: Bearer YOUR_BASE64_SHARED_KEY_TOKEN" -d '{"recipients":{"type":"broadcast"},"payload": {"title": "Title of broadcast message","link": "http://foo.com/bar","severity": "high","topic": "The topic"}}'
+curl -X POST https://[BACKSTAGE_BACKEND]/api/notifications/notifications -H "Content-Type: application/json" -H "Authorization: Bearer YOUR_BASE64_SHARED_KEY_TOKEN" -d '{"recipients":{"type":"broadcast"},"payload": {"title": "Title of broadcast message","link": "http://foo.com/bar","severity": "high","topic": "The topic"}}'
 ```
 
 ## Additional info
diff --git a/docs/openapi/01-getting-started.md b/docs/openapi/01-getting-started.md
index 156df9bd17..ce14cf6a7f 100644
--- a/docs/openapi/01-getting-started.md
+++ b/docs/openapi/01-getting-started.md
@@ -35,10 +35,10 @@ There are two required npm packages before we start,
 1. `@backstage/repo-tools`, this package contains all OpenAPI-related commands for your plugins. We will be using this throughout the tutorial.
 2. `@useoptic/optic`, this package is a dependency of `@backstage/repo-tools` but is only required for OpenAPI-related commands.
 
-Further, for generating the client a `java` binary has to be available on your PATH.
-
 You should install both of the above packages in the _root_ of your workspace.
 
+Further, a `java` binary has to be available on your PATH.
+
 ## Storing your OpenAPI specification
 
 You should create a new folder, `src/schema` in your backend plugin to store your OpenAPI (and any other) specifications. For example, if you're adding a specification to the catalog plugin, you would add a `src/schema` folder to `plugins/catalog-backend`, making a `plugins/catalog-backend/src/schema` directory. This directory should have an `openapi.yaml` file inside.
@@ -47,12 +47,14 @@ You should create a new folder, `src/schema` in your backend plugin to store you
 
 ## Generating a typed express router from a spec
 
-Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create an `openapi.generated.ts` file in the `src/schema` directory that contains the OpenAPI schema as well as a generated express router with types. You should add this command to your `package.json` for future use, and you can combine both the server generation and the client generation below, like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
+Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create a `router.ts` file in the `src/schema/openapi/generated` directory that contains the OpenAPI schema as well as a factory function for a generated express router with types that match your schema.
+
+You should add this command to your `package.json` for future use and you can combine both the server generation and the client generation below like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
 
 Use it like so, update your `router.ts` or `createRouter.ts` file with the following content,
 
 ```diff
-+ import { createOpenApiRouter } from '../schema/openapi.generated';
++ import { createOpenApiRouter } from '../schema/openapi';
 - import Router from 'express-promise-router';
 
 ...
@@ -65,12 +67,12 @@ export async function createRouter(
 
 ## Generating a typed client from a spec
 
-From your current backend plugin directory, run `yarn backstage-repo-tools package schema openapi generate --client-package <plugin-client-directory>`. `<plugin-client-directory>` is a new directory and npm package that you should create. The general pattern is `plugins/<plugin-name>-client` or if you want to co-locate this with your other shared types, use `plugins/<plugin-name>-common`. You should add this command to your `package.json` for future use.
+From your current backend plugin directory, run `yarn backstage-repo-tools package schema openapi generate --client-package <plugin-client-directory>`. `<plugin-client-directory>` is a new directory and npm package that you should create. The general pattern is to add a new entry point to your plugin's common package, `plugins/<plugin-name>-common/client`. You should add this command to your `package.json` for future use.
 
-The generated client will have a directory `src/generated` that exports a `DefaultApiClient` class and all generated types. You can use the client like so,
+The generated client will have a directory `src/schema/openapi/generated` that exports a `DefaultApiClient` class and all generated types. You can use the client like so,
 
 ```diff
-+ import { DefaultApiClient } from './generated';
++ import { DefaultApiClient } from '../schema/openapi/generated';
 
 export class CatalogClient implements CatalogApi {
 + private readonly apiClient: DefaultApiClient;
diff --git a/docs/openapi/generate-client.md b/docs/openapi/generate-client.md
index b8acc331e5..29756dcad2 100644
--- a/docs/openapi/generate-client.md
+++ b/docs/openapi/generate-client.md
@@ -20,9 +20,7 @@ info:
 
 ### Generating your client
 
-1. Run `yarn backstage-repo-tools package schema openapi generate client --client-package <directory>`. This will create a new folder in `<directory>/src/generated` to house the generated content.
-2. You should use the generated files as follows,
-
-- `apis/DefaultApi.client.ts` - this is the client that you should use. It has types for all of the various operations on your API.
-- `models/*` - These are the types generated from your OpenAPI file, ideally you should not need to use these directly and can instead use the inferred types from `apis/DefaultApi.client.ts`.
-- everything else is directory specific and shouldn't be touched.
+1. Run `yarn backstage-repo-tools package schema openapi generate --client-package <directory>`. This will create a new folder in `<directory>/src/schema/openapi/generated` to house the generated content.
+2. You should not need to import anything from subfolders of the `src/schema/openapi/generated` parent folder, everything you should require will be accessible from the `src/schema/openapi/generated/index.ts` file. Of note,
+3. `DefaultApiClient` - this is the client that you can use to access your specific spec.
+4. Any request or response types - these will be available from the index and should match the names in your spec.
diff --git a/docs/overview/adopting.md b/docs/overview/adopting.md
index 5b6c3bcaed..a6053d0f85 100644
--- a/docs/overview/adopting.md
+++ b/docs/overview/adopting.md
@@ -94,31 +94,31 @@ Examples of tactics we have used to evangelize Backstage internally:
 These are some of the metrics that you can use to verify if Backstage has a
 successful impact on your software development process:
 
-- **Onboarding time** Time until new engineers are productive. At Spotify we
+- **Onboarding time** - Time until new engineers are productive. At Spotify we
   measure this as the time until the employee has merged their 10th PR (this
   metric was down 55% two years after deploying Backstage). Even though you may
   not be onboarding engineers at a rapid pace, this metric is a great proxy for
   the overall complexity of your ecosystem. Reducing it will therefore benefit
   your whole engineering organization, not just new joiners.
 
-- **Number of merges per developer/day** Less time spent jumping between
+- **Number of merges per developer/day** - Less time spent jumping between
   different tools and looking for information means more time to focus on
   shipping code. A second level of bottlenecks can be identified if you
   categorize contributions by domain (services, web, data, etc).
 
-- **Deploys to production** Cousin to the metric above: How many times does an
+- **Deploys to production** - Cousin to the metric above: How many times does an
   engineer push changes into production.
 
-- **MTTR** With clear ownership of all the pieces in your microservices
+- **MTTR** - With clear ownership of all the pieces in your microservices
   ecosystem and all tools integrated into one place, Backstage makes it quicker
   for teams to find the root cause of failures, and fix them.
 
-- **Context switching** Reducing context switching can help engineers stay in
+- **Context switching** - Reducing context switching can help engineers stay in
   the "zone". We measure the number of different tools an engineer has to
   interact with in order to get a certain job done (e.g. push a change, follow
   it into production and validate it did not break anything).
 
-- **T-shapedness** A
+- **T-shapedness** - A
   [T-shaped](https://medium.com/@jchyip/why-t-shaped-people-e8706198e437)
   engineer is someone that is able to contribute to different domains of
   engineering. Teams with T-shaped people have fewer bottlenecks and can
@@ -126,10 +126,10 @@ successful impact on your software development process:
   since tools and infrastructure are consistent between domains, and information
   is available centrally.
 
-- **eNPS** Surveys asking about how productive people feel, how easy it is to
+- **eNPS** - Surveys asking about how productive people feel, how easy it is to
   find information and overall satisfaction with internal tools.
 
-- **Fragmentation** _(Experimental)_ Backstage
+- **Fragmentation** _(Experimental)_ - Backstage
   [Software Templates](../features/software-templates/index.md) help drive
   standardization in your software ecosystem. By measuring the variance in
   technology between different software components it is possible to get a sense
diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md
index 2295a3e503..c745719e08 100644
--- a/docs/overview/architecture-overview.md
+++ b/docs/overview/architecture-overview.md
@@ -323,11 +323,8 @@ backend:
   cache:
     store: redis
     connection: redis://user:pass@cache.example.com:6379
-    useRedisSets: true
 ```
 
-The useRedisSets flag is explained [here](https://github.com/jaredwray/keyv/tree/main/packages/redis#useredissets).
-
 Contributions supporting other cache stores are welcome!
 
 ## Containerization
diff --git a/docs/overview/versioning-policy.md b/docs/overview/versioning-policy.md
index 2ae73e1383..f5e2e222f8 100644
--- a/docs/overview/versioning-policy.md
+++ b/docs/overview/versioning-policy.md
@@ -177,6 +177,8 @@ When we say _Supporting_ a Node.js release, that means the following:
 - New Backstage projects created with `@backstage/create-app` will have their `engines.node` version set accordingly.
 - Dropping compatibility with unsupported releases is not considered a breaking change. This includes using new syntax or APIs, as well as bumping dependencies that drop support for these versions.
 
+Based on the above Backstage supports Node.js 20 and 22 as of the `1.33.0` release.
+
 ## TypeScript Releases
 
 The Backstage project uses [TypeScript](https://www.typescriptlang.org/) for type checking within the project, as well as external APIs and documentation. It is important to have a clear policy for which TypeScript versions we support, since we want to be able to adopt new TypeScript features, but at the same time not break existing projects that are using older versions.
diff --git a/docs/plugins/guides.md b/docs/plugins/guides.md
new file mode 100644
index 0000000000..a6bca91cdc
--- /dev/null
+++ b/docs/plugins/guides.md
@@ -0,0 +1,56 @@
+---
+id: guides
+title: Guides for Plugins
+---
+
+:::note Note
+This docs is still a work in progress, many of the guides described below do not exist yet.
+:::
+
+## Guides for Plugin Development
+
+### For Beginners: Introduction to Plugin Development
+
+This section is designed for those new to plugin development. It covers the basics and provides a foundation for more advanced topics.
+
+- **Introduction to Plugin Development**
+  - Why build plugins? Introduction to the value and impact of plugins within Backstage.
+  - Detailed guidance on starting and iterating on a plugin development project.
+  - Engaging with the community and stakeholders to propel your project.
+
+### For Intermediate Users: Scaling and Deploying Your Plugin
+
+This section helps developers prepare their plugins for broader adoption, emphasizing best practices in monitoring, logging, and performance.
+
+- **Scaling and Deploying Your Plugin**
+  - Strategies for scaling your plugin for greater adoption.
+  - Best practices for monitoring and logging.
+  - Understand plugin ownership and maintain an inner source mentality.
+
+### For Advanced Users: Advanced Plugin Customization and Integration
+
+This is for those ready to explore complex challenges and enhance their plugins with advanced features.
+
+- **Advanced Plugin Customization and Integration**
+  - Enabling resource-level authorization and interfacing with external services, SCMs, or databases.
+  - In-depth exploration of fostering an inner source mentality and understanding adoption dynamics.
+  - Decision-making frameworks: choosing between developing a new plugin or utilizing an existing open-source solution.
+  - Open-sourcing: How and when to contribute back to the community.
+
+## Additional Resources and Further Reading
+
+- **Real-world Implementations and Lessons**
+
+  - [Case studies and examples from the community](https://github.com/backstage/community#newsletters).
+  - Best practices derived from mature implementations.
+  - [Existing open-source community-maintained plugins](https://github.com/backstage/community-plugins).
+
+- **Resource Compendium**
+
+  - [Backstage Glossary](https://backstage.io/docs/references/glossary) of key terms.
+  - Recommended readings and tools for advanced developers.
+
+- **Certification and Learning Pathways**
+  - Pathways to deepen your understanding and expertise in plugin development for Backstage.
+
+Stay tuned for detailed exploration and guidance in each of these modules. We're excited to accompany you on your plugin development journey!
diff --git a/docs/plugins/index.md b/docs/plugins/index.md
index 94de3bc482..f709afa894 100644
--- a/docs/plugins/index.md
+++ b/docs/plugins/index.md
@@ -1,36 +1,25 @@
 ---
 id: index
-title: Intro to plugins
-description: Documentation on Introduction to Plugins
+title: Introduction to Plugins
+description: Learn about integrating various infrastructure and software development tools into Backstage through plugins.
 ---
 
-Backstage is a single-page application composed of a set of plugins.
+Backstage orchestrates a cohesive single-page application by seamlessly integrating various plugins.
 
-Our goal for the plugin ecosystem is that the definition of a plugin is flexible
-enough to allow you to expose pretty much any kind of infrastructure or software
-development tool as a plugin in Backstage. By following strong
-[design guidelines](../dls/design.md) we ensure the overall user experience
-stays consistent between plugins.
+Our vision for the plugin ecosystem champions flexibility, empowering you to incorporate a broad spectrum of infrastructure and software development tools into Backstage as plugins. Adherence to stringent [design guidelines](../dls/design.md) guarantees a consistent and intuitive user experience across the entire plugin landscape.
 
-![plugin](../assets/plugins/my-plugin_screenshot.png)
+![Plugin Screenshot](../assets/plugins/my-plugin_screenshot.png)
 
-## Creating a plugin
+## Creating a Plugin
 
-To create a plugin, follow the steps outlined [here](create-a-plugin.md).
+Embark on your plugin development journey by following the detailed steps provided in the [Create a Plugin](create-a-plugin.md) documentation.
 
-## Suggesting a plugin
+## Suggesting a Plugin
 
-If you start developing a plugin that you aim to release as open source, we
-suggest that you create a
-[new Issue in the community plugins repo](https://github.com/backstage/community-plugins/issues/new/choose).
-This helps the community know what plugins are in development.
+If you're developing an open-source plugin, we encourage you to create a [new issue in the community plugins repository](https://github.com/backstage/community-plugins/issues/new/choose). This informs the community about upcoming plugins and invites collaboration and feedback.
 
-You can also use this process if you have an idea for a good plugin but you hope
-that someone else will pick up the work.
+This approach is equally beneficial if you conceive an idea for a potentially impactful plugin but prefer if another contributor undertakes its development.
 
-## Integrate into the Software Catalog
+## Integration with the Software Catalog
 
-If your plugin isn't supposed to live as a standalone page, but rather needs to
-be presented as a part of a Software Catalog (e.g. a separate tab or a card on
-an "Overview" tab), then check out
-[the instruction](integrating-plugin-into-software-catalog.md) on how to do it.
+Should your plugin complement the Software Catalog rather than exist as a standalone feature (for instance, as an additional tab or a card within an "Overview" tab), you'll find comprehensive guidance on achieving this integration in the [Integrating Plugin into Software Catalog guide](integrating-plugin-into-software-catalog.md).
diff --git a/docs/plugins/integrating-search-into-plugins.md b/docs/plugins/integrating-search-into-plugins.md
index 05d07feb08..e51b4cfefa 100644
--- a/docs/plugins/integrating-search-into-plugins.md
+++ b/docs/plugins/integrating-search-into-plugins.md
@@ -106,15 +106,12 @@ Imagine your FAQs can be retrieved at the URL `https://backstage.example.biz/faq
 Below we provide an example implementation of how the FAQ collator factory could look like using our new document type, placed in the `plugins/search-backend-module-faq-snippets-collator/src/factory.ts` file:
 
 ```ts
-import fetch from 'node-fetch';
 import { Readable } from 'stream';
-
 import {
   LoggerService,
   RootConfigService,
 } from '@backstage/backend-plugin-api';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
-
 import { FaqSnippetDocument } from './types';
 
 const DEFAULT_BASE_URL = 'https://backstage.example.biz/faq-snippets';
diff --git a/docs/plugins/internationalization.md b/docs/plugins/internationalization.md
index ba3f694d0c..1fbf54d94e 100644
--- a/docs/plugins/internationalization.md
+++ b/docs/plugins/internationalization.md
@@ -165,8 +165,12 @@ export const userSettingsTranslations = createTranslationResource({
     zh: () => import('./userSettings-zh'),
   },
 });
+```
 
+```ts
 // packages/app/src/translations/userSettings-zh.ts
+
+import { createTranslationMessages } from '@backstage/core-plugin-api/alpha';
 import { userSettingsTranslationRef } from '@backstage/plugin-user-settings/alpha';
 
 const zh = createTranslationMessages({
diff --git a/docs/publishing.md b/docs/publishing.md
index 740292949f..902460e61e 100644
--- a/docs/publishing.md
+++ b/docs/publishing.md
@@ -33,6 +33,8 @@ PR is merged. This is typically done every Tuesday around noon CET.
 
 Merging the `Version Packages (next)` Pull Request will trigger the deployment workflows. Follow along the [deployment workflow](https://github.com/backstage/backstage/actions/workflows/deploy_packages.yml). If you notice flakiness (e.g. if the build is flaky or if the release step runs into an error with releasing to npm) just restart the workflow.
 
+When the release is ready to be published, maintainers will be notified in the private `#maintainers` channel on the Backstage Discord Server. They will then start the publishing workflow on the publishing workflows page linked in the notification message. On the publishing workflows page there is a dropdown menu called "Run workflow", this opens a form where the person responsible for the release should paste the SHA received in the Discord notification and click to run the workflow.
+
 Congratulations on the release! There should be now a post in the [`#announcements` channel](https://discord.com/channels/687207715902193673/705123584468582400) in Discord linking to the release tag - check if links & tag look as expected. Once the notification has gone out on Discord you can unlock the main branch & the release is complete.
 
 ## Main Line Release Process
diff --git a/docs/releases/v1.33.0-changelog.md b/docs/releases/v1.33.0-changelog.md
new file mode 100644
index 0000000000..f8c9c17aeb
--- /dev/null
+++ b/docs/releases/v1.33.0-changelog.md
@@ -0,0 +1,2659 @@
+# Release v1.33.0
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.33.0](https://backstage.github.io/upgrade-helper/?to=1.33.0)
+
+## @backstage/backend-dynamic-feature-service@0.5.0
+
+### Minor Changes
+
+- e939cd7: **BREAKING** The `dynamicPluginsFeatureLoader` options related to the root logger behavior (`transports`, `level`, `format`) are now gathered under a single `logger` option which is a function taking an optional `Config` argument and returning the logger options.
+
+  This breaking change is required for 2 reasons:
+
+  - it's totally possible that the current `Config` would be required to provide the logger options,
+  - the logger-related options should be gathered under a common `logger` option because, when the root auditing service is introduced, distinct but similarly-named options would be required for the auditor as well.
+
+### Patch Changes
+
+- 1aeec12: Enhance the `CommonJSModuleLoader` to add support for `resolvePackagePath` calls from backend dynamic plugins, with customizable package resolution, and make the `CommonJSModuleLoader` public API.
+  Fixing this backend dynamic plugin limitation related to `resolvePackagePath` is important for backend dynamic plugins which use the database, since database migration scripts systematically use `resolvePackagePath`.
+- 8593dfa: Improve the way alpha packages are supported when loading dynamic backend plugins.
+  The `ScannedPluginPackage` descriptor of dynamic backend plugins loaded from their alpha `package.json` now contain both the main package manifest and the alpha manifest. Previously it used to contain only the content of the alpha `package.json`, which is nearly empty.
+  This will make it easier to use or display metadata of loaded dynamic backend plugins, which is contained in the main manifest.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-app-node@0.1.27
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/backend-openapi-utils@0.3.0
+
+### Minor Changes
+
+- 1440232: Adds a new `createValidatedOpenApiRouterFromGeneratedEndpointMap` function that uses the new static server generation in `backstage-cli package schema openapi generate --server` to create a typed express router.
+
+### Patch Changes
+
+- f01787a: Moves msw from dependencies to devDependencies
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/backend-test-utils@1.1.0
+
+### Minor Changes
+
+- 5064827: Made it possible to construct `mockServices.database` with a given knex instance
+
+### Patch Changes
+
+- 7aae8e3: The `mockServices.discovery.factory()` factory now uses the mocked discovery service as its implementation, avoid the need for configuration.
+- eb82994: Removed unused `msw` dependency.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/catalog-client@1.8.0
+
+### Minor Changes
+
+- 656d1ef: Internal update to use the updated generated code from `backstage-cli package schema openapi generate --client-package ...`.
+- 31c4fe0: The client now automatically splits up very large `getEntitiesByRefs` calls into several smaller requests behind the scenes when needed. This ensures that each individual request does not exceed common Express.js request body limits or overload the server.
+
+### Patch Changes
+
+- 873f89a: Fix for certain filter fields in the `catalogApiMock` being case sensitive.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/cli@0.29.0
+
+### Minor Changes
+
+- bc47b17: **BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
+
+- 6819f8c: Added a new optimization to the `repo test` command that will filter out unused packages in watch mode if all provide filters are paths that point from the repo root. This significantly speeds up running individual tests from the repo root in a large workspace, for example:
+
+  ```sh
+  yarn test packages/app/src/App.test.tsx
+  ```
+
+- d849865: The package packing now populates `typesVersions` for additional entry points rather than using additional `package.json` files for type resolution. This improves auto completion of separate entry points when consuming published packages.
+
+- bc71665: **BREAKING**: The `LEGACY_BACKEND_START` flag has been removed, along with support for `src/run.ts` as the development entry point.
+
+### Patch Changes
+
+- 4046d53: Fixed an issue where the `--successCache` option for the `repo test` and `repo lint` commands would be include the workspace path in generated cache keys. This previously broke caching in environments where the workspace path varies across builds.
+
+- 4a378d3: Fix dev server reloads of plugin discovery for new frontend system.
+
+- 28b60ad: The check for `react-dom/client` in the Jest configuration will now properly always run from the target directory.
+
+- 6b2888c: Fixed an issue with the `--successCache` flag for `repo test` where the tree hash for the wrong package directory would sometimes be used to generate the cache key.
+
+- e30b65d: Added `--alwaysPack` as a replacement for the now hidden `--alwaysYarnPack` flag for the `build-workspace` command.
+
+- be0278e: Removed circular import
+
+- a7f97e4: Added a new `"rejectFrontendNetworkRequests"` configuration flag that can be set in the `"jest"` field in the root `package.json`:
+
+  ```json
+  {
+    "jest": {
+      "rejectFrontendNetworkRequests": true
+    }
+  }
+  ```
+
+  This flag causes rejection of any form of network requests that are attempted to be made in frontend or common package tests. This flag can only be set in the root `package.json` and can not be overridden in individual package configurations.
+
+- 6c48ebd: Add `--max-warnings -1` support to `backstage-cli package lint`
+
+- 04297a0: The `--successCache` option for the `repo test` and `repo lint` commands now use an additive store that keeps old entries around for a week before they are cleaned up automatically.
+
+- a2f0559: When using the experimental Rspack flag the app build and dev server now injects configuration via a `<script type="backstage.io/config">...</script>` tag in `index.html` rather than the `process.env.APP_CONFIG` definition, which will now be defined as an empty array instead.
+
+  This requires the app to be using the config loader from the 1.31 release of Backstage. Make sure your app is using at least that version if you are upgrading to this version of the CLI.
+
+  If you have copied the implementation of the `defaultConfigLoader`, make sure to update it to the new implementation. In particular the config loader needs to be able to read configuration from `script` tags with the type `backstage.io/config`.
+
+- b4627f2: Fixed an issue where the `raw-loader` for loading HTML templates was not resolved from the context of the CLI package.
+
+- cd1ef2b: Updated dependency `vite` to `^5.0.0`.
+
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+
+- b533056: Updated dependency `css-loader` to `^7.0.0`.
+
+- be008c3: Updated dependency `@module-federation/enhanced` to `^0.7.0`.
+
+- 6266ed3: Updated dependency `del` to `^8.0.0`.
+
+- 4046d53: Fixed an issue with the `repo lint` command where the cache key for the `--successCache` option would not properly ignore files that should be ignored according to `.eslintignore`s.
+
+- e19c53c: Fix for the `--link` flag for `package start` to deduplicate `react-router` and `react-router-dom`.
+
+- 17850a5: Update upgrade-helper link in `versions:bump` command to include `yarnPlugin` parameter when the yarn plugin is installed
+
+- 09ea093: Fixed an issue where `.css` style injection would fail for published packages.
+
+- 702f41d: Bumped dev dependencies `@types/node`
+
+- 5d74716: Remove unused backend-common dependency
+
+- b084f5a: Bump the Webpack dependency range to `^5.94.0`, as our current configuration is not compatible with some older versions.
+
+- e565f73: Added support for `.webp` files in the frontend tooling.
+
+- 946fa34: Added a new `--link <workspace-path>` option for frontend builds that allow you to override module resolution to link in an external workspace at runtime.
+
+  As part of this change the Webpack linked workspace resolution plugin for frontend builds has been removed. It was in place to support the old workspace linking where it was done by Yarn, which is no longer a working option.
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.2
+  - @backstage/release-manifests@0.0.11
+
+## @backstage/config@1.3.0
+
+### Minor Changes
+
+- d52d7f9: Make `readDurationFromConfig` support both ISO and ms formats as well, to make it easier to enter time as an end user
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
+## @backstage/core-components@0.16.0
+
+### Minor Changes
+
+- dc409c5: The SupportButton component will now be hidden if no support config is specified in app-config
+
+### Patch Changes
+
+- 0f18340: Change core component Table tool bar search box to the a appropriate Search icon and text
+
+- af9097e: Adds the ability to mock a media query per break point and to change the active break point during a test. Usage example:
+
+  ```ts
+  const { set } = mockBreakpoint({
+    initialBreakpoint: 'md',
+    queryBreakpointMap: {
+      '(min-width:1500px)': 'xl',
+      '(min-width:1000px)': 'lg',
+      '(min-width:700px)': 'md',
+      '(min-width:400px)': 'sm',
+      '(min-width:0px)': 'xs',
+    },
+  });
+  // assertions for when the active break point is "md"
+  set('lg');
+  // assertions for when the active break point is "lg"
+  ```
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/repo-tools@0.11.0
+
+### Minor Changes
+
+- 1440232: `backstage-repo-tools package schema openapi generate --server` now generates complete TS interfaces for all request/response objects in your OpenAPI schema. This fixes an edge case around recursive schemas and standardizes both the generated client and server to have similar generated types.
+- 47fdbb4: Adds a `--watch` mode to the `schema openapi generate` command for a better local schema writing experience.
+
+### Patch Changes
+
+- 95401a8: The `generate-patch` command now properly includes newly created files in the patch.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- 3f1fb21: The `generate-patch` command will now fall back to always adding a `resolutions` entry, even if no matching descriptors are found.
+- dde85ee: Added a new `generate-patch` command that can be used to generate patches for current changes in a source workspace to be installed it a target workspace.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+
+## @backstage/types@1.2.0
+
+### Minor Changes
+
+- c5e39e7: Introduce `createDeferred` and `DeferredPromise`.
+
+## @backstage/plugin-api-docs@0.12.0
+
+### Minor Changes
+
+- 6836522: Added support for pagination in api-docs plugin - DefaultApiExplorerPage
+
+### Patch Changes
+
+- 11f57de: bump `@asyncapi/react-component` to latest `2.x`
+- 3cd1dee: Uses theme values to style the API definition schema so that theme overrides apply.
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app-backend@0.4.0
+
+### Minor Changes
+
+- 815b702: Configuration is no longer injected into static assets if a `index.html.tmpl` file is present.
+
+### Patch Changes
+
+- 815b702: The `index.html` templating is now done and served from memory rather than written to the filesystem. This means that you can now use config injection with a read-only filesystem, and you no longer need to use the `app.disableConfigInjection` flag.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-app-node@0.1.27
+
+## @backstage/plugin-auth-backend@0.24.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog@1.25.0
+
+### Minor Changes
+
+- 50df3c8: - Updated EntityLayout component to implement breadcrumb navigation based on the entity relations.
+
+  - Added parentEntityRelations prop to EntityLayoutProps to specify relation types for parent entities.
+
+- 79e9631: Allow `OffsetPaginatedCatalogTable` to configure Table options and `CursorPaginatedCatalogTable` to configure `paginationPosition`.
+
+### Patch Changes
+
+- 2a67594: Fixed an issue causing the `CatalogIndexPage` to not properly filter results when using offset pagination.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+
+## @backstage/plugin-catalog-backend@1.28.0
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+- 76857da: Added `entity_ref` column to `final_entities` in order to move `refresh_state` away from the read path
+- 34d4360: Drop redundant indices from the database.
+
+  The following redundant indices are removed in this version:
+
+  - `final_entities_entity_id_idx` - overlaps with `final_entities_pkey`
+  - `refresh_state_entity_id_idx` - overlaps with `refresh_state_pkey`
+  - `refresh_state_entity_ref_idx` - overlaps with `refresh_state_entity_ref_uniq`
+  - `search_key_idx` and `search_value_idx` - these were replaced by the composite index `search_key_value_idx` in #22594
+
+  No negative end user impact is expected, but rather that performance should increase due to less index churn.
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- b89834b: Fixed an issue where entities would not be marked for restitching if only the target of a relationship changed.
+- 1bf02cc: Fixed bug when searching an entity by `spec.profile.displayName` in the catalog on the frontend. Text filter fields were not applied correctly to the database query resulting in empty results.
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5efde17: Internal refactor to slightly speed up the processing loop
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.5.0
+
+### Minor Changes
+
+- 1b5fdd9: Extended the configuration with the `includeArchivedRepos` property, which allows including repositories when the project is archived.
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.0
+
+### Minor Changes
+
+- 6cf91c5: Use `HumanDuration` for all duration needs in the public API, instead of `luxon` types. These are generally compatible, with a few caveats:
+
+  - If you scheduled things to run quarterly (`quarter` or `quarters`), you can use `{ months: 3 }` instead.
+  - If you used the singular nouns such as `year: 1`, use plurals instead (e.g. `years: 1`).
+
+### Patch Changes
+
+- c5e39e7: Internal refactor to use the deferred from the types package
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend-module-ldap@0.10.0
+
+### Minor Changes
+
+- 415aeb3: Add Support for Google LDAP Vendor
+
+### Patch Changes
+
+- 884a86c: Added a `dnCaseSensitive` flag to support LDAP servers with mixed-case attributes.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-node@1.14.0
+
+### Minor Changes
+
+- bc13b42: The `catalogServiceRef` now has its own accompanying `CatalogService` interface that requires Backstage `credentials` objects to be passed. This new version of the `catalogServiceRef` has been promoted and is now available via the main `@backstage/plugin-catalog-node` entry point.
+
+  The old `catalogServiceRef` with the old `CatalogApi` type is still available from the `/alpha` entry point.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-kubernetes@0.12.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## @backstage/plugin-kubernetes-backend@0.19.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- bee9664: Adapted the config.d.ts for custom k8s cluster authProvider implementations
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-node@0.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-kubernetes-common@0.9.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-kubernetes-node@0.2.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-kubernetes-react@0.5.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- 0b729da: add the pod delete feature to the kubernetes react plugin
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-notifications@0.4.0
+
+### Minor Changes
+
+- 87ffc1c: Rephrasing labels of the View filter to be more clear. Based on the received users' feedback.
+
+### Patch Changes
+
+- 4186105: Added title to the Notifications' table. The title clearly states the filter selection and total count of messages. This change aligns the look and feel closer to other tables.
+- 3a0731e: The "Created after" filter renamed to the "Sent out" based on the received users' feedback.
+- 3e135f2: The notification's title is emphasized to be clearly distinguished from the description.
+- 97ba58f: Add support for user specific notification settings
+- 1d87c43: Show count of unread notifications in the left-side MenuItem. This replaces the simple true/false bullet.
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-scaffolder@1.27.0
+
+### Minor Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- 99471cd: fix(scaffolder): use `onInputChange` in `RepoUrlPicker` to fix issue with the value not updating properly
+- 8e4bed4: Updated dependency `idb-keyval` to `5.1.5`.
+- 7669af3: Revert the change of the option label for `EntityPicker`
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-scaffolder-backend@1.27.0
+
+### Minor Changes
+
+- 0587633: Bumped the `isolated-vm` dependency from v4 to v5, which drops support for Node.js v16.
+- e61d5ef: BREAKING EXPERIMENTAL: The `checkpoint` method now takes an object instead of previous arguments.
+
+  ```ts
+  await ctx.checkpoint({ key: 'repo.create', fn: () => ockokit.repo.create({...})})
+  ```
+
+  You can also now return `void` from the checkpoint if the method returns `void` inside the `checkpoint` handler.
+
+### Patch Changes
+
+- 6aa5b98: Fix tasks listing with postgres
+- 59137ff: Fix issue with token not being available because it's now non-enumerable
+- c5e39e7: Internal refactor to use the deferred from the types package
+- e4f5d95: Align with type declaration of template filter/global function by supporting undefined as return value.
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 7ab3371: Modified `createDryRunner` and corresponding route to include `templateMetaData` inside the `templateInfo`. This allows custom action writers to access things like `templateInfo.entity.metadata.name` via the action context while executing templates using the dry run framework.
+- 4e58bc7: Upgrade to uuid v11 internally
+- 2dae341: Add new `fs:readdir` action to list current content of the workspace
+- 97ba58f: Add example template for notification sending
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2
+
+## @backstage/plugin-scaffolder-node@0.6.0
+
+### Minor Changes
+
+- e61d5ef: BREAKING EXPERIMENTAL: The `checkpoint` method now takes an object instead of previous arguments.
+
+  ```ts
+  await ctx.checkpoint({ key: 'repo.create', fn: () => ockokit.repo.create({...})})
+  ```
+
+  You can also now return `void` from the checkpoint if the method returns `void` inside the `checkpoint` handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-react@1.14.0
+
+### Minor Changes
+
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- 8b5ff7e: Fix issue with form state not refreshing when updating
+- ade301c: Fix issue with `Stepper` and trying to trim additional properties. This is now all behind `liveOmit` and `omitExtraData` instead.
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-search-backend@1.7.0
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/app-defaults@1.5.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/backend-app-api@1.0.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/backend-defaults@0.5.3
+
+### Patch Changes
+
+- bf306cb: Removed dependency `@backstage/backend-common`.
+- e30bb46: Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- f6eaec2: Link to proper package in `rootLoggerServiceFactory` doc string.
+- ecf6b39: Use `node-fetch` instead of native fetch, as per <https://backstage.io/docs/architecture-decisions/adrs-adr013>
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/backend-plugin-api@1.0.2
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @backstage/catalog-model@1.7.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
+## @backstage/cli-common@0.1.15
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+
+## @backstage/cli-node@0.2.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @backstage/codemods@0.1.52
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## @backstage/config-loader@1.9.2
+
+### Patch Changes
+
+- c5e39e7: Internal refactor to use the deferred from the types package
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @backstage/core-app-api@1.15.2
+
+### Patch Changes
+
+- 44b82da: The default config loader no longer requires `process.env.APP_CONFIG` to be set, allowing config to be read from other sources instead.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-compat-api@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-plugin-api@1.10.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.22
+
+### Patch Changes
+
+- 7907e3b: Bumped create-app version.
+- 42386c2: Bumped create-app version.
+- 702f41d: Updated engines to support Node 20 or 22
+- a917f86: This update adds the @backstage/repo-tools package to the versions.ts file, enabling proper version resolution for templates. The {{version '@backstage/repo-tools'}} placeholder now works as expected in the create-app process.
+- 5872964: Use the main entrypoint for `create-app` installs
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## @backstage/dev-utils@1.1.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+
+## @backstage/errors@1.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+
+## @backstage/frontend-app-api@0.10.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/frontend-defaults@0.1.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.2
+
+### Patch Changes
+
+- 44b82da: The default config loader no longer requires `process.env.APP_CONFIG` to be set, allowing config to be read from other sources instead.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-app@0.1.2
+
+## @backstage/frontend-plugin-api@0.9.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/test-utils@1.7.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2
+
+## @backstage/integration@1.15.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/integration-aws-node@0.1.13
+
+### Patch Changes
+
+- 52ae92d: The `getDefaultCredentialsChain` function now accepts and applies a `region` parameter, preventing it from defaulting to `us-east-1` when no region is specified.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/integration-react@1.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.15.2
+
+## @techdocs/cli@1.8.22
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## @backstage/test-utils@1.7.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/theme@0.6.1
+
+### Patch Changes
+
+- ea75c37: Internal refactor to avoid top-level imports from MUI.
+
+## @backstage/plugin-app@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app-node@0.1.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-app-visualizer@0.1.12
+
+### Patch Changes
+
+- e586e77: New `devDependency` for local development setup.
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.2
+
+### Patch Changes
+
+- b833660: Fix visibility of config for use in front end code
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.2
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.2
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-auth-node@0.5.4
+
+### Patch Changes
+
+- a0a9a4a: Browsers silently drop cookies that exceed 4KB, which can be problematic for refresh tokens and other large cookies.This update ensures that large cookies, like refresh tokens, are not dropped by browsers, maintaining the integrity of the authentication process. The changes include both the implementation of the cookie splitting logic and corresponding tests to validate the new functionality.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-react@0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.25
+
+### Patch Changes
+
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.5
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-azure@0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- f6b4b8a: Implemented discovery on project-level to shift Bitbucket Cloud API limits
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-catalog-backend-module-github@0.7.7
+
+### Patch Changes
+
+- 9790c02: Fixed an issue in `GithubOrgEntityProvider` that caused an error when processing teams without a parent.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend-module-github@0.7.7
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.4
+
+### Patch Changes
+
+- 5f058e2: Updated dependency `@apidevtools/json-schema-ref-parser` to `^11.0.0`.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+
+## @backstage/plugin-catalog-common@1.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-catalog-graph@0.4.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## @backstage/plugin-catalog-import@0.12.6
+
+### Patch Changes
+
+- ea5b7f3: Fixed parsing of catalog-info.yaml when creating a PR to register a repository if the file contains more than one document
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-react@1.14.1
+
+### Patch Changes
+
+- 9cc82c0: Fixed bug in `EntityDisplayName` where text was overflowing.
+- 6fcbb3b: Ensure EntityDisplayName component link receives underline on hover.
+- 9670906: Improve UI consistency of default catalog filters
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/frontend-test-utils@0.2.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-config-schema@0.1.61
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-devtools@0.1.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-devtools-backend@0.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-devtools-common@0.1.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-events-backend@0.3.16
+
+### Patch Changes
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- b7d0334: Cleaning up event subscriptions after the max age window
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.5
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-module-azure@0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-module-github@0.2.14
+
+### Patch Changes
+
+- 9816f51: Fix the event request validation for incoming requests for GitHub webhook events
+  by using the raw body when verifying the signature.
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-events-backend-test-utils@0.1.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+
+## @backstage/plugin-events-node@0.4.5
+
+### Patch Changes
+
+- 4501631: Fixed an issue where subscribing to events threw an error and gave up too easily. Calling the subscribe method will cause the background polling loop to keep trying to connect to the events backend, even if the initial request fails.
+
+  By default the events service will attempt to publish and subscribe to events from the events bus API in the events backend, but if it fails due to the events backend not being installed, it will bail and never try calling the API again. There is now a new `events.useEventBus` configuration and option for the `DefaultEventsService` that lets you control this behavior. You can set it to `'never'` to disabled API calls to the events backend completely, or `'always'` to never allow it to be disabled.
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+
+- 5d74716: Remove unused backend-common dependency
+
+- 0b57aa1: Fixed an issue where the event bus polling would duplicate and increase exponentially over time.
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-home@0.8.1
+
+### Patch Changes
+
+- 8b1b2cf: Improve Starred Entities UI to reduce whitespace and provide more context on the entities:
+
+  - Use the Entity Presentation API (via `<EntityDisplayName>`) to display the entity's name
+  - Component's `kind` and `spec.type` are displayed as a secondary text
+  - List items are condensed to reduce unnecessary spacing
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-home-react@0.1.19
+
+## @backstage/plugin-home-react@0.1.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-kubernetes-cluster@0.0.18
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-notifications-backend@0.4.3
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-notifications-backend-module-email@0.3.3
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-notifications-common@0.0.6
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/config@1.3.0
+
+## @backstage/plugin-notifications-node@0.2.9
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-org@0.6.32
+
+### Patch Changes
+
+- a278fdd: Fix rendering of description in MembersListCard. Add guardrails for potential long texts to prevent it from breaking the UI.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-org-react@0.1.31
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-permission-backend@0.5.51
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.5
+
+## @backstage/plugin-permission-common@0.8.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-permission-node@0.8.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-permission-react@0.4.28
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-proxy-backend@0.5.8
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+      AlreadyExistsError: Failed to create branch at create-test because it already exists.
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+      AlreadyExistsError: Failed to create branch at create-test because it already exists.
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1
+
+### Patch Changes
+
+- cdc8b4c: Improve error messages from Gitlab
+- 2dbdccb: Removed circular import
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/plugin-scaffolder-node@0.6.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.2
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15
+
+## @backstage/plugin-scaffolder-common@1.5.7
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-test-utils@1.1.0
+  - @backstage/plugin-scaffolder-node@0.6.0
+
+## @backstage/plugin-search@1.4.19
+
+### Patch Changes
+
+- a4ccc82: Removes the card UI from the search results type filter for a cleaner UI consistent with other filters
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+
+## @backstage/plugin-search-backend-module-catalog@0.2.5
+
+### Patch Changes
+
+- 0b8f344: Fixed a bug where the `filter` setting of the collator was not permitted to be an array.
+- 1a1e2f4: Fix search collator text formatting for catalog entities without description
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.2
+
+### Patch Changes
+
+- dae59c1: Updated dependency `@short.io/opensearch-mock` to `^0.4.0`.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-explore@0.2.5
+
+### Patch Changes
+
+- a9a7c7c: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.7`.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-pg@0.5.38
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## @backstage/plugin-search-backend-node@1.3.5
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-common@1.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-search-react@1.8.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-signals@0.0.12
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-signals-backend@0.2.3
+
+### Patch Changes
+
+- a1e01ff: The signals backend now supports scaled deployments where clients may be connecting to one of many signal backend instances.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-node@0.1.14
+
+## @backstage/plugin-signals-node@0.1.14
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## @backstage/plugin-signals-react@0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-techdocs@1.11.1
+
+### Patch Changes
+
+- 37a7810: Fixed an issue where `<TechDocsReaderPageContent />` would re-render infinitely under certain conditions.
+- e937ae7: Fix an issue with index page of documentation site being re-rendered.
+- 90246a9: Fix techdocs config schema for custom elements sanitizer
+- 605bdc0: Avoid page re-rendering when clicking on anchor links in the same documentation page.
+- 4f0cb89: Added DomPurify sanitizer configuration for custom elements implementing RFC <https://github.com/backstage/backstage/issues/26988>.
+  See <https://backstage.io/docs/features/techdocs/how-to-guides#how-to-enable-custom-elements-in-techdocs> for how to enable it in the configuration.
+- f246178: Removed `canvas` dev dependency.
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/test-utils@1.7.1
+  - @backstage/plugin-search-react@1.8.2
+
+## @backstage/plugin-techdocs-backend@1.11.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+
+## @backstage/plugin-techdocs-node@1.12.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.10
+
+### Patch Changes
+
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.103
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-api-docs@0.12.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-notifications@0.4.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-search@1.4.19
+  - @backstage/plugin-org@0.6.32
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder@1.27.0
+  - @backstage/plugin-catalog-import@0.12.6
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes@0.12.0
+  - @backstage/plugin-home@0.8.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/plugin-signals@0.0.12
+  - @backstage/plugin-kubernetes-cluster@0.0.18
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.12
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10
+  - @backstage/plugin-devtools@0.1.20
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17
+  - @backstage/plugin-user-settings@0.8.15
+
+## example-app-next@0.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-api-docs@0.12.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-notifications@0.4.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-search@1.4.19
+  - @backstage/plugin-org@0.6.32
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder@1.27.0
+  - @backstage/plugin-catalog-import@0.12.6
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes@0.12.0
+  - @backstage/plugin-home@0.8.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/plugin-app-visualizer@0.1.12
+  - @backstage/core-app-api@1.15.2
+  - @backstage/frontend-defaults@0.1.2
+  - @backstage/plugin-signals@0.0.12
+  - @backstage/plugin-kubernetes-cluster@0.0.18
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-app@0.1.2
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.12
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17
+  - @backstage/plugin-user-settings@0.8.15
+
+## app-next-example-plugin@0.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/frontend-plugin-api@0.9.1
+
+## example-backend@0.0.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-app-backend@0.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-scaffolder-backend@1.27.0
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-search-backend@1.7.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/plugin-kubernetes-backend@0.19.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-search-backend-module-explore@0.2.5
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-backend@0.4.3
+  - @backstage/plugin-signals-backend@0.2.3
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-proxy-backend@0.5.8
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2
+  - @backstage/plugin-devtools-backend@0.4.2
+  - @backstage/plugin-permission-backend@0.5.51
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-backend@1.11.2
+
+## example-backend-legacy@0.2.104
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-app-backend@0.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-scaffolder-backend@1.27.0
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-search-backend@1.7.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1
+  - @backstage/plugin-kubernetes-backend@0.19.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-backend@0.2.3
+  - @backstage/plugin-search-backend-module-pg@0.5.38
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-proxy-backend@0.5.8
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2
+  - @backstage/plugin-devtools-backend@0.4.2
+  - @backstage/plugin-permission-backend@0.5.51
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-backend@1.11.2
+
+## e2e-test@0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @internal/frontend@0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.0
+
+## techdocs-cli-embedded-app@0.2.102
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/test-utils@1.7.1
+
+## yarn-plugin-backstage@0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/release-manifests@0.0.11
+
+## @internal/plugin-todo-list@1.0.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @internal/plugin-todo-list-backend@1.0.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## @internal/plugin-todo-list-common@1.0.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
diff --git a/docs/releases/v1.33.0-next.0-changelog.md b/docs/releases/v1.33.0-next.0-changelog.md
new file mode 100644
index 0000000000..969f47fd2e
--- /dev/null
+++ b/docs/releases/v1.33.0-next.0-changelog.md
@@ -0,0 +1,2123 @@
+# Release v1.33.0-next.0
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.33.0-next.0](https://backstage.github.io/upgrade-helper/?to=1.33.0-next.0)
+
+## @backstage/catalog-client@1.8.0-next.0
+
+### Minor Changes
+
+- 31c4fe0: The client now automatically splits up very large `getEntitiesByRefs` calls into several smaller requests behind the scenes when needed. This ensures that each individual request does not exceed common Express.js request body limits or overload the server.
+
+### Patch Changes
+
+- 873f89a: Fix for certain filter fields in the `catalogApiMock` being case sensitive.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/cli@0.29.0-next.0
+
+### Minor Changes
+
+- bc71665: **BREAKING**: The `LEGACY_BACKEND_START` flag has been removed, along with support for `src/run.ts` as the development entry point.
+
+### Patch Changes
+
+- 28b60ad: The check for `react-dom/client` in the Jest configuration will now properly always run from the target directory.
+
+- e30b65d: Added `--alwaysPack` as a replacement for the now hidden `--alwaysYarnPack` flag for the `build-workspace` command.
+
+- a7f97e4: Added a new `"rejectFrontendNetworkRequests"` configuration flag that can be set in the `"jest"` field in the root `package.json`:
+
+  ```json
+  {
+    "jest": {
+      "rejectFrontendNetworkRequests": true
+    }
+  }
+  ```
+
+  This flag causes rejection of any form of network requests that are attempted to be made in frontend or common package tests. This flag can only be set in the root `package.json` and can not be overridden in individual package configurations.
+
+- 04297a0: The `--successCache` option for the `repo test` and `repo lint` commands now use an additive store that keeps old entries around for a week before they are cleaned up automatically.
+
+- b4627f2: Fixed an issue where the `raw-loader` for loading HTML templates was not resolved from the context of the CLI package.
+
+- 17850a5: Update upgrade-helper link in `versions:bump` command to include `yarnPlugin` parameter when the yarn plugin is installed
+
+- b084f5a: Bump the Webpack dependency range to `^5.94.0`, as our current configuration is not compatible with some older versions.
+
+- 946fa34: Added a new `--link <workspace-path>` option for frontend builds that allow you to override module resolution to link in an external workspace at runtime.
+
+  As part of this change the Webpack linked workspace resolution plugin for frontend builds has been removed. It was in place to support the old workspace linking where it was done by Yarn, which is no longer a working option.
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/core-components@0.16.0-next.0
+
+### Minor Changes
+
+- dc409c5: The SupportButton component will now be hidden if no support config is specified in app-config
+
+### Patch Changes
+
+- af9097e: Adds the ability to mock a media query per break point and to change the active break point during a test. Usage example:
+
+  ```ts
+  const { set } = mockBreakpoint({
+    initialBreakpoint: 'md',
+    queryBreakpointMap: {
+      '(min-width:1500px)': 'xl',
+      '(min-width:1000px)': 'lg',
+      '(min-width:700px)': 'md',
+      '(min-width:400px)': 'sm',
+      '(min-width:0px)': 'xs',
+    },
+  });
+  // assertions for when the active break point is "md"
+  set('lg');
+  // assertions for when the active break point is "lg"
+  ```
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/repo-tools@0.11.0-next.0
+
+### Minor Changes
+
+- 47fdbb4: Adds a `--watch` mode to the `schema openapi generate` command for a better local schema writing experience.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend@0.24.0-next.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.0
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-node@1.14.0-next.0
+
+### Minor Changes
+
+- bc13b42: The `catalogServiceRef` now has its own accompanying `CatalogService` interface that requires Backstage `credentials` objects to be passed. This new version of the `catalogServiceRef` has been promoted and is now available via the main `@backstage/plugin-catalog-node` entry point.
+
+  The old `catalogServiceRef` with the old `CatalogApi` type is still available from the `/alpha` entry point.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/app-defaults@1.5.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/backend-app-api@1.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/backend-defaults@0.5.3-next.0
+
+### Patch Changes
+
+- f6eaec2: Link to proper package in `rootLoggerServiceFactory` doc string.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/backend-dynamic-feature-service@0.4.4-next.0
+
+### Patch Changes
+
+- 8593dfa: Improve the way alpha packages are supported when loading dynamic backend plugins.
+  The `ScannedPluginPackage` descriptor of dynamic backend plugins loaded from their alpha `package.json` now contain both the main package manifest and the alpha manifest. Previously it used to contain only the content of the alpha `package.json`, which is nearly empty.
+  This will make it easier to use or display metadata of loaded dynamic backend plugins, which is contained in the main manifest.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-openapi-utils@0.2.1-next.0
+
+### Patch Changes
+
+- f01787a: Moves msw from dependencies to devDependencies
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/backend-plugin-api@1.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/backend-test-utils@1.0.3-next.0
+
+### Patch Changes
+
+- 7aae8e3: The `mockServices.discovery.factory()` factory now uses the mocked discovery service as its implementation, avoid the need for configuration.
+- eb82994: Removed unused `msw` dependency.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/core-compat-api@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.22-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
+## @backstage/dev-utils@1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
+## @backstage/frontend-app-api@0.10.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-app@0.1.2-next.0
+
+## @backstage/frontend-plugin-api@0.9.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.0
+
+## @techdocs/cli@1.8.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
+## @backstage/plugin-api-docs@0.11.12-next.0
+
+### Patch Changes
+
+- 11f57de: bump `@asyncapi/react-component` to latest `2.x`
+- 3cd1dee: Uses theme values to style the API definition schema so that theme overrides apply.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app-backend@0.3.77-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.0
+
+## @backstage/plugin-app-node@0.1.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config-loader@1.9.1
+
+## @backstage/plugin-app-visualizer@0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+
+## @backstage/plugin-auth-node@0.5.4-next.0
+
+### Patch Changes
+
+- a0a9a4a: Browsers silently drop cookies that exceed 4KB, which can be problematic for refresh tokens and other large cookies.This update ensures that large cookies, like refresh tokens, are not dropped by browsers, maintaining the integrity of the authentication process. The changes include both the implementation of the cookie splitting logic and corresponding tests to validate the new functionality.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-react@0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog@1.24.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+
+## @backstage/plugin-catalog-backend@1.27.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-catalog-backend-module-azure@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## @backstage/plugin-catalog-backend-module-github@0.7.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.5.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-ldap@0.9.2-next.0
+
+### Patch Changes
+
+- 884a86c: Added a `dnCaseSensitive` flag to support LDAP servers with mixed-case attributes.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-graph@0.4.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
+## @backstage/plugin-catalog-import@0.12.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
+## @backstage/plugin-catalog-react@1.14.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/frontend-test-utils@0.2.2-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-config-schema@0.1.61-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-devtools@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-devtools-backend@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/plugin-events-backend@0.3.15-next.0
+
+### Patch Changes
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
+## @backstage/plugin-events-backend-module-github@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.38-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+
+## @backstage/plugin-events-node@0.4.3-next.0
+
+### Patch Changes
+
+- 4501631: Fixed an issue where subscribing to events threw an error and gave up too easily. Calling the subscribe method will cause the background polling loop to keep trying to connect to the events backend, even if the initial request fails.
+
+  By default the events service will attempt to publish and subscribe to events from the events bus API in the events backend, but if it fails due to the events backend not being installed, it will bail and never try calling the API again. There is now a new `events.useEventBus` configuration and option for the `DefaultEventsService` that lets you control this behavior. You can set it to `'never'` to disabled API calls to the events backend completely, or `'always'` to never allow it to be disabled.
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-home@0.8.1-next.0
+
+### Patch Changes
+
+- 8b1b2cf: Improve Starred Entities UI to reduce whitespace and provide more context on the entities:
+
+  - Use the Entity Presentation API (via `<EntityDisplayName>`) to display the entity's name
+  - Component's `kind` and `spec.type` are displayed as a secondary text
+  - List items are condensed to reduce unnecessary spacing
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.0
+
+## @backstage/plugin-home-react@0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+
+## @backstage/plugin-kubernetes@0.11.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-react@0.4.5-next.0
+
+## @backstage/plugin-kubernetes-backend@0.18.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-node@0.1.21-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/plugin-kubernetes-cluster@0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-react@0.4.5-next.0
+
+## @backstage/plugin-kubernetes-node@0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-kubernetes-react@0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-notifications@0.3.3-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-notifications-backend@0.4.3-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
+## @backstage/plugin-notifications-backend-module-email@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+
+## @backstage/plugin-notifications-common@0.0.6-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-notifications-node@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
+## @backstage/plugin-org@0.6.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
+## @backstage/plugin-org-react@0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
+## @backstage/plugin-permission-backend@0.5.51-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
+## @backstage/plugin-permission-node@0.8.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-proxy-backend@0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder@1.26.2-next.0
+
+### Patch Changes
+
+- 99471cd: fix(scaffolder): use `onInputChange` in `RepoUrlPicker` to fix issue with the value not updating properly
+- 7669af3: Revert the change of the option label for `EntityPicker`
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-backend@1.26.3-next.0
+
+### Patch Changes
+
+- 6aa5b98: Fix tasks listing with postgres
+- 59137ff: Fix issue with token not being available because it's now non-enumerable
+- e4f5d95: Align with type declaration of template filter/global function by supporting undefined as return value.
+- 97ba58f: Add example template for notification sending
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.0
+
+## @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.3-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
+## @backstage/plugin-scaffolder-react@1.13.2-next.0
+
+### Patch Changes
+
+- 8b5ff7e: Fix issue with form state not refreshing when updating
+- ade301c: Fix issue with `Stepper` and trying to trim additional properties. This is now all behind `liveOmit` and `omitExtraData` instead.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-search@1.4.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+
+## @backstage/plugin-search-backend@1.6.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+
+### Patch Changes
+
+- 0b8f344: Fixed a bug where the `filter` setting of the collator was not permitted to be an array.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.0
+
+### Patch Changes
+
+- dae59c1: Updated dependency `@short.io/opensearch-mock` to `^0.4.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-explore@0.2.5-next.0
+
+### Patch Changes
+
+- a9a7c7c: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.7`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-pg@0.5.38-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
+## @backstage/plugin-search-backend-node@1.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-react@1.8.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-signals@0.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-signals-backend@0.2.3-next.0
+
+### Patch Changes
+
+- a1e01ff: The signals backend now supports scaled deployments where clients may be connecting to one of many signal backend instances.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
+## @backstage/plugin-signals-node@0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-techdocs@1.11.1-next.0
+
+### Patch Changes
+
+- 605bdc0: Avoid page re-rendering when clicking on anchor links in the same documentation page.
+- 4f0cb89: Added DomPurify sanitizer configuration for custom elements implementing RFC <https://github.com/backstage/backstage/issues/26988>.
+  See <https://backstage.io/docs/features/techdocs/how-to-guides#how-to-enable-custom-elements-in-techdocs> for how to enable it in the configuration.
+- f246178: Removed `canvas` dev dependency.
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.41-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.0
+
+## @backstage/plugin-techdocs-backend@1.11.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+
+## @backstage/plugin-techdocs-node@1.12.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.10-next.0
+
+### Patch Changes
+
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.103-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.0
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-home@0.8.1-next.0
+  - @backstage/plugin-scaffolder@1.26.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/plugin-notifications@0.3.3-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.0
+  - @backstage/plugin-catalog-import@0.12.6-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.0
+  - @backstage/plugin-devtools@0.1.20-next.0
+  - @backstage/plugin-kubernetes@0.11.17-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.0
+  - @backstage/plugin-org@0.6.32-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-signals@0.0.12-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.0
+  - @backstage/plugin-user-settings@0.8.15-next.0
+
+## example-app-next@0.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.0
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-home@0.8.1-next.0
+  - @backstage/plugin-scaffolder@1.26.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/plugin-notifications@0.3.3-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-defaults@0.1.2-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-app@0.1.2-next.0
+  - @backstage/plugin-app-visualizer@0.1.12-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.0
+  - @backstage/plugin-catalog-import@0.12.6-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.0
+  - @backstage/plugin-kubernetes@0.11.17-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.0
+  - @backstage/plugin-org@0.6.32-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-signals@0.0.12-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.0
+  - @backstage/plugin-user-settings@0.8.15-next.0
+
+## app-next-example-plugin@0.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+
+## example-backend@0.0.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.26.3-next.0
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/plugin-notifications-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.0
+  - @backstage/plugin-devtools-backend@0.4.2-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.8-next.0
+  - @backstage/plugin-permission-backend@0.5.51-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-proxy-backend@0.5.8-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.0
+  - @backstage/plugin-search-backend@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-techdocs-backend@1.11.2-next.0
+
+## example-backend-legacy@0.2.104-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.26.3-next.0
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/plugin-signals-backend@0.2.3-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.0
+  - @backstage/plugin-devtools-backend@0.4.2-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.8-next.0
+  - @backstage/plugin-permission-backend@0.5.51-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-proxy-backend@0.5.8-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.0
+  - @backstage/plugin-search-backend@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+  - @backstage/plugin-techdocs-backend@1.11.2-next.0
+
+## e2e-test@0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
+## @internal/frontend@0.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+
+## techdocs-cli-embedded-app@0.2.102-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+
+## @internal/plugin-todo-list@1.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+
+## @internal/plugin-todo-list-backend@1.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
diff --git a/docs/releases/v1.33.0-next.1-changelog.md b/docs/releases/v1.33.0-next.1-changelog.md
new file mode 100644
index 0000000000..313cac1a59
--- /dev/null
+++ b/docs/releases/v1.33.0-next.1-changelog.md
@@ -0,0 +1,2120 @@
+# Release v1.33.0-next.1
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.33.0-next.1](https://backstage.github.io/upgrade-helper/?to=1.33.0-next.1)
+
+## @backstage/cli@0.29.0-next.1
+
+### Minor Changes
+
+- 6819f8c: Added a new optimization to the `repo test` command that will filter out unused packages in watch mode if all provide filters are paths that point from the repo root. This significantly speeds up running individual tests from the repo root in a large workspace, for example:
+
+  ```sh
+  yarn test packages/app/src/App.test.tsx
+  ```
+
+### Patch Changes
+
+- 4046d53: Fixed an issue where the `--successCache` option for the `repo test` and `repo lint` commands would be include the workspace path in generated cache keys. This previously broke caching in environments where the workspace path varies across builds.
+- 6b2888c: Fixed an issue with the `--successCache` flag for `repo test` where the tree hash for the wrong package directory would sometimes be used to generate the cache key.
+- 6266ed3: Updated dependency `del` to `^8.0.0`.
+- 4046d53: Fixed an issue with the `repo lint` command where the cache key for the `--successCache` option would not properly ignore files that should be ignored according to `.eslintignore`s.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.0-next.1
+
+### Minor Changes
+
+- 6cf91c5: Use `HumanDuration` for all duration needs in the public API, instead of `luxon` types. These are generally compatible, with a few caveats:
+
+  - If you scheduled things to run quarterly (`quarter` or `quarters`), you can use `{ months: 3 }` instead.
+  - If you used the singular nouns such as `year: 1`, use plurals instead (e.g. `years: 1`).
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-kubernetes@0.12.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-kubernetes-backend@0.19.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-kubernetes-node@0.2.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-kubernetes-react@0.5.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder-backend@1.27.0-next.1
+
+### Minor Changes
+
+- 0587633: Bumped the `isolated-vm` dependency from v4 to v5, which drops support for Node.js v16.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/app-defaults@1.5.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/backend-app-api@1.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/backend-defaults@0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/backend-dynamic-feature-service@0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-openapi-utils@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/backend-plugin-api@1.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/backend-test-utils@1.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/cli-common@0.1.15-next.0
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+
+## @backstage/cli-node@0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/codemods@0.1.52-next.0
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## @backstage/config-loader@1.9.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/core-compat-api@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-components@0.16.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.22-next.1
+
+### Patch Changes
+
+- 702f41d: Updated engines to support Node 20 or 22
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## @backstage/dev-utils@1.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/frontend-app-api@0.10.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-app@0.1.2-next.1
+
+## @backstage/frontend-plugin-api@0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.1
+
+## @backstage/repo-tools@0.11.0-next.1
+
+### Patch Changes
+
+- dde85ee: Added a new `generate-patch` command that can be used to generate patches for current changes in a source workspace to be installed it a target workspace.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## @techdocs/cli@1.8.22-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## @backstage/test-utils@1.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/theme@0.6.1-next.0
+
+### Patch Changes
+
+- ea75c37: Internal refactor to avoid top-level imports from MUI.
+
+## @backstage/plugin-api-docs@0.11.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app-backend@0.3.77-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-app-node@0.1.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config-loader@1.9.2-next.0
+
+## @backstage/plugin-app-visualizer@0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## @backstage/plugin-auth-backend@0.24.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.1
+
+### Patch Changes
+
+- b833660: Fix visibility of config for use in front end code
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## @backstage/plugin-auth-node@0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-react@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog@1.24.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## @backstage/plugin-catalog-backend@1.27.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-azure@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-github@0.7.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-ldap@0.9.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-graph@0.4.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-catalog-import@0.12.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-catalog-node@1.14.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/plugin-catalog-react@1.14.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/frontend-test-utils@0.2.2-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-config-schema@0.1.61-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-devtools@0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-devtools-backend@0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/plugin-events-backend@0.3.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-github@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-backend-test-utils@0.1.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-events-node@0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-home@0.8.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-home-react@0.1.19-next.1
+
+## @backstage/plugin-home-react@0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## @backstage/plugin-kubernetes-cluster@0.0.18-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-notifications@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-notifications-backend@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## @backstage/plugin-notifications-backend-module-email@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+
+## @backstage/plugin-notifications-node@0.2.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## @backstage/plugin-org@0.6.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-org-react@0.1.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## @backstage/plugin-permission-backend@0.5.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## @backstage/plugin-permission-node@0.8.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-proxy-backend@0.5.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder@1.26.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.1
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+      AlreadyExistsError: Failed to create branch at create-test because it already exists.
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.1
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+      AlreadyExistsError: Failed to create branch at create-test because it already exists.
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.1
+
+## @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.3-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## @backstage/plugin-scaffolder-react@1.13.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-search@1.4.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## @backstage/plugin-search-backend@1.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-explore@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-pg@0.5.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## @backstage/plugin-search-backend-node@1.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-react@1.8.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-signals@0.0.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-signals-backend@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## @backstage/plugin-signals-node@0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## @backstage/plugin-techdocs@1.11.1-next.1
+
+### Patch Changes
+
+- 90246a9: Fix techdocs config schema for custom elements sanitizer
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @backstage/plugin-techdocs-backend@1.11.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @backstage/plugin-techdocs-node@1.12.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.103-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-api-docs@0.11.12-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.1
+  - @backstage/plugin-catalog-import@0.12.6-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-devtools@0.1.20-next.1
+  - @backstage/plugin-home@0.8.1-next.1
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-org@0.6.32-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder@1.26.3-next.1
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+  - @backstage/plugin-search@1.4.19-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.1
+
+## example-app-next@0.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-api-docs@0.11.12-next.1
+  - @backstage/plugin-app@0.1.2-next.1
+  - @backstage/plugin-app-visualizer@0.1.12-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.1
+  - @backstage/plugin-catalog-import@0.12.6-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-home@0.8.1-next.1
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-org@0.6.32-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder@1.26.3-next.1
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+  - @backstage/plugin-search@1.4.19-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.1
+
+## app-next-example-plugin@0.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## example-backend@0.0.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.1
+  - @backstage/plugin-devtools-backend@0.4.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-notifications-backend@0.4.3-next.1
+  - @backstage/plugin-permission-backend@0.5.51-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-proxy-backend@0.5.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.1
+  - @backstage/plugin-search-backend@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-signals-backend@0.2.3-next.1
+  - @backstage/plugin-techdocs-backend@1.11.2-next.1
+
+## example-backend-legacy@0.2.104-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-devtools-backend@0.4.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-backend@0.5.51-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-proxy-backend@0.5.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.1
+  - @backstage/plugin-search-backend@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-signals-backend@0.2.3-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+  - @backstage/plugin-techdocs-backend@1.11.2-next.1
+
+## e2e-test@0.2.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.1
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## @internal/frontend@0.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+
+## techdocs-cli-embedded-app@0.2.102-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## yarn-plugin-backstage@0.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/release-manifests@0.0.11
+
+## @internal/plugin-todo-list@1.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## @internal/plugin-todo-list-backend@1.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
diff --git a/docs/releases/v1.33.0-next.2-changelog.md b/docs/releases/v1.33.0-next.2-changelog.md
new file mode 100644
index 0000000000..f967286e69
--- /dev/null
+++ b/docs/releases/v1.33.0-next.2-changelog.md
@@ -0,0 +1,1812 @@
+# Release v1.33.0-next.2
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.33.0-next.2](https://backstage.github.io/upgrade-helper/?to=1.33.0-next.2)
+
+## @backstage/backend-dynamic-feature-service@0.5.0-next.2
+
+### Minor Changes
+
+- e939cd7: **BREAKING** The `dynamicPluginsFeatureLoader` options related to the root logger behavior (`transports`, `level`, `format`) are now gathered under a single `logger` option which is a function taking an optional `Config` argument and returning the logger options.
+
+  This breaking change is required for 2 reasons:
+
+  - it's totally possible that the current `Config` would be required to provide the logger options,
+  - the logger-related options should be gathered under a common `logger` option because, when the root auditing service is introduced, distinct but similarly-named options would be required for the auditor as well.
+
+### Patch Changes
+
+- 1aeec12: Enhance the `CommonJSModuleLoader` to add support for `resolvePackagePath` calls from backend dynamic plugins, with customizable package resolution, and make the `CommonJSModuleLoader` public API.
+  Fixing this backend dynamic plugin limitation related to `resolvePackagePath` is important for backend dynamic plugins which use the database, since database migration scripts systematically use `resolvePackagePath`.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-openapi-utils@0.3.0-next.2
+
+### Minor Changes
+
+- 1440232: Adds a new `createValidatedOpenApiRouterFromGeneratedEndpointMap` function that uses the new static server generation in `backstage-cli package schema openapi generate --server` to create a typed express router.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/backend-test-utils@1.1.0-next.2
+
+### Minor Changes
+
+- 5064827: Made it possible to construct `mockServices.database` with a given knex instance
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/catalog-client@1.8.0-next.1
+
+### Minor Changes
+
+- 656d1ef: Internal update to use the updated generated code from `backstage-cli package schema openapi generate --client-package ...`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/cli@0.29.0-next.2
+
+### Minor Changes
+
+- bc47b17: **BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
+
+### Patch Changes
+
+- e19c53c: Fix for the `--link` flag for `package start` to deduplicate `react-router` and `react-router-dom`.
+- e565f73: Added support for `.webp` files in the frontend tooling.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/repo-tools@0.11.0-next.2
+
+### Minor Changes
+
+- 1440232: `backstage-repo-tools package schema openapi generate --server` now generates complete TS interfaces for all request/response objects in your OpenAPI schema. This fixes an edge case around recursive schemas and standardizes both the generated client and server to have similar generated types.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend@1.28.0-next.2
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.2
+
+### Minor Changes
+
+- 1b5fdd9: Extended the configuration with the `includeArchivedRepos` property, which allows including repositories when the project is archived.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.10.0-next.2
+
+### Minor Changes
+
+- 415aeb3: Add Support for Google LDAP Vendor
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-search-backend@1.7.0-next.2
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-app-api@1.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/backend-defaults@0.5.3-next.2
+
+### Patch Changes
+
+- e30bb46: Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/backend-plugin-api@1.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/create-app@0.5.22-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## @backstage/dev-utils@1.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+
+## @techdocs/cli@1.8.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## @backstage/plugin-api-docs@0.11.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app-backend@0.3.77-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+
+## @backstage/plugin-app-node@0.1.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config-loader@1.9.2-next.0
+
+## @backstage/plugin-app-visualizer@0.1.12-next.2
+
+### Patch Changes
+
+- e586e77: New `devDependency` for local development setup.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## @backstage/plugin-auth-backend@0.24.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.2
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+
+## @backstage/plugin-auth-node@0.5.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog@1.24.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-catalog-backend-module-azure@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## @backstage/plugin-catalog-backend-module-github@0.7.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-graph@0.4.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-import@0.12.6-next.2
+
+### Patch Changes
+
+- ea5b7f3: Fixed parsing of catalog-info.yaml when creating a PR to register a repository if the file contains more than one document
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-node@1.14.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-catalog-react@1.14.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/frontend-test-utils@0.2.2-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-devtools-backend@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-events-backend@0.3.16-next.2
+
+### Patch Changes
+
+- b7d0334: Cleaning up event subscriptions after the max age window
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-github@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+
+## @backstage/plugin-events-node@0.4.5-next.2
+
+### Patch Changes
+
+- 0b57aa1: Fixed an issue where the event bus polling would duplicate and increase exponentially over time.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-home@0.8.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.1
+
+## @backstage/plugin-kubernetes@0.12.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+
+## @backstage/plugin-kubernetes-backend@0.19.0-next.2
+
+### Patch Changes
+
+- bee9664: Adapted the config.d.ts for custom k8s cluster authProvider implementations
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-kubernetes-cluster@0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+
+## @backstage/plugin-kubernetes-node@0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-notifications-backend@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## @backstage/plugin-notifications-backend-module-email@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+
+## @backstage/plugin-notifications-node@0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## @backstage/plugin-org@0.6.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-org-react@0.1.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## @backstage/plugin-permission-backend@0.5.51-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-permission-node@0.8.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-proxy-backend@0.5.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder@1.26.3-next.2
+
+### Patch Changes
+
+- 8e4bed4: Updated dependency `idb-keyval` to `5.1.5`.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-backend@1.27.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.2
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.2
+
+## @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.1.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## @backstage/plugin-scaffolder-react@1.13.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-search@1.4.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-explore@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-pg@0.5.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## @backstage/plugin-search-backend-node@1.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-signals-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## @backstage/plugin-signals-node@0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-techdocs@1.11.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @backstage/plugin-techdocs-backend@1.11.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## @backstage/plugin-techdocs-node@1.12.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-user-settings@0.8.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.2
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog-import@0.12.6-next.2
+  - @backstage/plugin-scaffolder@1.26.3-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-graph@0.4.12-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-home@0.8.1-next.2
+  - @backstage/plugin-org@0.6.32-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.2
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-devtools@0.1.20-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.2
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.2
+
+## example-app-next@0.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog-import@0.12.6-next.2
+  - @backstage/plugin-scaffolder@1.26.3-next.2
+  - @backstage/plugin-app-visualizer@0.1.12-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-graph@0.4.12-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-home@0.8.1-next.2
+  - @backstage/plugin-org@0.6.32-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.2
+  - @backstage/plugin-app@0.1.2-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.2
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.2
+
+## example-backend@0.0.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-search-backend@1.7.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-notifications-backend@0.4.3-next.2
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/plugin-techdocs-backend@1.11.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-signals-backend@0.2.3-next.2
+
+## example-backend-legacy@0.2.104-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-search-backend@1.7.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/plugin-techdocs-backend@1.11.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-signals-backend@0.2.3-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## e2e-test@0.2.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## @internal/scaffolder@0.0.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+
+## techdocs-cli-embedded-app@0.2.102-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## @internal/plugin-todo-list-backend@1.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
diff --git a/docs/releases/v1.33.0-next.3-changelog.md b/docs/releases/v1.33.0-next.3-changelog.md
new file mode 100644
index 0000000000..db1702283b
--- /dev/null
+++ b/docs/releases/v1.33.0-next.3-changelog.md
@@ -0,0 +1,1607 @@
+# Release v1.33.0-next.3
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.33.0-next.3](https://backstage.github.io/upgrade-helper/?to=1.33.0-next.3)
+
+## @backstage/cli@0.29.0-next.3
+
+### Minor Changes
+
+- d849865: The package packing now populates `typesVersions` for additional entry points rather than using additional `package.json` files for type resolution. This improves auto completion of separate entry points when consuming published packages.
+
+### Patch Changes
+
+- 4a378d3: Fix dev server reloads of plugin discovery for new frontend system.
+- 6c48ebd: Add `--max-warnings -1` support to `backstage-cli package lint`
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- b533056: Updated dependency `css-loader` to `^7.0.0`.
+- be008c3: Updated dependency `@module-federation/enhanced` to `^0.7.0`.
+- 09ea093: Fixed an issue where `.css` style injection would fail for published packages.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog@1.25.0-next.3
+
+### Minor Changes
+
+- 50df3c8: - Updated EntityLayout component to implement breadcrumb navigation based on the entity relations.
+
+  - Added parentEntityRelations prop to EntityLayoutProps to specify relation types for parent entities.
+
+- 79e9631: Allow `OffsetPaginatedCatalogTable` to configure Table options and `CursorPaginatedCatalogTable` to configure `paginationPosition`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+
+## @backstage/plugin-catalog-backend@1.28.0-next.3
+
+### Minor Changes
+
+- 76857da: Added `entity_ref` column to `final_entities` in order to move `refresh_state` away from the read path
+- 34d4360: Drop redundant indices from the database.
+
+  The following redundant indices are removed in this version:
+
+  - `final_entities_entity_id_idx` - overlaps with `final_entities_pkey`
+  - `refresh_state_entity_id_idx` - overlaps with `refresh_state_pkey`
+  - `refresh_state_entity_ref_idx` - overlaps with `refresh_state_entity_ref_uniq`
+  - `search_key_idx` and `search_value_idx` - these were replaced by the composite index `search_key_value_idx` in #22594
+
+  No negative end user impact is expected, but rather that performance should increase due to less index churn.
+
+### Patch Changes
+
+- b89834b: Fixed an issue where entities would not be marked for restitching if only the target of a relationship changed.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+
+## @backstage/plugin-scaffolder@1.27.0-next.3
+
+### Minor Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-scaffolder-react@1.14.0-next.3
+
+### Minor Changes
+
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/app-defaults@1.5.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/backend-defaults@0.5.3-next.3
+
+### Patch Changes
+
+- ecf6b39: Use `node-fetch` instead of native fetch, as per <https://backstage.io/docs/architecture-decisions/adrs-adr013>
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/backend-dynamic-feature-service@0.5.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-test-utils@1.1.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+
+## @backstage/core-compat-api@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-components@0.16.0-next.2
+
+### Patch Changes
+
+- 0f18340: Change core component Table tool bar search box to the a appropriate Search icon and text
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.22-next.3
+
+### Patch Changes
+
+- 5872964: Use the main entrypoint for `create-app` installs
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## @backstage/dev-utils@1.1.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+
+## @backstage/frontend-app-api@0.10.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-app@0.1.2-next.2
+
+## @backstage/frontend-plugin-api@0.9.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.2
+
+## @backstage/integration-aws-node@0.1.13-next.0
+
+### Patch Changes
+
+- 52ae92d: The `getDefaultCredentialsChain` function now accepts and applies a `region` parameter, preventing it from defaulting to `us-east-1` when no region is specified.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/repo-tools@0.11.0-next.3
+
+### Patch Changes
+
+- 95401a8: The `generate-patch` command now properly includes newly created files in the patch.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- 3f1fb21: The `generate-patch` command will now fall back to always adding a `resolutions` entry, even if no matching descriptors are found.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## @techdocs/cli@1.8.22-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## @backstage/plugin-api-docs@0.11.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-app-visualizer@0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+
+## @backstage/plugin-auth-react@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+
+### Patch Changes
+
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.2-next.3
+
+### Patch Changes
+
+- f6b4b8a: Implemented discovery on project-level to shift Bitbucket Cloud API limits
+- Updated dependencies
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-github@0.7.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## @backstage/plugin-catalog-graph@0.4.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-import@0.12.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-react@1.14.1-next.3
+
+### Patch Changes
+
+- 6fcbb3b: Ensure EntityDisplayName component link receives underline on hover.
+- 9670906: Improve UI consistency of default catalog filters
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/frontend-test-utils@0.2.2-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-config-schema@0.1.61-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-devtools@0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
+## @backstage/plugin-events-backend@0.3.16-next.3
+
+### Patch Changes
+
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## @backstage/plugin-events-backend-module-github@0.2.14-next.3
+
+### Patch Changes
+
+- 9816f51: Fix the event request validation for incoming requests for GitHub webhook events
+  by using the raw body when verifying the signature.
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+
+## @backstage/plugin-events-node@0.4.5-next.3
+
+### Patch Changes
+
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-home@0.8.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.2
+
+## @backstage/plugin-home-react@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+
+## @backstage/plugin-kubernetes@0.12.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0-next.2
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-kubernetes-backend@0.19.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## @backstage/plugin-kubernetes-cluster@0.0.18-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0-next.2
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-kubernetes-react@0.5.0-next.2
+
+### Patch Changes
+
+- 0b729da: add the pod delete feature to the kubernetes react plugin
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## @backstage/plugin-notifications@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-notifications-backend@0.4.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## @backstage/plugin-notifications-backend-module-email@0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+
+## @backstage/plugin-notifications-node@0.2.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## @backstage/plugin-org@0.6.32-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-org-react@0.1.31-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+
+## @backstage/plugin-scaffolder-backend@1.27.0-next.3
+
+### Patch Changes
+
+- 7ab3371: Modified `createDryRunner` and corresponding route to include `templateMetaData` inside the `templateInfo`. This allows custom action writers to access things like `templateInfo.entity.metadata.name` via the action context while executing templates using the dry run framework.
+- 2dae341: Add new `fs:readdir` action to list current content of the workspace
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.3
+
+## @backstage/plugin-scaffolder-common@1.5.7-next.0
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.1.0-next.3
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## @backstage/plugin-search@1.4.19-next.3
+
+### Patch Changes
+
+- a4ccc82: Removes the card UI from the search results type filter for a cleaner UI consistent with other filters
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+
+## @backstage/plugin-search-backend@1.7.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-explore@0.2.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-pg@0.5.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## @backstage/plugin-search-backend-node@1.3.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-react@1.8.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-signals@0.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## @backstage/plugin-signals-backend@0.2.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## @backstage/plugin-signals-node@0.1.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+
+## @backstage/plugin-techdocs@1.11.1-next.3
+
+### Patch Changes
+
+- e937ae7: Fix an issue with index page of documentation site being re-rendered.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## @backstage/plugin-techdocs-backend@1.11.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## @backstage/plugin-techdocs-node@1.12.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.27-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.3
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.103-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-search@1.4.19-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/plugin-scaffolder@1.27.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/plugin-api-docs@0.11.12-next.3
+  - @backstage/plugin-catalog-graph@0.4.12-next.3
+  - @backstage/plugin-catalog-import@0.12.6-next.3
+  - @backstage/plugin-org@0.6.32-next.3
+  - @backstage/plugin-user-settings@0.8.15-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.2
+  - @backstage/plugin-devtools@0.1.20-next.2
+  - @backstage/plugin-home@0.8.1-next.3
+  - @backstage/plugin-kubernetes@0.12.0-next.3
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.3
+  - @backstage/plugin-notifications@0.3.3-next.2
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-signals@0.0.12-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## example-app-next@0.0.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-search@1.4.19-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/plugin-scaffolder@1.27.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/plugin-api-docs@0.11.12-next.3
+  - @backstage/plugin-catalog-graph@0.4.12-next.3
+  - @backstage/plugin-catalog-import@0.12.6-next.3
+  - @backstage/plugin-org@0.6.32-next.3
+  - @backstage/plugin-user-settings@0.8.15-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-defaults@0.1.2-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-app@0.1.2-next.2
+  - @backstage/plugin-app-visualizer@0.1.12-next.3
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.2
+  - @backstage/plugin-home@0.8.1-next.3
+  - @backstage/plugin-kubernetes@0.12.0-next.3
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.3
+  - @backstage/plugin-notifications@0.3.3-next.2
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-signals@0.0.12-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## app-next-example-plugin@0.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+
+## example-backend@0.0.32-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.3
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.3
+  - @backstage/plugin-notifications-backend@0.4.3-next.3
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.3
+  - @backstage/plugin-search-backend@1.7.0-next.3
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-signals-backend@0.2.3-next.3
+  - @backstage/plugin-techdocs-backend@1.11.2-next.3
+
+## example-backend-legacy@0.2.104-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.3
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.3
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.3
+  - @backstage/plugin-search-backend@1.7.0-next.3
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.3
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.3
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-signals-backend@0.2.3-next.3
+  - @backstage/plugin-signals-node@0.1.14-next.3
+  - @backstage/plugin-techdocs-backend@1.11.2-next.3
+
+## e2e-test@0.2.22-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.3
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## @internal/frontend@0.0.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+
+## techdocs-cli-embedded-app@0.2.102-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## @internal/plugin-todo-list@1.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
diff --git a/docs/releases/v1.33.0.md b/docs/releases/v1.33.0.md
new file mode 100644
index 0000000000..c8798ea9e5
--- /dev/null
+++ b/docs/releases/v1.33.0.md
@@ -0,0 +1,73 @@
+---
+id: v1.33.0
+title: v1.33.0
+description: Backstage Release v1.33.0
+---
+
+These are the release notes for the v1.33.0 release of [Backstage](https://backstage.io/).
+
+A huge thanks to the whole team of maintainers and contributors as well as the amazing Backstage Community for the hard work in getting this release developed and done.
+
+## Highlights
+
+### Catalog performance improvements and breadcrumbs
+
+Some database improvements and fixes have been made to the catalog. The `refresh_state` table is no longer needed in the read path, and some indices have been dropped. We don't expect this to have any negative impact on end users; rather, performance should increase due to reduced index churn and less used storage.
+
+Entity pages now also by default have a breadcrumb control in the page header, showing the context of the current entity such as what system and domain it’s in, if any.
+
+### App backend config injection with read-only filesystem
+
+The `app-backend` now stores the templated `index.html` file in memory rather than writing it to disk. This means you no longer need to use the `app.disableConfigInjection` flag when running with a read-only filesystem, allowing you to take advantage of the config injection.
+
+### **BREAKING**: `LEGACY_BACKEND_START` has been removed
+
+The CLI no longer supports the `LEGACY_BACKEND_START` flag, which means that old dev endpoints in `src/run.ts` have to be migrated to the new `dev/index.ts` structure instead.
+
+### Scaffolder now supports Node.js v22
+
+The `isolated-vm` dependency has been upgraded to `v5`, which means the scaffolder now supports Node.js v22. It also means that running Scaffolder with Node.js v16 is no longer possible.
+
+### Scaffolder permissions and actions
+
+A new `scaffolder.template.management` permission has been added. This permission is useful if you want to limit access to the frontend template management features. Contributed by [@stephenglass](https://github.com/stephenglass) in [#26946](https://github.com/backstage/backstage/pull/26946)
+
+A new `fs:readdir` action has been added. This action is useful if you need to retrieve the contents of a specific directory within a workspace. Contributed by [@secustor](https://github.com/secustor) in [#27283](https://github.com/backstage/backstage/pull/27283)
+
+### Catalog service ref for backends
+
+The `@backstage/plugin-catalog-node` package now has a `catalogServiceRef` that backends should move to depending on for their catalog communication needs. If you are currently instantiating a `CatalogService` by hand, you will enjoy using this new service instead. The most important improvement is that it supports a credentials argument directly which gives it support for proper auth toward the catalog without having to make tokens with the `auth` core service.
+
+### New generate-patch cli command
+
+We have added a new `generate-patch` CLI command that can be used to generate patches for current changes in a source workspace, which can then be installed in a target workspace. This allows you to easily and immediately use changes that have been contributed upstream, without needing to wait for a release.
+[#27331](https://github.com/backstage/backstage/pull/27331)
+
+### Google LDAP support
+
+Added support for Google LDAP to `@backstage/plugin-catalog-backend-module-ldap`. Contributed by [@megatroom](https://github.com/megatroom) in [#27373](https://github.com/backstage/backstage/pull/27373)
+
+### **BREAKING** AWS ALB authentication
+
+The AWS ALB `fullProfile` will no longer have its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result via `@backstage/plugin-auth-backend-module-aws-alb-provider`.
+
+## Security Fixes
+
+The kubernetes plugin received a bump of the `@kubernetes/client-node` dependency to mitigate CVEs related to the `request` and `tough-cookie` packages. Contributed by [@coreydaley](https://github.com/coreydaley) in [#25385](https://github.com/backstage/backstage/pull/25385)
+
+## Upgrade path
+
+We recommend that you keep your Backstage project up to date with this latest release. For more guidance on how to upgrade, check out the documentation for [keeping Backstage updated](https://backstage.io/docs/getting-started/keeping-backstage-updated).
+
+## Links and References
+
+Below you can find a list of links and references to help you learn about and start using this new release.
+
+- [Backstage official website](https://backstage.io/), [documentation](https://backstage.io/docs/), and [getting started guide](https://backstage.io/docs/getting-started/)
+- [GitHub repository](https://github.com/backstage/backstage)
+- Backstage's [versioning and support policy](https://backstage.io/docs/overview/versioning-policy)
+- [Community Discord](https://discord.gg/backstage-687207715902193673) for discussions and support
+- [Changelog](https://github.com/backstage/backstage/tree/master/docs/releases/v1.33.0-changelog.md)
+- Backstage [Demos](https://backstage.io/demos), [Blog](https://backstage.io/blog), [Roadmap](https://backstage.io/docs/overview/roadmap) and [Plugins](https://backstage.io/plugins)
+
+Sign up for our [newsletter](https://info.backstage.spotify.com/newsletter_subscribe) if you want to be informed about what is happening in the world of Backstage.
diff --git a/docs/releases/v1.34.0-next.0-changelog.md b/docs/releases/v1.34.0-next.0-changelog.md
new file mode 100644
index 0000000000..4ed7a2a57b
--- /dev/null
+++ b/docs/releases/v1.34.0-next.0-changelog.md
@@ -0,0 +1,2234 @@
+# Release v1.34.0-next.0
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.34.0-next.0](https://backstage.github.io/upgrade-helper/?to=1.34.0-next.0)
+
+## @backstage/backend-defaults@0.6.0-next.0
+
+### Minor Changes
+
+- de6f280: **BREAKING** Upgraded @keyv/redis and keyv packages to resolve a bug related to incorrect resolution of cache keys.
+
+  This is a breaking change for clients using the `redis` store for cache with `useRedisSets` option set to false since cache keys will be calculated differently (without the sets:namespace: prefix). For clients with default configuration (or useRedisSets set to false) the cache keys will stay the same, but since @keyv/redis library no longer supports redis sets they won't be utilised anymore.
+
+  If you were using `useRedisSets` option in configuration make sure to remove it from `app-config.yaml`:
+
+  ```diff
+  backend:
+    cache:
+      store: redis
+      connection: redis://user:pass@cache.example.com:6379
+  -   useRedisSets: false
+  ```
+
+- 277092a: Implemented `AzureBlobStorageUrlReader` to read from the url of committed location from the entity provider
+
+- 18a2c00: All middleware used by the default `coreServices.http` is now exported for use by custom implementations.
+
+### Patch Changes
+
+- 8863b38: Export `PluginTokenHandler` and `pluginTokenHandlerDecoratorServiceRef` to allow for custom decoration of the plugin token handler without having to re-implement the entire handler.
+- 97c6837: Export `DefaultHttpAuthService` to allow for custom token extraction logic.
+- e5255f1: Log request and response metadata so it can be used for filtering log messages.
+  The format of the request date was also changed from `clf` to `utc`.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/backend-test-utils@1.2.0-next.0
+
+### Minor Changes
+
+- de6f280: **BREAKING** Upgraded @keyv/redis and keyv packages to resolve a bug related to incorrect resolution of cache keys.
+
+  This is a breaking change for clients using the `redis` store for cache with `useRedisSets` option set to false since cache keys will be calculated differently (without the sets:namespace: prefix). For clients with default configuration (or useRedisSets set to false) the cache keys will stay the same, but since @keyv/redis library no longer supports redis sets they won't be utilised anymore.
+
+  If you were using `useRedisSets` option in configuration make sure to remove it from `app-config.yaml`:
+
+  ```diff
+  backend:
+    cache:
+      store: redis
+      connection: redis://user:pass@cache.example.com:6379
+  -   useRedisSets: false
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/integration@1.16.0-next.0
+
+### Minor Changes
+
+- 277092a: Add the integration for Azure blob storage to read the credentials to access the storage account and provide the default credential provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/repo-tools@0.12.0-next.0
+
+### Minor Changes
+
+- c1eccd6: Fix invalid path and malformed flags bugs in api-reports.ts
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend-module-azure@0.3.0-next.0
+
+### Minor Changes
+
+- 277092a: Added the Azure Blob Storage as catalog entity provider to import all the desired entities from storage account provided in app-config.yaml
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.11.0-next.0
+
+### Minor Changes
+
+- 732700a: Updated fix for ldap entity mapping which doesn't require extra config setting of dnCaseSensitive
+- 95ac4a2: Add new ldap vendor config 'LLDAP'
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-scaffolder-backend@1.28.0-next.0
+
+### Minor Changes
+
+- c05a343: Emit scaffolder events using the optional `EventsService`
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- 8f59dc5: Add fs:readdir to scaffolder startup
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.4-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.3-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.0
+
+### Minor Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 32459d0: **BREAKING**: Upgraded the `gitbeaker` library to version 41. As part of this, the `scopes` parameter to the `gitlab:projectDeployToken:create` is no longer optional, so you will have to pass it a value (for example `['read_repository']`).
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/app-defaults@1.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/backend-app-api@1.0.3-next.0
+
+### Patch Changes
+
+- eef3ef1: Removed unused `express` dependencies.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/backend-dynamic-feature-service@0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/backend-openapi-utils@0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/backend-plugin-api@1.0.3-next.0
+
+### Patch Changes
+
+- eef3ef1: Removed unused `express` dependencies.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/catalog-client@1.8.1-next.0
+
+### Patch Changes
+
+- d7e7836: Fixed a bug in the `queryEntities` method where errors were not being handled properly.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/cli@0.29.3-next.0
+
+### Patch Changes
+
+- 2b6c1ea: If the Backstage yarn plugin is installed, it will now be automatically updated as part of `versions:bump`.
+- 7dcff85: Remove special-casing for `@types` packages when generating dependency entries
+  during templating
+- 0aff006: Bumped the version range for `html-webpack-plugin` to fix the `htmlPluginExports.getCompilationHooks is not a function` error when using experimental Rspack.
+- 583f3d4: Added `@backstage/cli/config/prettier` as a replacement for `@spotify/prettier-config`, but with the same configuration.
+- 5f04976: Update `rollup` to avoid issues with build output when running `backstage-cli package build`.
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/release-manifests@0.0.12-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/types@1.2.0
+
+## @backstage/cli-node@0.2.11-next.0
+
+### Patch Changes
+
+- af665ea: add PackageManager and Lockfile interfaces for future use
+- cbfc69e: Internal refactor
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/core-app-api@1.15.3-next.0
+
+### Patch Changes
+
+- e5fa018: The OAuth 2 client implementations will now attempt to refresh the session when the existing session doesn't have the required scopes. The previous behavior was to only try to refresh the session of it was missing, and otherwise directly request a new session. This fixes an issue where some auth providers will not return access tokens with certain scopes unless explicitly requested, leading to an auth popup even if the underlying session already had been granted the requested scopes.
+- 2830689: Decrease OAuth2 token refresh grace period
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-compat-api@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-components@0.16.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.23-next.0
+
+### Patch Changes
+
+- 5819f8d: Updated Dockerfile to include `backstage.json` file
+- 583f3d4: Updated the template to use `@backstage/cli/config/prettier` instead of `@spotify/prettier-config`.
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## @backstage/dev-utils@1.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+
+## @backstage/frontend-app-api@0.10.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-defaults@0.1.4-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.3-next.0
+
+## @backstage/frontend-plugin-api@0.9.3-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/integration-react@1.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/release-manifests@0.0.12-next.0
+
+### Patch Changes
+
+- 2e140dc: Switch to native fetch for loading release manifests
+
+## @techdocs/cli@1.8.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+
+## @backstage/test-utils@1.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/theme@0.6.3-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+
+## @backstage/plugin-api-docs@0.12.2-next.0
+
+### Patch Changes
+
+- 11babd9: Fix link styling in ProvidedApisCard component so it aligns with other card components.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app@0.1.4-next.0
+
+### Patch Changes
+
+- e5fa018: The OAuth 2 client implementations will now attempt to refresh the session when the existing session doesn't have the required scopes. The previous behavior was to only try to refresh the session of it was missing, and otherwise directly request a new session. This fixes an issue where some auth providers will not return access tokens with certain scopes unless explicitly requested, leading to an auth popup even if the underlying session already had been granted the requested scopes.
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app-backend@0.4.3-next.0
+
+### Patch Changes
+
+- 74c3f2a: Fixed a bug where config would not be injected on the `/` and `/index.html` paths.
+- d66fa80: Fix root route handling when query parameters are present
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.0
+
+## @backstage/plugin-app-node@0.1.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config-loader@1.9.2
+
+## @backstage/plugin-app-visualizer@0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-auth-backend@0.24.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-auth-node@0.5.5-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-react@0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-catalog@1.25.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-catalog-backend@1.28.1-next.0
+
+### Patch Changes
+
+- f159b25: Compute deltas more efficiently, which generally leads to less wasted processing cycles
+- 56511ba: Be more aggressive in dequeueing entities for stitching
+- 71152e3: Correctly report stitching queue length
+- 3ab57c6: Support changing location keys on existing entities, in delta mutations
+- 2924ffe: Compute some metrics using search table facet aggregations instead of reading the full refresh state
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.7.8-next.0
+
+### Patch Changes
+
+- 468bbcc: Pass in a default schedule to the `GithubEntityProvider` if none is provided
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.1-next.0
+
+### Patch Changes
+
+- cce9cae: Deprecate old-backend-system `IncrementalCatalogBuilder`
+- 5aa44d2: Wire up the events together in the new backend system
+- cbfc69e: Create a `dev/index.ts` entrypoint for `yarn start`
+- 3ca5f70: Ensure that the scheduled worker task doesn't run at an unreasonably high frequency
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-catalog-graph@0.4.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog-import@0.12.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-node@1.14.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-catalog-react@1.14.3-next.0
+
+### Patch Changes
+
+- f18c67d: Fix catalog filtering to allow searching entities by display name
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-test-utils@0.2.4-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-config-schema@0.1.63-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-devtools@0.1.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-devtools-backend@0.4.3-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-events-backend@0.3.17-next.0
+
+### Patch Changes
+
+- 1577511: Allow configuring a timeout for event bus polling requests. This can be set like so in your app-config:
+
+  ```yaml
+  events:
+    notifyTimeoutMs: 30000
+  ```
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-events-backend-module-azure@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## @backstage/plugin-events-backend-module-github@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## @backstage/plugin-events-node@0.4.6-next.0
+
+### Patch Changes
+
+- 79a06f6: Clarified purpose of subscriber ID in TSDoc for `EventsServiceSubscribeOptions`.
+
+- 1577511: Allow configuring a timeout for event bus polling requests. This can be set like so in your app-config:
+
+  ```yaml
+  events:
+    notifyTimeoutMs: 30000
+  ```
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-home@0.8.3-next.0
+
+### Patch Changes
+
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-home-react@0.1.21-next.0
+
+### Patch Changes
+
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-kubernetes@0.12.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.0
+
+## @backstage/plugin-kubernetes-backend@0.19.1-next.0
+
+### Patch Changes
+
+- cbfc69e: Create a `dev/index.ts` entrypoint for `yarn start`
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-node@0.2.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-kubernetes-cluster@0.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.0
+
+## @backstage/plugin-kubernetes-node@0.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-kubernetes-react@0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-notifications@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-notifications-backend@0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## @backstage/plugin-notifications-backend-module-email@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+
+## @backstage/plugin-notifications-node@0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## @backstage/plugin-org@0.6.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-org-react@0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-permission-backend@0.5.52-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## @backstage/plugin-permission-node@0.8.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-proxy-backend@0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder@1.27.2-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.4-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.3-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.3-next.0
+
+### Patch Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.16-next.0
+
+## @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-scaffolder-node@0.6.1-next.0
+
+### Patch Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.2.0-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-react@1.14.2-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-search@1.4.21-next.0
+
+### Patch Changes
+
+- d311c84: Use Select from core-components and update Lifecycle filter to use Select instead checkboxes.
+- Updated dependencies
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend@1.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-explore@0.2.6-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-pg@0.5.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-node@1.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-react@1.8.4-next.0
+
+### Patch Changes
+
+- d311c84: Use Select from core-components and update Lifecycle filter to use Select instead checkboxes.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-signals@0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-signals-backend@0.2.4-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## @backstage/plugin-signals-node@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-techdocs@1.11.3-next.0
+
+### Patch Changes
+
+- 7d8777d: Added support for the Search bar in docs residing in the entity page tab, and not only the global "/docs" page.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## @backstage/plugin-techdocs-backend@1.11.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## @backstage/plugin-techdocs-node@1.12.15-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.104-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-scaffolder@1.27.2-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-search@1.4.21-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/plugin-home@0.8.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-api-docs@0.12.2-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.0
+  - @backstage/plugin-catalog-import@0.12.8-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.0
+  - @backstage/plugin-devtools@0.1.22-next.0
+  - @backstage/plugin-kubernetes@0.12.2-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.0
+  - @backstage/plugin-notifications@0.4.2-next.0
+  - @backstage/plugin-org@0.6.34-next.0
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-signals@0.0.14-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+  - @backstage/plugin-user-settings@0.8.17-next.0
+
+## example-app-next@0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-scaffolder@1.27.2-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-search@1.4.21-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/plugin-home@0.8.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-api-docs@0.12.2-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/frontend-defaults@0.1.4-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-app-visualizer@0.1.14-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.0
+  - @backstage/plugin-catalog-import@0.12.8-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.0
+  - @backstage/plugin-kubernetes@0.12.2-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.0
+  - @backstage/plugin-notifications@0.4.2-next.0
+  - @backstage/plugin-org@0.6.34-next.0
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-signals@0.0.14-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+  - @backstage/plugin-user-settings@0.8.17-next.0
+
+## app-next-example-plugin@0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+
+## example-backend@0.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.0
+  - @backstage/plugin-app-backend@0.4.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-backend@0.5.52-next.0
+  - @backstage/plugin-devtools-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.4-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.0
+  - @backstage/plugin-notifications-backend@0.4.4-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-proxy-backend@0.5.9-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.4-next.0
+  - @backstage/plugin-search-backend@1.7.1-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-techdocs-backend@1.11.4-next.0
+
+## example-backend-legacy@0.2.105-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.0
+  - @backstage/plugin-app-backend@0.4.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-backend@0.5.52-next.0
+  - @backstage/plugin-devtools-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.4-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-proxy-backend@0.5.9-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.3-next.0
+  - @backstage/plugin-search-backend@1.7.1-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+  - @backstage/plugin-techdocs-backend@1.11.4-next.0
+
+## e2e-test@0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @internal/frontend@0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+
+## techdocs-cli-embedded-app@0.2.103-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## yarn-plugin-backstage@0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/release-manifests@0.0.12-next.0
+  - @backstage/cli-common@0.1.15
+
+## @internal/plugin-todo-list@1.0.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## @internal/plugin-todo-list-backend@1.0.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
diff --git a/docs/releases/v1.34.0-next.1-changelog.md b/docs/releases/v1.34.0-next.1-changelog.md
new file mode 100644
index 0000000000..b61e5b1560
--- /dev/null
+++ b/docs/releases/v1.34.0-next.1-changelog.md
@@ -0,0 +1,2146 @@
+# Release v1.34.0-next.1
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.34.0-next.1](https://backstage.github.io/upgrade-helper/?to=1.34.0-next.1)
+
+## @backstage/backend-app-api@1.1.0-next.1
+
+### Minor Changes
+
+- 12eac85: **EXPERIMENTAL**: Adds a new `instanceMetadataService` to hold information about a specific backend instance.
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/backend-plugin-api@1.1.0-next.1
+
+### Minor Changes
+
+- 12eac85: **EXPERIMENTAL**: Adds a new `instanceMetadataService` to hold information about a specific backend instance.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/catalog-client@1.9.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend@1.29.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+- 1d0bc11: Fetch all facets in a single database query
+
+### Patch Changes
+
+- e4aab10: Fix a bug where sometimes the `by-query` endpoint could return nulls for entities that were not yet stitched.
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-catalog-node@1.15.0-next.1
+
+### Minor Changes
+
+- 8edc4cd: Updated the `catalogServiceMock` return type to match both `CatalogService` and `CatalogApi`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-devtools-backend@0.5.0-next.1
+
+### Minor Changes
+
+- c781a9a: **BREAKING** Removed support for what is known as the legacy backend, please use the New Backend System.
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-events-backend@0.4.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-search-backend@1.8.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/app-defaults@1.5.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/backend-defaults@0.6.0-next.1
+
+### Patch Changes
+
+- fe87fbf: Add task metrics as two gauges that track the last start and end timestamps as epoch seconds.
+- 1ac6b72: Support `connection.type: cloudsql` in database client for usage with `@google-cloud/cloud-sql-connector` and `iam` auth
+- 5c9cc05: Use native fetch instead of node-fetch
+- cf627c6: Fixed an issue in the WinstonLogger where Errors thrown and given to logger.error with field values that could not be cast to a string would throw a TypeError
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/backend-dynamic-feature-service@0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/backend-openapi-utils@0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/backend-test-utils@1.2.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/cli@0.29.3-next.1
+
+### Patch Changes
+
+- a49030a: Add support for `--output-file` option from ESLint to `package lint` and `repo lint` commands.
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/config-loader@1.9.3-next.0
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/core-compat-api@0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-components@0.16.2-next.1
+
+### Patch Changes
+
+- e47be38: Added data-testid to placeholder rendered by Progress component to simplify assertions in tests
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.23-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## @backstage/dev-utils@1.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+
+## @backstage/frontend-app-api@0.10.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-defaults@0.1.4-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-app@0.1.4-next.1
+
+## @backstage/frontend-plugin-api@0.9.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.4-next.1
+
+## @backstage/release-manifests@0.0.12-next.1
+
+### Patch Changes
+
+- b29eaea: Allow overriding the fetch function used inside getManifestByVersion
+
+## @backstage/repo-tools@0.12.0-next.1
+
+### Patch Changes
+
+- 860e3b5: Generated OpenAPI clients now support paths with tags.
+- 00058d0: The `generate-patch` command will now add a single resolution entry for all versions of the patched package, rather than separate entries for each version query.
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/errors@1.2.5
+
+## @techdocs/cli@1.8.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## @backstage/plugin-api-docs@0.12.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-app-backend@0.4.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.1
+
+## @backstage/plugin-app-node@0.1.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-app-visualizer@0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## @backstage/plugin-auth-backend@0.24.1-next.1
+
+### Patch Changes
+
+- c907440: Improved error forwarding for OAuth refresh endpoints
+- 40518ab: Fix issue with `jwks` endpoint returning invalid data with `firestore`
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.1
+
+### Patch Changes
+
+- 79b055a: Pass through `includeGrantedScopes` in order to persist scopes across refresh calls
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+
+## @backstage/plugin-auth-node@0.5.5-next.1
+
+### Patch Changes
+
+- c907440: Improved error forwarding for OAuth refresh endpoints
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-react@0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog@1.25.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-catalog-backend-module-azure@0.3.0-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.7.8-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.1-next.1
+
+### Patch Changes
+
+- fe87fbf: Add task metrics as two gauges that track the last start and end timestamps as epoch seconds.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-catalog-backend-module-ldap@0.11.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-catalog-graph@0.4.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog-import@0.12.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-catalog-react@1.14.3-next.1
+
+### Patch Changes
+
+- d97a2cd: Fixed an issue causing the `EntityOwnerPicker` to reset scrolling when more elements are loaded.
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/frontend-test-utils@0.2.4-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-config-schema@0.1.63-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-devtools@0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-module-github@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-backend-test-utils@0.1.39-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-events-node@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-home@0.8.3-next.1
+
+### Patch Changes
+
+- 7248f3b: Added a new Quick Start Card to `plugin-home`, which can display basic info to get users the info they need to onboard to the Catalog.
+
+      import { QuickStartCard } from '@backstage/plugin-home';
+      <QuickStartCard
+        title="Onboarding to the Catalog"
+        modalTitle="Onboarding Quick Start"
+        docsLinkTitle="Learn more with getting started docs"
+        docsLink="https://backstage.io/docs/getting-started"
+        image={
+          <img
+            src={ContentImage}
+            alt="quick start"
+            width="100%"
+            height="100%"
+          />
+        }
+        cardDescription="Backstage system model will help you create new entities"
+        video={
+          <video
+            controls
+            preload="auto"
+            poster={"./videoPoster.png"}
+          >
+            <source src={"OnboardingDemo.mp4"} type="video/mp4" />
+          </video>
+        }
+        downloadImage={
+          <Button
+            href={QuickStartPDF}
+            target={'_blank'}
+            download={true}
+          >
+            Download infographic button
+          </Button>
+        }
+      />
+
+  See the [storybook examples](https://backstage.io/storybook/?path=/story/plugins-home-components-quickstartcard--default)
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.1
+
+## @backstage/plugin-home-react@0.1.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-kubernetes@0.12.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.1
+
+## @backstage/plugin-kubernetes-backend@0.19.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-kubernetes-node@0.2.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-kubernetes-cluster@0.0.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.1
+
+## @backstage/plugin-kubernetes-node@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-kubernetes-react@0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## @backstage/plugin-notifications@0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-notifications-backend@0.4.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## @backstage/plugin-notifications-backend-module-email@0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+
+## @backstage/plugin-notifications-node@0.2.10-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## @backstage/plugin-org@0.6.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## @backstage/plugin-org-react@0.1.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## @backstage/plugin-permission-backend@0.5.52-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-permission-node@0.8.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## @backstage/plugin-proxy-backend@0.5.9-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder@1.27.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## @backstage/plugin-scaffolder-backend@1.28.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.1
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-node@0.6.2-next.1
+
+### Patch Changes
+
+- 1a23421: Make sure that isomorphic git push commands are not proxied.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-test-utils@1.2.0-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-react@1.14.2-next.1
+
+### Patch Changes
+
+- c846d76: Updated dependency `flatted` to `3.3.2`.
+- b21a5ae: Open links in the scaffolder entity and step descriptions in a new tab, to ensure consistency and improve user experience
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## @backstage/plugin-search@1.4.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+
+## @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.1
+
+### Patch Changes
+
+- 991c9fe: Update the ElasticSearchSearchEngine translator to handle phrase searches.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-explore@0.2.6-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-pg@0.5.39-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## @backstage/plugin-search-backend-node@1.3.6-next.1
+
+### Patch Changes
+
+- 5ae8a2c: Removed unnecessary dependency on `@backstage/backend-defaults`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-search-react@1.8.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## @backstage/plugin-signals@0.0.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+
+## @backstage/plugin-signals-backend@0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-signals-node@0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## @backstage/plugin-techdocs@1.11.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.43-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## @backstage/plugin-techdocs-backend@1.11.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## @backstage/plugin-techdocs-node@1.12.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.104-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.8.3-next.1
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-api-docs@0.12.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.1
+  - @backstage/plugin-catalog-import@0.12.8-next.1
+  - @backstage/plugin-kubernetes@0.12.2-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.1
+  - @backstage/plugin-org@0.6.34-next.1
+  - @backstage/plugin-scaffolder@1.27.2-next.1
+  - @backstage/plugin-search@1.4.21-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/plugin-user-settings@0.8.17-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.1
+  - @backstage/plugin-devtools@0.1.22-next.1
+  - @backstage/plugin-notifications@0.4.2-next.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-signals@0.0.14-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## example-app-next@0.0.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.8.3-next.1
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-api-docs@0.12.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.1
+  - @backstage/plugin-catalog-import@0.12.8-next.1
+  - @backstage/plugin-kubernetes@0.12.2-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.1
+  - @backstage/plugin-org@0.6.34-next.1
+  - @backstage/plugin-scaffolder@1.27.2-next.1
+  - @backstage/plugin-search@1.4.21-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/plugin-user-settings@0.8.17-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-defaults@0.1.4-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-app@0.1.4-next.1
+  - @backstage/plugin-app-visualizer@0.1.14-next.1
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.1
+  - @backstage/plugin-notifications@0.4.2-next.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-signals@0.0.14-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## app-next-example-plugin@0.0.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## example-backend@0.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-search-backend@1.8.0-next.1
+  - @backstage/plugin-devtools-backend@0.5.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.1
+  - @backstage/plugin-notifications-backend@0.4.4-next.1
+  - @backstage/plugin-permission-backend@0.5.52-next.1
+  - @backstage/plugin-techdocs-backend@1.11.4-next.1
+  - @backstage/plugin-signals-backend@0.2.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.9-next.1
+  - @backstage/plugin-app-backend@0.4.3-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.1
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## example-backend-legacy@0.2.105-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.1
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-search-backend@1.8.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.1
+  - @backstage/plugin-permission-backend@0.5.52-next.1
+  - @backstage/plugin-techdocs-backend@1.11.4-next.1
+  - @backstage/plugin-signals-backend@0.2.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.9-next.1
+  - @backstage/plugin-app-backend@0.4.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.1
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.1
+
+## e2e-test@0.2.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## @internal/frontend@0.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## techdocs-cli-embedded-app@0.2.103-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## yarn-plugin-backstage@0.0.4-next.1
+
+### Patch Changes
+
+- 48cc7c5: Use yarn's built-in http utilities for fetching release manifests
+- Updated dependencies
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/cli-common@0.1.15
+
+## @internal/plugin-todo-list@1.0.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+
+## @internal/plugin-todo-list-backend@1.0.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
diff --git a/docs/releases/v1.34.0-next.2-changelog.md b/docs/releases/v1.34.0-next.2-changelog.md
new file mode 100644
index 0000000000..7be3b11c59
--- /dev/null
+++ b/docs/releases/v1.34.0-next.2-changelog.md
@@ -0,0 +1,2268 @@
+# Release v1.34.0-next.2
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.34.0-next.2](https://backstage.github.io/upgrade-helper/?to=1.34.0-next.2)
+
+## @backstage/backend-app-api@1.1.0-next.2
+
+### Minor Changes
+
+- ebf083d: Service factories added by feature loaders now have lower priority and will be ignored if a factory for the same service is added directly by `backend.add(serviceFactory)`.
+
+### Patch Changes
+
+- 0e9c9fa: As soon as a backend termination signal is received, call before shutting down root lifecycle hooks.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/backend-defaults@0.6.0-next.2
+
+### Minor Changes
+
+- fd5d337: Added a new `backend.health.headers` configuration that can be used to set additional headers to include in health check responses.
+
+  **BREAKING CONSUMERS**: As part of this change the `createHealthRouter` function exported from `@backstage/backend-defaults/rootHttpRouter` now requires the root config service to be passed through the `config` option.
+
+- 3f34ea9: Throttles Bitbucket Server API calls
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 57e0b11: The user and plugin token verification in the default `AuthService` implementation will no longer forward verification errors to the caller, and instead log them as warnings.
+- 57e0b11: The default `authServiceFactory` now correctly depends on the plugin scoped `Logger` services rather than the root scoped one.
+- 0e9c9fa: Implements the `DefaultRootLifecycleService.addBeforeShutdownHook` method, and updates `DefaultRootHttpRouterService` and `DefaultRootHealthService` to listen to that event to stop accepting traffic and close service connections.
+- d0cbd82: Remove use of the `stoppable` library on the `DefaultRootHttpRouterService` as Node's native http server [close](https://nodejs.org/api/http.html#serverclosecallback) method already drains requests.
+  Also, we pass a new `lifecycleMiddleware` to the `rootHttpRouterServiceFactory` configure function that must be called manually if you don't call `applyDefaults`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/backend-openapi-utils@0.4.0-next.2
+
+### Minor Changes
+
+- afcebea: Fixed a Typescript error when trying to use the new OpenAPI server-side generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog@1.26.0-next.2
+
+### Minor Changes
+
+- 25beb82: Adds an optional columns attribute to HasSubdomainsCardProps and changes its default columns
+- 39f1abc: Consistent title behaviour across CatalogTable, CursorPaginatedCatalogTable, and OffsetPaginatedCatalogTable.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+
+## @backstage/plugin-catalog-backend@1.29.0-next.2
+
+### Minor Changes
+
+- c1307b4: Implement `/entities` in terms of `queryEntities` to not run into memory and performance problems on large catalogs
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 8013c9c: Perform the by-query count inlined with the main query
+- feba9ee: Use a join based strategy for filtering, when having small page sizes
+- 1fdb48e: Use a faster count method on pg when computing some metrics
+- 0c33465: Implement `/entities/by-name/:kind/:namespace/:name` using `getEntitiesByRefs`
+- d93390d: When parsing filters, do not make redundant `anyOf` and `allOf` nodes when there's only a single entry within them
+- 24ecea8: Avoid extra ordering in by-query when the user doesn't ask for it
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.3.0-next.2
+
+### Minor Changes
+
+- 3f34ea9: Throttles Bitbucket Server API calls
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.6.0-next.2
+
+### Minor Changes
+
+- 99dce5c: Implemented discovery for top-level groups defined in config.group or if undefined global top-level group in Gitlab
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-notifications@0.5.0-next.2
+
+### Minor Changes
+
+- fc15b77: Switched to using the new `/notifications` endpoints. Be sure to update the `notifications` plugin backend before deploying this frontend plugin change.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+
+## @backstage/plugin-notifications-backend@0.5.0-next.2
+
+### Minor Changes
+
+- fc15b77: **BREAKING**: Removed redundant `/health` endpoint, switch to using [the built-in endpoint instead](https://backstage.io/docs/backend-system/core-services/root-health).
+
+### Patch Changes
+
+- fc15b77: Deprecated root '/' endpoints, moving them under `/notifications` instead.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## @backstage/app-defaults@1.5.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/backend-dynamic-feature-service@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-app-node@0.1.28-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/backend-plugin-api@1.1.0-next.2
+
+### Patch Changes
+
+- 0e9c9fa: The `RootLifecycleService` now has a new `addBeforeShutdownHook` method, and hooks added through this method will run immediately when a termination event is received.
+
+  The backend will not proceed with the shutdown and run the `Shutdown` hooks until all `BeforeShutdown` hooks have completed.
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/backend-test-utils@1.2.0-next.2
+
+### Patch Changes
+
+- 0e9c9fa: Mock the new `RootLifecycleService.addBeforeShutdownHook` method.
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/catalog-client@1.9.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+
+## @backstage/catalog-model@1.7.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/cli@0.29.3-next.2
+
+### Patch Changes
+
+- 62a9062: Updated dependency `@module-federation/enhanced` to `^0.8.0`.
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/cli-node@0.2.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/types@1.2.0
+
+## @backstage/config@1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/config-loader@1.9.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/core-app-api@1.15.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-compat-api@0.3.4-next.2
+
+### Patch Changes
+
+- 1f30730: Updated dependency `@oriflame/backstage-plugin-score-card` to `^0.9.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-components@0.16.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/core-plugin-api@1.10.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/create-app@0.5.23-next.2
+
+### Patch Changes
+
+- e913fdf: Add github backend module to create-app and improve error messages
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## @backstage/dev-utils@1.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+
+## @backstage/errors@1.2.6-next.0
+
+### Patch Changes
+
+- 1d4b5b9: Trim `error.cause.stack` in addition to `error.stack` when trimming stack traces from serialized errors.
+- Updated dependencies
+  - @backstage/types@1.2.0
+
+## @backstage/frontend-app-api@0.10.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-defaults@0.1.4-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-defaults@0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-app@0.1.4-next.2
+
+## @backstage/frontend-plugin-api@0.9.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/frontend-test-utils@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.4-next.2
+
+## @backstage/integration@1.16.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/integration-aws-node@0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/integration-react@1.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/repo-tools@0.12.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+
+## @techdocs/cli@1.8.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/test-utils@1.7.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/plugin-api-docs@0.12.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/plugin-app@0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/plugin-app-backend@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-app-node@0.1.28-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-app-node@0.1.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/config-loader@1.9.3-next.1
+
+## @backstage/plugin-app-visualizer@0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## @backstage/plugin-auth-backend@0.24.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## @backstage/plugin-auth-node@0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-auth-react@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## @backstage/plugin-catalog-backend-module-azure@0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-catalog-backend-module-github@0.7.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.6.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.6.1-next.2
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- d42ecb0: Remove backend-common package from incremental-ingestion plugin and update related code
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.11.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.6-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-catalog-common@1.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-catalog-graph@0.4.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-catalog-import@0.12.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-catalog-node@1.15.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-catalog-react@1.14.3-next.2
+
+### Patch Changes
+
+- 95092a6: Fixed an issue where `<CatalogFilterLayout.Filters />` would re-render its children on page load for smaller screens, potentially leading to unnecessary additional backend requests.
+- 4a43398: Fixed an issue where the `EntityOwnerPicker` component failed to load when the `mode` prop was set to `owners-only`. In this mode, the `EntityOwnerPicker` does not load details about the owners, such as `displayName` or `title`. To display these details, use `mode=all` instead.
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/frontend-test-utils@0.2.4-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## @backstage/plugin-catalog-unprocessed-entities-common@0.0.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-config-schema@0.1.63-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-devtools@0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-devtools-common@0.1.14-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## @backstage/plugin-devtools-backend@0.5.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.14-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-devtools-common@0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-events-backend@0.4.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-events-backend-module-azure@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-events-backend-module-github@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.39-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## @backstage/plugin-events-node@0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-home@0.8.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.2
+
+## @backstage/plugin-home-react@0.1.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## @backstage/plugin-kubernetes@0.12.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.2
+
+## @backstage/plugin-kubernetes-backend@0.19.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-kubernetes-node@0.2.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-kubernetes-cluster@0.0.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.2
+
+## @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-kubernetes-node@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## @backstage/plugin-kubernetes-react@0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## @backstage/plugin-notifications-backend-module-email@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## @backstage/plugin-notifications-common@0.0.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-notifications-node@0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## @backstage/plugin-org@0.6.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## @backstage/plugin-org-react@0.1.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## @backstage/plugin-permission-backend@0.5.52-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-permission-common@0.8.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-permission-node@0.8.6-next.2
+
+### Patch Changes
+
+- b149e2a: The `createPermissionIntegrationRouter` function now detects and prevents the exposure of duplicate permissions.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-permission-react@0.4.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-proxy-backend@0.5.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder@1.27.2-next.2
+
+### Patch Changes
+
+- 184161f: Scaffolder field extensions registered with `FormFieldBlueprint` are now collected in the `useCustomFieldExtensions` hook, enabling them for use in the scaffolder.
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## @backstage/plugin-scaffolder-backend@1.28.0-next.2
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 6c326cf: The --no-node-snapshot check needs to be done against process.execArgv instead of process.argv
+- e913fdf: Add github backend module to create-app and improve error messages
+- 0851834: Resolved an issue where the `templateManagementPermission` was not being exposed through the `/permissions/metadata` endpoint.
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.2
+
+### Patch Changes
+
+- e913fdf: Add github backend module to create-app and improve error messages
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.2
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-scaffolder-node@0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.2.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-scaffolder-react@1.14.2-next.2
+
+### Patch Changes
+
+- 184161f: Scaffolder field extensions registered with `FormFieldBlueprint` are now collected in the `useCustomFieldExtensions` hook, enabling them for use in the scaffolder.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## @backstage/plugin-search@1.4.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+
+## @backstage/plugin-search-backend@1.8.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-explore@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.39-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-backend-node@1.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-search-common@1.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## @backstage/plugin-search-react@1.8.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## @backstage/plugin-signals@0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+
+## @backstage/plugin-signals-backend@0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-signals-node@0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-signals-react@0.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+
+## @backstage/plugin-techdocs@1.11.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.43-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## @backstage/plugin-techdocs-backend@1.11.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## @backstage/plugin-techdocs-node@1.12.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/version-bridge@1.0.10
+
+## @backstage/plugin-user-settings@0.8.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.104-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-notifications@0.5.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/plugin-scaffolder@1.27.2-next.2
+  - @backstage/plugin-api-docs@0.12.2-next.2
+  - @backstage/plugin-catalog-graph@0.4.14-next.2
+  - @backstage/plugin-catalog-import@0.12.8-next.2
+  - @backstage/plugin-org@0.6.34-next.2
+  - @backstage/plugin-user-settings@0.8.17-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.2
+  - @backstage/plugin-devtools@0.1.22-next.2
+  - @backstage/plugin-home@0.8.3-next.2
+  - @backstage/plugin-kubernetes@0.12.2-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.2
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-search@1.4.21-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-signals@0.0.14-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## example-app-next@0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-notifications@0.5.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/plugin-scaffolder@1.27.2-next.2
+  - @backstage/plugin-api-docs@0.12.2-next.2
+  - @backstage/plugin-catalog-graph@0.4.14-next.2
+  - @backstage/plugin-catalog-import@0.12.8-next.2
+  - @backstage/plugin-org@0.6.34-next.2
+  - @backstage/plugin-user-settings@0.8.17-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-defaults@0.1.4-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-app@0.1.4-next.2
+  - @backstage/plugin-app-visualizer@0.1.14-next.2
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.2
+  - @backstage/plugin-home@0.8.3-next.2
+  - @backstage/plugin-kubernetes@0.12.2-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.2
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-search@1.4.21-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-signals@0.0.14-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## app-next-example-plugin@0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## example-backend@0.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.2
+  - @backstage/plugin-notifications-backend@0.5.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-app-backend@0.4.3-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.2
+  - @backstage/plugin-devtools-backend@0.5.0-next.2
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.2
+  - @backstage/plugin-proxy-backend@0.5.9-next.2
+  - @backstage/plugin-search-backend@1.8.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-signals-backend@0.2.4-next.2
+  - @backstage/plugin-techdocs-backend@1.11.4-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.2
+  - @backstage/plugin-permission-backend@0.5.52-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.2
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## example-backend-legacy@0.2.105-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-app-backend@0.4.3-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.2
+  - @backstage/plugin-proxy-backend@0.5.9-next.2
+  - @backstage/plugin-search-backend@1.8.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-signals-backend@0.2.4-next.2
+  - @backstage/plugin-techdocs-backend@1.11.4-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-permission-backend@0.5.52-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## e2e-test@0.2.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+
+## @internal/frontend@0.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## @internal/scaffolder@0.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## techdocs-cli-embedded-app@0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## @internal/plugin-todo-list@1.0.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## @internal/plugin-todo-list-backend@1.0.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## @internal/plugin-todo-list-common@1.0.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.3-next.0
diff --git a/docs/tooling/cli/03-commands.md b/docs/tooling/cli/03-commands.md
index 913a71f514..2da7e11ef4 100644
--- a/docs/tooling/cli/03-commands.md
+++ b/docs/tooling/cli/03-commands.md
@@ -15,8 +15,6 @@ Below is a cleaned up output of `yarn backstage-cli --help`:
 ```text
 new [options]                                  Open up an interactive guide to creating new things in
                                                 your app
-test                                           Run tests, forwarding args to Jest, defaulting to watch
-                                                mode [DEPRECATED]
 config:docs [options]                          Browse the configuration reference documentation
 config:print [options]                         Print the app configuration for the current package
 config:check [options]                         Validate that the given configuration loads and matches
@@ -94,9 +92,52 @@ Usage: backstage-cli repo lint [options]
 Lint all packages in the project
 
 Options:
-  --format <format>  Lint report output format (default: "eslint-formatter-friendly")
-  --since <ref>      Only lint packages that changed since the specified ref
-  --fix              Attempt to automatically fix violations
+  --format <format>         Lint report output format (default: "eslint-formatter-friendly")
+  --since <ref>             Only lint packages that changed since the specified ref
+  --successCache            Enable success caching, which skips running tests for unchanged packages that were successful in the previous run
+  --successCacheDir <path>  Set the success cache location, (default: node_modules/.cache/backstage-cli)
+  --fix                     Attempt to automatically fix violations
+```
+
+## repo test
+
+Test packages in the project. It is recommended to have this command be used as the `test` script in the root `package.json` in your project:
+
+```json title="package.json in the root of your project"
+{
+  ...
+  "scripts": {
+    ...
+    "test": "backstage-cli repo test"
+  }
+}
+```
+
+If run without any arguments it will default to running changed tests in watch mode, unless the `CI` environment flag is set, in which case it will run all tests without watching:
+
+```sh title="Run changes tests from repo root"
+yarn test
+```
+
+If arguments are provided, they will be forwarded to Jest and used to filter test to execute. If full paths to tests are provided, only those tests will be included, for example:
+
+```sh title="Run specific tests from repo root"
+yarn test packages/app/src/App.test.tsx
+```
+
+If you want to avoid re-running tests that have not changed since the last successful run in CI, you can use the `--successCache` flag. By default this cache is stored in `node_modules/.cache/backstage-cli`, but you can choose a different directory with the `--successCacheDir <path>`.
+
+```text
+Usage: backstage-cli repo test [options]
+
+Run tests, forwarding args to Jest, defaulting to watch mode
+
+Options:
+  --since <ref>             Only test packages that changed since the specified ref
+  --successCache            Enable success caching, which skips running tests for unchanged packages that were successful in the previous run
+  --successCacheDir <path>  Set the success cache location, (default: node_modules/.cache/backstage-cli)
+  --jest-help               Show help for Jest CLI options, which are passed through
+  -h, --help                display help for command
 ```
 
 ## package start
@@ -146,8 +187,9 @@ Usage: backstage-cli package lint [options]
 Lint a package
 
 Options:
-  --format <format>  Lint report output format (default: "eslint-formatter-friendly")
-  --fix              Attempt to automatically fix violations
+  --format <format>        Lint report output format (default: "eslint-formatter-friendly")
+  --fix                    Attempt to automatically fix violations
+  --max-warnings <number>  Fail if more than this number of warnings. -1 allows warnings. (default: 0)
 ```
 
 ## package test
diff --git a/docs/tooling/local-dev/linking-local-packages.md b/docs/tooling/local-dev/linking-local-packages.md
index eb2a2cba37..9205195f64 100644
--- a/docs/tooling/local-dev/linking-local-packages.md
+++ b/docs/tooling/local-dev/linking-local-packages.md
@@ -18,89 +18,48 @@ together:
 For example, you might want to make modifications to `@backstage/core-plugin-api` and try them out in your company's
 instance of Backstage.
 
-## Linking in Backstage NPM Packages
+## External workspace linking
 
-To link in external packages, add them to your root `package.json` and `lerna.json`
-`"workspace"` paths. These can be either relative or absolute paths with or without
-globs.
+:::info
+Workspace linking is an experimental feature and may not work in all cases.
+:::
 
-For example:
+The `backstage-cli package start` command that is used for local development of all packages supports a `--link` flag that can be used to link a single external workspace to the current workspace. It hooks into the module resolution and will override all imports of packages in the linked workspace to be imported from there instead. The only exception are the `react` and `react-dom` packages, which will always be resolved from the target package.
 
-```json title="/lerna.json"
-...
-"packages": [
-  "packages/*",
-  "plugins/*",
-  "../backstage/packages/core-plugin-api", // New path added to work on @backstage/core-plugin-api
-],
-...
-```
+When linking an external workspace, make sure that dependencies are installed and up to date in both workspaces, and that the versions of `react` and `react-dom` are the same in both workspaces.
 
-```json title="/package.json"
-...
-"workspaces": {
-  "packages": [
-    "packages/*",
-    "plugins/*",
-    "../backstage/packages/core-plugin-api", // New path added to work on @backstage/core-plugin-api
-  ],
-}
-...
-```
-
-Now reinstall all packages from the root to make yarn set up symlinks from your application to the core Backstage clone:
+If you're within the `packages/app` folder inside your `my-backstage-application` workspace in the above example, you can link the `backstage` workspace using the following command:
 
 ```bash
-yarn install
+yarn start --link ../../../backstage
 ```
 
-## Making Backstage Changes
+The path provided to the `--link` option can be a relative or absolute path, and should point to the root of the external workspace.
 
-With this in place you can now modify the `@backstage/core-plugin-api` package
-within the main repo, and have those changes be reflected and tested in your
-app. Simply run your app using `yarn dev` (or `yarn start` for just frontend) as
-normal.
+With the `start` command up and running and serving the development version of your frontend app in the browser, you can now make changes to both workspaces and see the changes reflected in the browser.
+
+You can also link backend packages using the exact same process, simply start your backend package with the same `--link <workspace-path>` option.
 
 ## Common Problems
 
-### Backend Issues
+### React errors
 
-For backend packages you need to make sure that linked packages are
-not dependencies of any non-linked package. If you for example want to work on
-`@backstage/backend-common`, you need to also link in other backend plugins and
-packages that depend on `@backstage/backend-common`, or temporarily disable
-those plugins in your backend. This is because the transformation of backend
-module tree stops whenever a non-local package is encountered, and from that
-point node will `require` packages directly for that entire module subtree.
+If you are encountering errors related to React, it is likely that the versions of React in the two workspaces are different. Make sure that the versions of `react` and `react-dom` are the same in both workspaces, or at least that they are in sync between the package that you're serving the app from and the external workspace.
 
-### Typescript Issues
+## Generating temporary patches
 
-Type checking can also have issues when linking in external packages, since the
-linked in packages will use the types in the external project and dependency
-version mismatches between the two projects may cause errors. To fix any of
-those errors you need to sync versions of the dependencies in the two projects.
-A simple way to do this can be to copy over `yarn.lock` from the external
-project and run `yarn install`, although this is quite intrusive and can cause
-other issues in existing projects, so use this method with care. It can often be
-best to simply ignore the type errors, as app serving will work just fine
-anyway.
+!!!info
+This feature is experimental and currently only supports Yarn workspaces.
+!!!
 
-Another issue with type checking is that the incremental type cache doesn't
-invalidate correctly for the linked in packages, causing type checking to not
-reflect changes made to types. You can work around this by either setting
-`compilerOptions.incremental = false` in `tsconfig.json`, or by deleting the
-types cache folder `dist-types` before running `yarn tsc`.
+After making local changes to a package in an external workspace you might often want to merge and deploy these changes in your own project. You can use Yarn patches for this purpose, but it can be quite cumbersome to create these patches manually. To make this process easier, you can use `yarn backstage-repo-tools generate-patch` command from the `@backstage/repo-tools` package to generate a patch and resolution entries in the external workspace.
 
-### Version Issues
+For example, if you've made changes to the `@backstage/backend-app-api` package in a local clone of the main `backstage` repository, you can generate a patch for your internal project as follows:
 
-While `yarn install` might not error, it does not mean that the linking worked properly.
-You will know that linking worked properly when:
+```bash title="Run in the cloned backstage repository"
+yarn backstage-repo-tools generate-patch @backstage/backend-app-api --target ../our-developer-portal
+```
 
-1. Your Backstage application root `/node_modules/@backstage/[some package]` is a symlink
-2. Your Backstage application `/packages/app/node_modules` and `/packages/backend/node_modules` does
-   not contain the package you are attempting to link!
+This will generate a patch file in your `our-developer-portal` workspace. The patch will be based on the most recently released version of the source package, with the additional changes on top.
 
-If you see Yarn continuing to download the package you are trying to link from NPM, you might need to be
-explicit in your `package.json` version so that it exactly matches what you have in the cloned Backstage
-repository on your machine. For example, if you have cloned `/plugins/catalog` with version
-`"version": "1.19.1-next.1"` you will need to be explicit in your application to point to `"1.19.1-next.1"`.
+If you want to base the patch on a different version of the source package, you can specify the version using the `--base-version <version>` option, and if you want to only use the patch for a specific version query, you can specify that using the `--query <query>` option.
diff --git a/docs/tutorials/migrate-to-mui5.md b/docs/tutorials/migrate-to-mui5.md
index c65abbc680..a0f8a9017e 100644
--- a/docs/tutorials/migrate-to-mui5.md
+++ b/docs/tutorials/migrate-to-mui5.md
@@ -4,6 +4,12 @@ title: Migrating from Material UI v4 to v5
 description: Additional resources for the Material UI v5 migration guide specifically for Backstage
 ---
 
+:::info
+
+We are in the process of determining the path forward regarding a New Design System for Backstage, for the time being we recommend pausing any migrations to MUI v5 until this has been settled. More details can be found in ["RFC: New design system for Backstage"](https://github.com/backstage/backstage/issues/27726).
+
+:::
+
 Backstage supports developing new plugins or components using Material UI v5. At the same time, large parts of the application as well as existing plugins will still be using Material UI v4. To support Material UI v4 and v5 at the same time, we have introduced a new concept called the `UnifiedTheme`. The goal of the `UnifiedTheme` is to allow gradual migration by running both versions in parallel, applying theme options similarly & supporting potential future versions of Material UI.
 
 By default, the `UnifiedThemeProvider` is already used. If you add a custom theme in your `createApp` function, you would need to replace the Material UI `ThemeProvider` with the `UnifiedThemeProvider`:
diff --git a/docs/tutorials/setup-opentelemetry.md b/docs/tutorials/setup-opentelemetry.md
index cba8ba7049..c7687f1ab9 100644
--- a/docs/tutorials/setup-opentelemetry.md
+++ b/docs/tutorials/setup-opentelemetry.md
@@ -66,6 +66,14 @@ You can now start your Backstage instance as usual, using `yarn dev`.
 
 ## Production Setup
 
+In your `.dockerignore`, add this line:
+
+```
+!packages/backend/src/instrumentation.js
+```
+
+This ensures that Docker build will not ignore the instrumentation file if you are following the recommended `.dockerignore` setup.
+
 In your `Dockerfile`, copy `instrumentation.js` file into the root of the working directory.
 
 ```Dockerfile
diff --git a/microsite/blog/2023-05-06-backstage-deploy-alpha.mdx b/microsite/blog/2023-05-06-backstage-deploy-alpha.mdx
index 1a783b026a..126bbb9e7d 100644
--- a/microsite/blog/2023-05-06-backstage-deploy-alpha.mdx
+++ b/microsite/blog/2023-05-06-backstage-deploy-alpha.mdx
@@ -40,7 +40,7 @@ Deploy CLI makes use of [Pulumi](https://www.pulumi.com/docs/) which is an infra
 
 You can find the step-by-step installation documentation for Pulumi under the [Deployment section](https://backstage.io/docs/deployment/backstage-deploy/aws-lightsail).
 
-But we summarize the steps to deploy your POC here. You can invoke the the CLI you can use the following command:
+But we summarize the steps to deploy your POC here. You can invoke the CLI you can use the following command:
 
 ```bash
 $ npx backstage-deploy aws --create-dockerfile
diff --git a/microsite/blog/2024-12-09-kubecon-slc-24.mdx b/microsite/blog/2024-12-09-kubecon-slc-24.mdx
new file mode 100644
index 0000000000..c3fa2f70a8
--- /dev/null
+++ b/microsite/blog/2024-12-09-kubecon-slc-24.mdx
@@ -0,0 +1,201 @@
+---
+# prettier-ignore
+title: "Backstage in Salt Lake City: Highlights from BackstageCon and KubeCon + CloudNativeCon North America 2024"
+author: André Wanlin, Spotify & Camila Loiola, Spotify
+---
+
+![Beaver in front of snowcapped mountains peeking over a banner that reads BackstageCon and KubeCon + CloudNativeCon North America 2024, Salt Lake City](assets/2024-12-09/backstagecon-kubecon-2024-salt-lake-city.png)
+
+**tl;dr:** Salt Lake City did not disappoint! Backstage continues to be at the forefront of many conversations being had at BackstageCon and across KubeCon + CloudNativeCon. If you weren't able to join us, all the [BackstageCon talks][yt] are available for replay on YouTube. Read on for the highlights — plus, photos of super cute pups — as a treat! 🐕
+
+[yt]: https://www.youtube.com/playlist?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+{/* truncate */}
+
+## What everyone was talking about at BackstageCon🦫
+
+![Speakers on stage at BackstageCon North America 2024](assets/2024-12-09/kc24slc-spotify-backstagecon.jpg)
+
+[BackstageCon](https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/co-located-events/backstagecon/) featured a day of talks tailored to the diverse Backstage community. Whether you were an evaluator, adopter, integrator, builder, or an innovator, there was something valuable for everyone. Here were the big themes from the day.
+
+### Evaluating Backstage ROI
+
+- Olivier (Avalia Systems) presented what makes digital portals [helpful to C-level executives][olivier].
+
+- Himanshu (Harness) shared strategies for adopting Backstage in ways that drive [meaningful value for engineers][himanshu].
+
+- Eric (Quantum Metric) explained [how startups can benefit][eric] from what big techies have been contributing to Backstage.
+
+- Tom (Spotify) shared how developer productivity furthers Spotify’s mission to [empower creators][tom] and what the future holds for Backstage.
+
+[olivier]: https://youtu.be/kb3F98fKvaQ?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[himanshu]: https://youtu.be/FACtDHQvNf0?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[eric]: https://youtu.be/9qPsuMSw_dM?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[tom]: https://youtu.be/AU9BwkRMmMY?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+### Sharing Backstage adoption journeys
+
+- A panel discussion — featuring practitioners from Adobe, American Airlines, JPMorgan Chase, Red Hat, and Roku — showcased [real-world adoption stories from large companies][panel], spanning various stages of Backstage usage. Hear how devs at American Airlines can use Scaffolder to get a new site provisioned and deployed on the .aa.com domain in 20 minutes. “I’ve done it in seven,” said Jay Cox, principal engineer. “It used to take a month.”
+
+- Lizzie (Booz Allen Hamilton) explored corporate barriers to Backstage adoption and lessons learned along the way, including how to navigate [cultural tensions][lizzie] and the importance of listening to your devs, in order to bring the latest advancements in developer experience to a government consulting company that’s going on “110 years young”.
+
+- Amber and Daniel (Liatrio) elaborated on why [automated governance][amber] belongs inside Backstage portals to facilitate centralized compliance — so your devs don't get held up from going to prod by unforeseen checks.
+
+[panel]: https://youtu.be/DAjhjS2Xg4Q?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[lizzie]: https://youtu.be/RTYVmMbkdNA?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[amber]: https://youtu.be/GaGbjMJCcRU?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+### Maintaining a Backstage instance
+
+- Djamaile and Mitch (Spotify) provided [actionable tips][djamaile] for managing Backstage instances, including how to keep them aligned with the latest open source features.
+
+- Ashna and Mesut (Booking.com) showed how to customize your instance to mirror your company's unique identity and how to leverage reusability for a [smoother user experience for your devs][ashna].
+
+- Paul (Red Hat) presented a [platform engineer’s POV][paul] of what it means to maintain a Backstage instance.
+
+- Yishai (Linear B) spoke about how to approach software engineering intelligence (SEI) and developer productivity metrics inside Backstage, including [do’s and don’ts][yishai].
+
+[djamaile]: https://youtu.be/dbLqwEVl52U?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[ashna]: https://youtu.be/QV40Yz2i3jQ?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[paul]: https://youtu.be/CtbfN--mJkE?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[yishai]: https://youtu.be/mxVW2AGoI3A?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+### Building with Backstage core features
+
+- Avantika and Emma (Spotify) walked us through the advantages of the new backend system, recommending [best practices for plugin development][tika] and showcasing why migrating to this updated version is an extensibility game changer.
+
+- Will and Ryan (Microsoft) shared how Software Catalog and Templates provide the model to [build visualizations][will] of your cloud native applications.
+
+[tika]: https://youtu.be/n7GUlLHN2tQ?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[will]: https://youtu.be/U2-Lo-yuvdc?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+### AI-powered Backstage plugins and modules
+
+Innovative use cases featuring AI integration took center stage.
+
+- Niall (Amazon Web Services) demonstrated how to [interact with plugin services][niall] using artificial intelligence prompts.
+
+- Ben (Red Hat) outlined [broader AI integrations][ben] to enhance Backstage, sparking exciting possibilities for the future.
+
+The sessions offered a wealth of knowledge and inspiration, underscoring the versatility and potential of Backstage for organizations at every level. The Backstage booth was hopping all day long as community members and cloud natives took advantage of being able to ask the experts questions and learn more about the project.
+
+[niall]: https://youtu.be/DCXzCrIDOAs?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+[ben]: https://youtu.be/cl6E0A5R_nI?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+## Backstage at the big show: KubeCon⎈ + CloudNativeCon☁️
+
+![A view of the crowd entering KubeCon as seen from the top of the convention center escalator](assets/2024-12-09/kc24slc-cncf-entrance.jpg)
+📸 _[See more KubeCon photos from the CNCF’s Flickr album](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/) →_
+
+My friends, what an intense conference!
+
+Over the course of three packed days, there were a bunch of activities, including talks, a kiosk, and a Contribfest, all centered around Backstage.
+
+### Maintainers take the stage
+
+![Backstage maintainers presenting in a ballroom](assets/2024-12-09/kc24slc-spotify-maintainers.jpg)
+
+This may be old hat for those who are regular KubeCon attendees, but it’s still pretty exciting to catch up on all the Backstage updates straight from the core maintainers. Spotify’s Ben Lambert and Patrik Oldsberg were in the spotlight in Ballroom C addressing an attentive crowd of Backstage adopters, users, and fans.
+
+Highlights of their maintainers talk include:
+
+- **Project updates:** Yarn 4 is now the default, the new built-in event bus has arrived, and the (New) Backend System is now 1.0!
+- **Security Audit:** Another security audit has been completed with the helpful support of the CNCF
+- **Scaffolder updates:** Addition of Form Decorators and support for Retries!
+- **New Frontend System:** Focus on the plugin builder experience!
+
+Watch their entire talk — “[How to Expand Your IDP: The New Building Blocks of Backstage](https://youtu.be/BzPCJMQH8tg?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X)” — for all the details.
+
+### Toyota and Akamai in the house
+
+![A packed ballroom with Backstage displayed on two large screens](assets/2024-12-09/kc24slc-cncf-toyota.jpg)
+📸 [CNCF](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/)
+
+There were great talks from Backstage adopters during KubeCon, too. Toyota and Akamai packed the rooms with their Backstage knowledge.
+
+- “[Shifting Gears: Leveraging CNCF Tools to Streamline Operations at Toyota Connected][toyota]”: Benson and Rob talk about failures and successes adopting CNCF tools (including ArgoCD and Backstage) to unify operations, streamline workflows, and enhance cross-team collaboration.
+
+- “[From Chaos to Calm: Building a Unified and Scalable CI/CD Pipeline at Akamai][akamai]”: Tomer dives into development efficiency and how you can “conquer cloud-native deployments by adding the right tools, such as Argo Rollouts and Backstage”.
+
+[toyota]: https://youtu.be/4w_AC81_GZM?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X&t=856
+[akamai]: https://youtu.be/RFVB9CEEn1I?list=PL8iP9yIjU0Q3UUDXdAoCaTC4Ci8asWg-X
+
+### And the award goes to…
+
+![Adobe accepts the CNCF Top End User Award on the Keynote stage at KubeCon + CloudNativeCon North America 2024](assets/2024-12-09/kc24slc-cncf-adobe.jpg)
+
+📸 [CNCF](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/)
+
+Adobe gave a shoutout to Backstage from the Keynote mainstage on Thursday morning when they (spoiler alert) [accepted the CNCF’s Top End User Award][keynote], thanking the cloud native community and all the projects that they use.
+
+But Adobe isn’t just a Backstage adopter, they are a model citizen — giving back to the community through their example, having “developed a reference architecture for its IDP, built using Argo, Backstage, Helm, and Kubernetes, which other organizations can use as a template for designing and implementing their systems”.
+
+As Taylor Dolezal, head of ecosystem at the CNCF, [says][announcement]: “Their commitment to nurturing technological excellence and developer experience exemplifies what we hope to see in the end user ecosystem. It’s not just about tool adoption or code contributions — it’s about synthesizing these learnings into assets that empower others in their cloud native journeys.”
+
+Way to go, Adobe!
+
+[keynote]: https://youtu.be/p7J0lAU3AWo
+[announcement]: https://www.cncf.io/announcements/2024/11/14/cncf-presents-top-end-user-award-to-adobe/
+
+### A bustling CNCF project pavilion
+
+![A volunteer wearing an “Ask me about Backstage” T-shirt talks to a visitor at the project kiosk](assets/2024-12-09/kc24slc-cncf-kiosk.jpg)
+
+📸 [CNCF](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/)
+
+The CNCF Projects Pavilion was buzzing with activity all week, and the Backstage kiosk was a hub of excitement. Attendees stopped by with a mix of curiosity and enthusiasm, sparking conversations that highlighted the dynamic nature of our community.
+
+Curious visitors asked, “What is Backstage all about?”, while adopters sought personalized advice on customizing Backstage for their specific company needs. Contributors dropped in to say, “Hey, you reviewed my pull request!” And professionals proudly shared their achievements as Backstage experts — in fact, now there’s a way to make that expertise official — by becoming a [Certified Backstage Associate (CBA)](https://training.linuxfoundation.org/blog/just-launched-certified-backstage-associate-cba/), a new certification that was just launched by the CNCF and The Linux Foundation.
+
+Developers eager to give back to the community came to learn how to start contributing, and some of the kindest Backstage fans simply stopped by to say, “Thank you”. Their gratitude and encouragement are a powerful reminder of why we do what we do.
+
+Every interaction in person made the day special, and we wrapped up with a deep sense of fulfillment and pride in how far Backstage has come. Here's to building an even brighter future together!
+
+## Contribfest! It’s All About Community👩‍💻
+
+![Various developers and their laptops participating in the Backstage Contribfest](assets/2024-12-09/kc24slc-spotify-cncf-contribfest.gif)
+
+📸 Spotify, [CNCF](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/)
+
+On Thursday, the first-ever Backstage Contribfest session took place — hosted by Yi Cai and Paul Schultz from Red Hat, and André Wanlin, Patrik Oldsberg, and Ben Lambert from Spotify.
+
+Participants who hadn't yet used or contributed to Backstage eagerly joined the project's contributors community and were eager to help. Together with the group, experienced Backstage engineers stepped in to assist attendees — whether troubleshooting environment setup or explaining how specific framework and plugin features are implemented. It was a great example of a community coming together to support learning and contribution.
+
+The energy in the room, with 60 enthusiastic participants, was absolutely electric! It was amazing to see ideas bouncing around, impromptu collaboration happening at every corner, and a shared passion for advancing the Backstage project.
+
+Among the great contributions to come out of this event are:
+
+- [Add Pagination to Tech Docs Table](https://github.com/backstage/backstage/pull/27694)
+- [Add Home Page Quick Start Card](https://github.com/backstage/backstage/pull/27705)
+- [Truncate commit message to first newline](https://github.com/backstage/community-plugins/pull/2012)
+
+A heartfelt thank you to everyone who joined us — it’s your talent and collaborative spirit that truly define the Backstage community. This event was a powerful reminder that it’s the people behind the project who make Backstage what it is today 💚.
+
+And if you missed out on the fun, it's never too late to join the Backstage community. Just follow along with the [Contribfest slide deck](https://static.sched.com/hosted_files/kccncna2024/53/KubeCon-ContribFest-Backstage-NA-2024.pdf) to get started with contributing!
+
+## Bonus pups!🐕
+
+Nothing improves developer experience like hanging out with some fluffy friends. So please enjoy these photos from KubeCon’s “[Pet A Pup](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/with/54155382123)” station.
+
+(All 📸 [CNCF](https://www.flickr.com/photos/143247548@N03/albums/72177720321905538/with/54155382123). Please note: the last pup is not a pup.)
+
+![A labrador retriever pup in the middle of three people calmly getting pets](assets/2024-12-09/kc24slc-cncf-bestpup1.jpg)
+The best labrador-retriever pup graciously accepting pets from the cloud native community.
+
+![A fluffy white pup staring at the camera surrounded by attendees](assets/2024-12-09/kc24slc-cncf-bestpup2.jpg)
+The best fluffy white pup surrounded by admirers.
+
+![A lanky racing pup getting pet on the face](assets/2024-12-09/kc24slc-cncf-bestpup3.jpg)
+The best racing-style pup getting face scritches.
+
+![A yellow pup squinting while getting pets from an attendee in a yellow shirt](assets/2024-12-09/kc24slc-cncf-bestpup4.jpg)
+The best yellow pup getting pets from his twinsie.
+
+![A fluffy cat getting pets.](assets/2024-12-09/kc24slc-cncf-bestpup5.jpg)
+See? Not a pup. But did get pets.
+
+[You, too, can give these pups some love](https://www.therapyanimalsutah.org).
+
+## Cheerio! We’ll see you in London!💂
+
+And that’s a wrap on Salt Lake City! [Join us in London](https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/) in April for more community-building fun at BackstageCon and KubeCon + CloudNativeCon Europe 2025!
diff --git a/microsite/blog/assets/2024-12-09/backstagecon-kubecon-2024-salt-lake-city.png b/microsite/blog/assets/2024-12-09/backstagecon-kubecon-2024-salt-lake-city.png
new file mode 100644
index 0000000000..518d71fc36
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/backstagecon-kubecon-2024-salt-lake-city.png differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-adobe.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-adobe.jpg
new file mode 100644
index 0000000000..c428da1c1b
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-adobe.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup1.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup1.jpg
new file mode 100644
index 0000000000..919a16108d
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup1.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup2.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup2.jpg
new file mode 100644
index 0000000000..b169eaa52c
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup2.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup3.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup3.jpg
new file mode 100644
index 0000000000..a46e320a97
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup3.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup4.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup4.jpg
new file mode 100644
index 0000000000..7fa4a405e0
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup4.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup5.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup5.jpg
new file mode 100644
index 0000000000..8847adb161
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-bestpup5.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-entrance.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-entrance.jpg
new file mode 100644
index 0000000000..5ec34ddf60
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-entrance.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-kiosk.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-kiosk.jpg
new file mode 100644
index 0000000000..a25c55a6b3
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-kiosk.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-cncf-toyota.jpg b/microsite/blog/assets/2024-12-09/kc24slc-cncf-toyota.jpg
new file mode 100644
index 0000000000..2727992735
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-cncf-toyota.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-spotify-backstagecon.jpg b/microsite/blog/assets/2024-12-09/kc24slc-spotify-backstagecon.jpg
new file mode 100644
index 0000000000..579e12cad9
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-spotify-backstagecon.jpg differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-spotify-cncf-contribfest.gif b/microsite/blog/assets/2024-12-09/kc24slc-spotify-cncf-contribfest.gif
new file mode 100644
index 0000000000..1a89c6586c
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-spotify-cncf-contribfest.gif differ
diff --git a/microsite/blog/assets/2024-12-09/kc24slc-spotify-maintainers.jpg b/microsite/blog/assets/2024-12-09/kc24slc-spotify-maintainers.jpg
new file mode 100644
index 0000000000..8a657886b0
Binary files /dev/null and b/microsite/blog/assets/2024-12-09/kc24slc-spotify-maintainers.jpg differ
diff --git a/microsite/data/plugins/catalog-webhook.yaml b/microsite/data/plugins/catalog-webhook.yaml
new file mode 100644
index 0000000000..5c72cdd605
--- /dev/null
+++ b/microsite/data/plugins/catalog-webhook.yaml
@@ -0,0 +1,10 @@
+---
+title: Catalog Webhook
+author: Forged Apps
+authorUrl: https://forgedapps.com
+category: Catalog
+description: Send catalog entity changes to a remote endpoint to keep an external system in sync with Backstage.
+documentation: https://github.com/ForgedApps/backstage-catalog-webhook-plugin/blob/main/README.md
+iconUrl: /img/forgedapps.jpg
+npmPackageName: '@forgedapps/backstage-catalog-webhook-plugin'
+addedDate: '2024-10-28'
diff --git a/microsite/data/plugins/changelog.yaml b/microsite/data/plugins/changelog.yaml
deleted file mode 100644
index a1ee12feea..0000000000
--- a/microsite/data/plugins/changelog.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Changelog viewer
-author: RSC Labs
-authorUrl: https://rsoftcon.com/
-category: Discovery
-description: View changelogs for your components in Backstage. Built-in support of "Keep the changelog" and "Semver" formats.
-documentation: https://github.com/RSC-Labs/backstage-changelog-plugin/blob/main/README.md
-iconUrl: https://raw.githubusercontent.com/RSC-Labs/backstage-changelog-plugin/main/docs/plugin_icon.png
-npmPackageName: '@rsc-labs/backstage-changelog-plugin'
-tags:
-  - changelog
-addedDate: '2023-10-22'
diff --git a/microsite/data/plugins/daytona.yaml b/microsite/data/plugins/daytona.yaml
new file mode 100644
index 0000000000..cf3baaaa92
--- /dev/null
+++ b/microsite/data/plugins/daytona.yaml
@@ -0,0 +1,14 @@
+---
+title: Daytona
+author: Daytona
+authorUrl: https://www.daytona.io/
+category: Development
+description: Open Source Development Environment Manager
+documentation: https://github.com/daytonaio/backstage-plugins/tree/main/plugins/daytona
+iconUrl: /img/daytona.svg
+npmPackageName: '@daytonaio/backstage-plugin-daytona'
+tags:
+  - Development
+  - Tools
+  - Productivity
+addedDate: '2024-11-02'
diff --git a/microsite/data/plugins/dora-metrics.yaml b/microsite/data/plugins/dora-metrics.yaml
new file mode 100644
index 0000000000..1831c7488f
--- /dev/null
+++ b/microsite/data/plugins/dora-metrics.yaml
@@ -0,0 +1,10 @@
+---
+title: Liatrio DORA Metrics
+author: Liatrio
+authorUrl: https://github.com/liatrio
+category: Observability
+description: Provide a seamless way to display DORA Metrics in your developer portals.
+documentation: https://github.com/liatrio/backstage-dora-plugin/tree/main
+iconUrl: /img/liatrio-icon.png
+npmPackageName: '@liatrio/backstage-dora-plugin'
+addedDate: '2024-10-14'
diff --git a/microsite/data/plugins/highlights.yaml b/microsite/data/plugins/highlights.yaml
deleted file mode 100644
index 82d303f4ed..0000000000
--- a/microsite/data/plugins/highlights.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Highlights
-author: RSC Labs
-authorUrl: https://rsoftcon.com/
-category: Discovery
-description: Highlight what is important for you and put it on front for the quick view and access. Built-in support of Git information from GitHub and GitLab.
-documentation: https://github.com/RSC-Labs/backstage-highlights-plugin/blob/main/README.md
-iconUrl: https://raw.githubusercontent.com/RSC-Labs/backstage-highlights-plugin/main/docs/highlighter.png
-npmPackageName: '@rsc-labs/backstage-highlights-plugin'
-tags:
-  - highlights
-addedDate: '2023-11-20'
diff --git a/microsite/data/plugins/mend.yaml b/microsite/data/plugins/mend.yaml
new file mode 100644
index 0000000000..8c18c6b71f
--- /dev/null
+++ b/microsite/data/plugins/mend.yaml
@@ -0,0 +1,12 @@
+---
+title: Mend.io
+author: Mend.io
+authorUrl: https://www.mend.io/
+category: Security
+description: Proactive application risk management for developer and security teams directly in Backstage
+documentation: https://github.com/backstage/community-plugins/tree/main/workspaces/mend/plugins/mend
+iconUrl: https://avatars.githubusercontent.com/u/105765982?s=200&v=4
+npmPackageName: '@backstage-community/plugin-mend'
+tags:
+  - security
+addedDate: '2024-10-15'
diff --git a/microsite/data/plugins/npm.yaml b/microsite/data/plugins/npm.yaml
new file mode 100644
index 0000000000..67f3de976f
--- /dev/null
+++ b/microsite/data/plugins/npm.yaml
@@ -0,0 +1,9 @@
+---
+title: NPM
+author: Christoph Jerolimov
+authorUrl: https://github.com/christoph-jerolimov
+category: Artifacts
+description: A plugin that shows meta info and latest versions from a npm registry.
+documentation: https://github.com/backstage/community-plugins/blob/main/workspaces/npm/plugins/npm/README.md
+npmPackageName: '@backstage-community/plugin-npm'
+addedDate: '2024-11-29'
diff --git a/microsite/data/plugins/synergy.yaml b/microsite/data/plugins/synergy.yaml
new file mode 100644
index 0000000000..6c5e722322
--- /dev/null
+++ b/microsite/data/plugins/synergy.yaml
@@ -0,0 +1,10 @@
+---
+title: Synergy
+author: Jitesh Yadav
+authorUrl: https://github.com/jiteshy
+category: Collaboration
+description: An inner-source dashboard for managing in-house open-source projects, issues, and attracting maintainers to foster collaboration."
+documentation: https://github.com/jiteshy/backstage-plugin-synergy/blob/main/README.md
+iconUrl: /img/synergy-logo.png
+npmPackageName: '@jiteshy/backstage-plugin-synergy'
+addedDate: '2024-12-03'
diff --git a/microsite/package.json b/microsite/package.json
index fc3405c744..e3b0388903 100644
--- a/microsite/package.json
+++ b/microsite/package.json
@@ -17,7 +17,7 @@
     "version": "docusaurus-version",
     "write-translations": "docusaurus-write-translations"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "dependencies": {
     "@docusaurus/core": "^3.1.1",
     "@docusaurus/plugin-client-redirects": "^3.1.1",
@@ -38,7 +38,6 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^3.1.1",
     "@docusaurus/tsconfig": "^3.1.1",
-    "@spotify/prettier-config": "^15.0.0",
     "@types/luxon": "^3.0.0",
     "@types/webpack-env": "^1.18.0",
     "js-yaml": "^4.1.0",
diff --git a/microsite/sidebars.js b/microsite/sidebars.js
index 871cec0a0f..2647143065 100644
--- a/microsite/sidebars.js
+++ b/microsite/sidebars.js
@@ -27,6 +27,16 @@ module.exports = {
           'getting-started/homepage',
         ],
       },
+      {
+        type: 'category',
+        label: 'Deploying Backstage',
+        items: [
+          'deployment/index',
+          'deployment/scaling',
+          'deployment/docker',
+          'deployment/k8s',
+        ],
+      },
       {
         type: 'category',
         label: 'Using Backstage',
@@ -37,7 +47,6 @@ module.exports = {
         ],
       },
       'getting-started/keeping-backstage-updated',
-      'getting-started/concepts',
     ],
     'Core Features': [
       {
@@ -92,6 +101,7 @@ module.exports = {
           'features/software-templates/migrating-to-rjsf-v5',
           'features/software-templates/migrating-from-v1beta2-to-v1beta3',
           'features/software-templates/dry-run-testing',
+          'features/software-templates/experimental',
         ],
       },
       {
@@ -138,6 +148,14 @@ module.exports = {
           'integrations/aws-s3/discovery',
         ],
       },
+      {
+        type: 'category',
+        label: 'Azure Blob Storage',
+        items: [
+          'integrations/azure-blobStorage/locations',
+          'integrations/azure-blobStorage/discovery',
+        ],
+      },
       {
         type: 'category',
         label: 'Azure',
@@ -341,20 +359,6 @@ module.exports = {
       },
       'tooling/package-metadata',
     ],
-    Deployment: [
-      'deployment/index',
-      'deployment/scaling',
-      'deployment/docker',
-      'deployment/k8s',
-      'deployment/heroku',
-      'deployment/koyeb',
-      'deployment/flightcontrol',
-      {
-        type: 'category',
-        label: 'Using Backstage Deploy (alpha)',
-        items: ['deployment/backstage-deploy/aws-lightsail'],
-      },
-    ],
     'New Backend System': [
       'backend-system/index',
       {
diff --git a/microsite/src/pages/plugins/_pluginCard.tsx b/microsite/src/pages/plugins/_pluginCard.tsx
index ba8e8069d2..ba7864f9aa 100644
--- a/microsite/src/pages/plugins/_pluginCard.tsx
+++ b/microsite/src/pages/plugins/_pluginCard.tsx
@@ -9,14 +9,14 @@ export interface IPluginData {
   category: string;
   description: string;
   documentation: string;
-  iconUrl: string;
+  iconUrl?: string;
   title: string;
   addedDate: string;
   isNew: boolean;
   order?: number;
 }
 
-const defaultIconUrl = 'img/logo-gradient-on-dark.svg';
+const defaultIconUrl = '/img/logo-gradient-on-dark.svg';
 
 export const PluginCard = ({
   author,
diff --git a/microsite/static/img/daytona.svg b/microsite/static/img/daytona.svg
new file mode 100644
index 0000000000..1920b2f878
--- /dev/null
+++ b/microsite/static/img/daytona.svg
@@ -0,0 +1,62 @@
+<svg
+  width="24"
+  height="24"
+  viewBox="0 0 211 220"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <rect
+    x="11.1428"
+    y="149.025"
+    width="76.2474"
+    height="26.1421"
+    fill="currentColor"
+  />
+  <rect
+    x="113.522"
+    y="57.5287"
+    width="87.1399"
+    height="26.1421"
+    fill="currentColor"
+  />
+  <rect
+    width="91.4971"
+    height="26.142"
+    transform="matrix(0.707105 -0.707108 0.707105 0.707108 67.7737 65.5858)"
+    fill="currentColor"
+  />
+  <rect
+    width="70.2691"
+    height="26.142"
+    transform="matrix(-0.707105 -0.707108 -0.707105 0.707108 68.1729 130.941)"
+    fill="currentColor"
+  />
+  <rect
+    width="74.0691"
+    height="26.142"
+    transform="matrix(-0.707105 0.707108 -0.707105 -0.707108 133.532 167.511)"
+    fill="currentColor"
+  />
+  <rect
+    width="82.7831"
+    height="26.142"
+    transform="matrix(0.707105 0.707108 0.707105 -0.707108 133.133 102.156)"
+    fill="currentColor"
+  />
+  <rect
+    x="67.7737"
+    y="37.9226"
+    width="63.1767"
+    height="26.142"
+    transform="rotate(90 67.7737 37.9226)"
+    fill="currentColor"
+  />
+  <rect
+    x="159.278"
+    y="129.419"
+    width="78.4262"
+    height="26.142"
+    transform="rotate(90 159.278 129.419)"
+    fill="currentColor"
+  />
+</svg>
diff --git a/microsite/static/img/forgedapps.jpg b/microsite/static/img/forgedapps.jpg
new file mode 100644
index 0000000000..67b088c629
Binary files /dev/null and b/microsite/static/img/forgedapps.jpg differ
diff --git a/microsite/static/img/liatrio-icon.png b/microsite/static/img/liatrio-icon.png
new file mode 100644
index 0000000000..775a5f6e6d
Binary files /dev/null and b/microsite/static/img/liatrio-icon.png differ
diff --git a/microsite/static/img/synergy-logo.png b/microsite/static/img/synergy-logo.png
new file mode 100644
index 0000000000..42eb59c704
Binary files /dev/null and b/microsite/static/img/synergy-logo.png differ
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 510f30c094..6197b0463e 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2403,14 +2403,14 @@ __metadata:
   linkType: hard
 
 "@mdx-js/react@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@mdx-js/react@npm:3.0.1"
+  version: 3.1.0
+  resolution: "@mdx-js/react@npm:3.1.0"
   dependencies:
     "@types/mdx": ^2.0.0
   peerDependencies:
     "@types/react": ">=16"
     react: ">=16"
-  checksum: 1063a597264f6a8840aa13274a99beef8983a88dd45b0c5b8e48e6216bc23d33e247da8e2d95d6e1874483f8b4e0903b166ce5046874aa7ffa2b1333057dcddf
+  checksum: c5a9c495f43f498ece24a768762a1743abe2be33d050d7eab731beb754e631700547f039198c6262c998d9a443906bd78811c3fa38bc2fb37659848161dac331
   languageName: node
   linkType: hard
 
@@ -2684,15 +2684,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spotify/prettier-config@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@spotify/prettier-config@npm:15.0.0"
-  peerDependencies:
-    prettier: 2.x
-  checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44
-  languageName: node
-  linkType: hard
-
 "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0":
   version: 8.0.0
   resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0"
@@ -2849,92 +2840,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-darwin-arm64@npm:1.7.36"
+"@swc/core-darwin-arm64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-darwin-arm64@npm:1.9.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-darwin-x64@npm:1.7.36"
+"@swc/core-darwin-x64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-darwin-x64@npm:1.9.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.36"
+"@swc/core-linux-arm-gnueabihf@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.9.3"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.36"
+"@swc/core-linux-arm64-gnu@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.9.3"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.36"
+"@swc/core-linux-arm64-musl@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm64-musl@npm:1.9.3"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.36"
+"@swc/core-linux-x64-gnu@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-x64-gnu@npm:1.9.3"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.36"
+"@swc/core-linux-x64-musl@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-x64-musl@npm:1.9.3"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.36"
+"@swc/core-win32-arm64-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.36"
+"@swc/core-win32-ia32-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.36"
+"@swc/core-win32-x64-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-x64-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.46":
-  version: 1.7.36
-  resolution: "@swc/core@npm:1.7.36"
+  version: 1.9.3
+  resolution: "@swc/core@npm:1.9.3"
   dependencies:
-    "@swc/core-darwin-arm64": 1.7.36
-    "@swc/core-darwin-x64": 1.7.36
-    "@swc/core-linux-arm-gnueabihf": 1.7.36
-    "@swc/core-linux-arm64-gnu": 1.7.36
-    "@swc/core-linux-arm64-musl": 1.7.36
-    "@swc/core-linux-x64-gnu": 1.7.36
-    "@swc/core-linux-x64-musl": 1.7.36
-    "@swc/core-win32-arm64-msvc": 1.7.36
-    "@swc/core-win32-ia32-msvc": 1.7.36
-    "@swc/core-win32-x64-msvc": 1.7.36
+    "@swc/core-darwin-arm64": 1.9.3
+    "@swc/core-darwin-x64": 1.9.3
+    "@swc/core-linux-arm-gnueabihf": 1.9.3
+    "@swc/core-linux-arm64-gnu": 1.9.3
+    "@swc/core-linux-arm64-musl": 1.9.3
+    "@swc/core-linux-x64-gnu": 1.9.3
+    "@swc/core-linux-x64-musl": 1.9.3
+    "@swc/core-win32-arm64-msvc": 1.9.3
+    "@swc/core-win32-ia32-msvc": 1.9.3
+    "@swc/core-win32-x64-msvc": 1.9.3
     "@swc/counter": ^0.1.3
-    "@swc/types": ^0.1.13
+    "@swc/types": ^0.1.17
   peerDependencies:
     "@swc/helpers": "*"
   dependenciesMeta:
@@ -2961,7 +2952,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 848531930b7d179b2bb9ba38e0d39dd127d66b16cc5c9ee9ec318fd50156ada18bc1368f2d02e0ba745b8f43eec0f695eaf89b6a9f8e52a239c5ab3e4b07ee27
+  checksum: 4d83aee0b4d9c543f247d680796e5b9cb69997369dcd81642c2603e185312dfb1674328a7ceb1d352c21275155a71789f76dafe8853055d076b6241d5760bbed
   languageName: node
   linkType: hard
 
@@ -2972,12 +2963,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.13":
-  version: 0.1.13
-  resolution: "@swc/types@npm:0.1.13"
+"@swc/types@npm:^0.1.17":
+  version: 0.1.17
+  resolution: "@swc/types@npm:0.1.17"
   dependencies:
     "@swc/counter": ^0.1.3
-  checksum: 4d9ef0fba20e410bee38b20b60eeb284a1284c1cf6b5f84754b6f5e467e5e0621e2db67dc31e22c524a8d63f36d0a1d530126cd97752a85f140d91bf53553e01
+  checksum: 6cc87b8ddfb540096abdf40bc29742df0b7d068f97c1ce6c32cd1b7073cde263ed7bc3bae1fba7bf0e1a0f5d63336e9fa092e05a54f6d9b3570df956d2acaff6
   languageName: node
   linkType: hard
 
@@ -4008,7 +3999,6 @@ __metadata:
     "@docusaurus/tsconfig": ^3.1.1
     "@docusaurus/types": ^3.1.1
     "@mdx-js/react": ^3.0.0
-    "@spotify/prettier-config": ^15.0.0
     "@swc/core": ^1.3.46
     "@types/luxon": ^3.0.0
     "@types/webpack-env": ^1.18.0
@@ -4831,13 +4821,13 @@ __metadata:
   linkType: hard
 
 "cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+  version: 7.0.6
+  resolution: "cross-spawn@npm:7.0.6"
   dependencies:
     path-key: ^3.1.0
     shebang-command: ^2.0.0
     which: ^2.0.1
-  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
+  checksum: 8d306efacaf6f3f60e0224c287664093fa9185680b2d195852ba9a863f85d02dcc737094c6e512175f8ee0161f9b87c73c6826034c2422e39de7d6569cf4503b
   languageName: node
   linkType: hard
 
@@ -6776,8 +6766,8 @@ __metadata:
   linkType: hard
 
 "http-proxy-middleware@npm:^2.0.3":
-  version: 2.0.6
-  resolution: "http-proxy-middleware@npm:2.0.6"
+  version: 2.0.7
+  resolution: "http-proxy-middleware@npm:2.0.7"
   dependencies:
     "@types/http-proxy": ^1.17.8
     http-proxy: ^1.18.1
@@ -6789,7 +6779,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/express":
       optional: true
-  checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a
+  checksum: 18caa21145917aa1054740353916e8f03f5a3a93bede9106f1f44d84f7b174df17af1c72bf5fade5cc440c2058ee813f47cbb2bdd6ae6874af1cf33e0ac575f3
   languageName: node
   linkType: hard
 
@@ -6892,10 +6882,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutable@npm:^4.0.0":
-  version: 4.2.2
-  resolution: "immutable@npm:4.2.2"
-  checksum: 4d6437ea9388fe8ceca7eed5c768cf438cda7fa14d2831b87b90aa00cc60d536964d107c255b8a2e5dbf4f44a0e1295afbb9d1f0a65fb4f57b936e71df601862
+"immutable@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "immutable@npm:5.0.2"
+  checksum: 4adbd70580c78fafa7e367473e4f307f78f6768372ef464d45ba55f670b7f61d92c71461da571d80011544b61416d3dee0132736d9b592f33dcfa86e43bdd8f1
   languageName: node
   linkType: hard
 
@@ -10663,16 +10653,19 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.57.1":
-  version: 1.80.2
-  resolution: "sass@npm:1.80.2"
+  version: 1.81.0
+  resolution: "sass@npm:1.81.0"
   dependencies:
     "@parcel/watcher": ^2.4.1
     chokidar: ^4.0.0
-    immutable: ^4.0.0
+    immutable: ^5.0.2
     source-map-js: ">=0.6.2 <2.0.0"
+  dependenciesMeta:
+    "@parcel/watcher":
+      optional: true
   bin:
     sass: sass.js
-  checksum: a2dfb2ce4ff961470ff015c1a0b01b961665f33883cd83b9b27c18031d74c8ecbc8ae602a0a517439effbc8a284d95c5be5b20c14f435946a09d7a30e32292c4
+  checksum: 93db5b342c3b0449af2b08123ed4c0793643bd3a30f78e4e0686a1aa991ad640e0d9bc8da09aa5d7ff313bbd317b3be9c827cca60fb33b07d9f4b14b001eccfe
   languageName: node
   linkType: hard
 
diff --git a/mkdocs.yml b/mkdocs.yml
index aa545111d4..748cdd8232 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -5,6 +5,9 @@ edit_uri: edit/master/docs
 
 plugins:
   - techdocs-core
+  - redirects:
+      redirect_maps:
+        'index.md': 'overview/what-is-backstage.md'
 
 # For sidebar navigation on https://backstage.io/, see `microsite/sidebars.js`
 nav:
@@ -27,12 +30,16 @@ nav:
           - Configuring App with plugins: 'getting-started/configure-app-with-plugins.md'
           - Customize the look-and-feel of your App: 'getting-started/app-custom-theme.md'
           - Customizing your Homepage: 'getting-started/homepage.md'
+      - Deployment:
+          - Deploying Backstage: 'deployment/index.md'
+          - Scaling: 'deployment/scaling.md'
+          - Docker: 'deployment/docker.md'
+          - Kubernetes: 'deployment/k8s.md'
       - Using Backstage:
           - Logging in: 'getting-started/logging-in.md'
           - Register a component: 'getting-started/register-a-component.md'
           - Create a component: 'getting-started/create-a-component.md'
       - Keeping Backstage Updated: 'getting-started/keeping-backstage-updated.md'
-      - Key Concepts: 'getting-started/concepts.md'
   - Core Features:
       - Software Catalog:
           - Overview: 'features/software-catalog/index.md'
@@ -186,13 +193,6 @@ nav:
           - Debugging Backstage: 'tooling/local-dev/debugging.md'
           - Profiling Backstage: 'tooling/local-dev/profiling.md'
       - Package Metadata: 'tooling/package-metadata.md'
-  - Deployment:
-      - Deploying Backstage: 'deployment/index.md'
-      - Scaling: 'deployment/scaling.md'
-      - Docker: 'deployment/docker.md'
-      - Kubernetes: 'deployment/k8s.md'
-      - Heroku: 'deployment/heroku.md'
-      - Koyeb: 'deployment/koyeb.md'
   - Designing for Backstage:
       - Design: 'dls/design.md'
       - Component Design Guidelines: 'dls/component-design-guidelines.md'
@@ -227,6 +227,7 @@ nav:
       - ADR011 - Plugin Package Structure: 'architecture-decisions/adr011-plugin-package-structure.md'
       - ADR012 - Use Luxon Locale: 'architecture-decisions/adr012-use-luxon-locale-and-date-presets.md'
       - ADR013 - Use node-fetch: 'architecture-decisions/adr013-use-node-fetch.md'
+      - ADR014 - Use fetch: 'architecture-decisions/adr014-use-fetch.md'
   - FAQ:
       - Overview: 'faq/index.md'
       - Product FAQ: 'faq/product.md'
diff --git a/package.json b/package.json
index c574e37ffa..9c4a772ebc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "1.32.0",
+  "version": "1.34.0-next.2",
   "private": true,
   "repository": {
     "type": "git",
@@ -49,9 +49,9 @@
     "storybook": "yarn ./storybook run storybook",
     "techdocs-cli": "node scripts/techdocs-cli.js",
     "techdocs-cli:dev": "cross-env TECHDOCS_CLI_DEV_MODE=true node scripts/techdocs-cli.js",
-    "test": "backstage-cli repo test",
-    "test:all": "backstage-cli repo test --coverage",
-    "test:e2e": "playwright test",
+    "test": "NODE_OPTIONS=--no-node-snapshot backstage-cli repo test",
+    "test:all": "NODE_OPTIONS=--no-node-snapshot backstage-cli repo test --coverage",
+    "test:e2e": "NODE_OPTIONS=--no-node-snapshot playwright test",
     "tsc": "tsc",
     "tsc:full": "backstage-cli repo clean && tsc --skipLibCheck false --incremental false"
   },
@@ -83,7 +83,7 @@
       "node ./scripts/verify-lockfile-duplicates --fix"
     ]
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "resolutions": {
     "@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch",
     "@material-ui/pickers@^3.2.10": "patch:@material-ui/pickers@npm%3A3.3.11#./.yarn/patches/@material-ui-pickers-npm-3.3.11-1c8f68ea20.patch",
@@ -108,9 +108,10 @@
     "@octokit/rest": "^19.0.3",
     "@playwright/test": "^1.32.3",
     "@spotify/eslint-plugin": "^15.0.0",
-    "@spotify/prettier-config": "^15.0.0",
     "@techdocs/cli": "workspace:*",
-    "@types/node": "^18.17.8",
+    "@types/cacheable-request": "^8.3.6",
+    "@types/memjs": "^1.3.3",
+    "@types/node": "^20.16.0",
     "@types/webpack": "^5.28.0",
     "array-to-table": "^1.0.1",
     "command-exists": "^1.2.9",
@@ -138,6 +139,6 @@
   },
   "packageManager": "yarn@3.8.1",
   "engines": {
-    "node": "18 || 20"
+    "node": "20 || 22"
   }
 }
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index c232018c20..660d8d4ebb 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/app-defaults
 
+## 1.5.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 1.5.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.5.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.5.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.5.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.5.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 1.5.12
 
 ### Patch Changes
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index 72c09d292d..1a0c1f0d74 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/app-defaults",
-  "version": "1.5.12",
+  "version": "1.5.15-next.2",
   "description": "Provides the default wiring of a Backstage App",
   "backstage": {
     "role": "web-library"
diff --git a/packages/app-defaults/src/createApp.tsx b/packages/app-defaults/src/createApp.tsx
index 6cac337d22..1d400aff7a 100644
--- a/packages/app-defaults/src/createApp.tsx
+++ b/packages/app-defaults/src/createApp.tsx
@@ -86,7 +86,7 @@ export type OptionalAppOptions = {
   /**
    * A set of components to override the default components with.
    *
-   * The override is applied for each icon individually.
+   * The override is applied for each app component individually.
    *
    * @public
    */
diff --git a/packages/app-next-example-plugin/CHANGELOG.md b/packages/app-next-example-plugin/CHANGELOG.md
index 489b8b5944..0ff4bde808 100644
--- a/packages/app-next-example-plugin/CHANGELOG.md
+++ b/packages/app-next-example-plugin/CHANGELOG.md
@@ -1,5 +1,61 @@
 # app-next-example-plugin
 
+## 0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## 0.0.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## 0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/frontend-plugin-api@0.9.1
+
+## 0.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+
+## 0.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## 0.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+
 ## 0.0.16
 
 ### Patch Changes
diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json
index 854a380b9b..acbe3831c4 100644
--- a/packages/app-next-example-plugin/package.json
+++ b/packages/app-next-example-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-next-example-plugin",
-  "version": "0.0.16",
+  "version": "0.0.18-next.2",
   "description": "Backstage internal example plugin",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/packages/app-next/CHANGELOG.md b/packages/app-next/CHANGELOG.md
index 6d499212be..354ae53a70 100644
--- a/packages/app-next/CHANGELOG.md
+++ b/packages/app-next/CHANGELOG.md
@@ -1,5 +1,365 @@
 # example-app-next
 
+## 0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-notifications@0.5.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/plugin-scaffolder@1.27.2-next.2
+  - @backstage/plugin-api-docs@0.12.2-next.2
+  - @backstage/plugin-catalog-graph@0.4.14-next.2
+  - @backstage/plugin-catalog-import@0.12.8-next.2
+  - @backstage/plugin-org@0.6.34-next.2
+  - @backstage/plugin-user-settings@0.8.17-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-defaults@0.1.4-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-app@0.1.4-next.2
+  - @backstage/plugin-app-visualizer@0.1.14-next.2
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.2
+  - @backstage/plugin-home@0.8.3-next.2
+  - @backstage/plugin-kubernetes@0.12.2-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.2
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-search@1.4.21-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-signals@0.0.14-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 0.0.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.8.3-next.1
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-api-docs@0.12.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.1
+  - @backstage/plugin-catalog-import@0.12.8-next.1
+  - @backstage/plugin-kubernetes@0.12.2-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.1
+  - @backstage/plugin-org@0.6.34-next.1
+  - @backstage/plugin-scaffolder@1.27.2-next.1
+  - @backstage/plugin-search@1.4.21-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/plugin-user-settings@0.8.17-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-defaults@0.1.4-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-app@0.1.4-next.1
+  - @backstage/plugin-app-visualizer@0.1.14-next.1
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.1
+  - @backstage/plugin-notifications@0.4.2-next.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-signals@0.0.14-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-scaffolder@1.27.2-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-search@1.4.21-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/plugin-home@0.8.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-api-docs@0.12.2-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/frontend-defaults@0.1.4-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-app-visualizer@0.1.14-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.0
+  - @backstage/plugin-catalog-import@0.12.8-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.0
+  - @backstage/plugin-kubernetes@0.12.2-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.0
+  - @backstage/plugin-notifications@0.4.2-next.0
+  - @backstage/plugin-org@0.6.34-next.0
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-signals@0.0.14-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+  - @backstage/plugin-user-settings@0.8.17-next.0
+
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-api-docs@0.12.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-notifications@0.4.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-search@1.4.19
+  - @backstage/plugin-org@0.6.32
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder@1.27.0
+  - @backstage/plugin-catalog-import@0.12.6
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes@0.12.0
+  - @backstage/plugin-home@0.8.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/plugin-app-visualizer@0.1.12
+  - @backstage/core-app-api@1.15.2
+  - @backstage/frontend-defaults@0.1.2
+  - @backstage/plugin-signals@0.0.12
+  - @backstage/plugin-kubernetes-cluster@0.0.18
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-app@0.1.2
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.12
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17
+  - @backstage/plugin-user-settings@0.8.15
+
+## 0.0.17-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-search@1.4.19-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/plugin-scaffolder@1.27.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/plugin-api-docs@0.11.12-next.3
+  - @backstage/plugin-catalog-graph@0.4.12-next.3
+  - @backstage/plugin-catalog-import@0.12.6-next.3
+  - @backstage/plugin-org@0.6.32-next.3
+  - @backstage/plugin-user-settings@0.8.15-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-defaults@0.1.2-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-app@0.1.2-next.2
+  - @backstage/plugin-app-visualizer@0.1.12-next.3
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.2
+  - @backstage/plugin-home@0.8.1-next.3
+  - @backstage/plugin-kubernetes@0.12.0-next.3
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.3
+  - @backstage/plugin-notifications@0.3.3-next.2
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-signals@0.0.12-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 0.0.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog-import@0.12.6-next.2
+  - @backstage/plugin-scaffolder@1.26.3-next.2
+  - @backstage/plugin-app-visualizer@0.1.12-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-graph@0.4.12-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-home@0.8.1-next.2
+  - @backstage/plugin-org@0.6.32-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.2
+  - @backstage/plugin-app@0.1.2-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.2
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.2
+
+## 0.0.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-api-docs@0.11.12-next.1
+  - @backstage/plugin-app@0.1.2-next.1
+  - @backstage/plugin-app-visualizer@0.1.12-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.1
+  - @backstage/plugin-catalog-import@0.12.6-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-home@0.8.1-next.1
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-org@0.6.32-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder@1.26.3-next.1
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+  - @backstage/plugin-search@1.4.19-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.1
+
+## 0.0.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.0
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-home@0.8.1-next.0
+  - @backstage/plugin-scaffolder@1.26.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/plugin-notifications@0.3.3-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-defaults@0.1.2-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-app@0.1.2-next.0
+  - @backstage/plugin-app-visualizer@0.1.12-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.0
+  - @backstage/plugin-catalog-import@0.12.6-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.0
+  - @backstage/plugin-kubernetes@0.11.17-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.0
+  - @backstage/plugin-org@0.6.32-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-signals@0.0.12-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.0
+  - @backstage/plugin-user-settings@0.8.15-next.0
+
 ## 0.0.16
 
 ### Patch Changes
diff --git a/packages/app-next/package.json b/packages/app-next/package.json
index 1ffea86aeb..c39fac7e6a 100644
--- a/packages/app-next/package.json
+++ b/packages/app-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app-next",
-  "version": "0.0.16",
+  "version": "0.0.18-next.2",
   "backstage": {
     "role": "frontend"
   },
diff --git a/packages/app/.eslintrc.js b/packages/app/.eslintrc.js
index e2a53a6ad2..e487f765b2 100644
--- a/packages/app/.eslintrc.js
+++ b/packages/app/.eslintrc.js
@@ -1 +1,5 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: {
+    '@backstage/no-top-level-material-ui-4-imports': 'error',
+  },
+});
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index 6f33cf3949..fd244dde7e 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,333 @@
 # example-app
 
+## 0.2.104-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-notifications@0.5.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/plugin-scaffolder@1.27.2-next.2
+  - @backstage/plugin-api-docs@0.12.2-next.2
+  - @backstage/plugin-catalog-graph@0.4.14-next.2
+  - @backstage/plugin-catalog-import@0.12.8-next.2
+  - @backstage/plugin-org@0.6.34-next.2
+  - @backstage/plugin-user-settings@0.8.17-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.2
+  - @backstage/plugin-devtools@0.1.22-next.2
+  - @backstage/plugin-home@0.8.3-next.2
+  - @backstage/plugin-kubernetes@0.12.2-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.2
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-search@1.4.21-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-signals@0.0.14-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 0.2.104-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.8.3-next.1
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-api-docs@0.12.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.1
+  - @backstage/plugin-catalog-import@0.12.8-next.1
+  - @backstage/plugin-kubernetes@0.12.2-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.1
+  - @backstage/plugin-org@0.6.34-next.1
+  - @backstage/plugin-scaffolder@1.27.2-next.1
+  - @backstage/plugin-search@1.4.21-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/plugin-user-settings@0.8.17-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.1
+  - @backstage/plugin-devtools@0.1.22-next.1
+  - @backstage/plugin-notifications@0.4.2-next.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-signals@0.0.14-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 0.2.104-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-scaffolder@1.27.2-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-search@1.4.21-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/plugin-home@0.8.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-api-docs@0.12.2-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.14-next.0
+  - @backstage/plugin-catalog-import@0.12.8-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.12-next.0
+  - @backstage/plugin-devtools@0.1.22-next.0
+  - @backstage/plugin-kubernetes@0.12.2-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.20-next.0
+  - @backstage/plugin-notifications@0.4.2-next.0
+  - @backstage/plugin-org@0.6.34-next.0
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-signals@0.0.14-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.19-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+  - @backstage/plugin-user-settings@0.8.17-next.0
+
+## 0.2.103
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-api-docs@0.12.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-notifications@0.4.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-search@1.4.19
+  - @backstage/plugin-org@0.6.32
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder@1.27.0
+  - @backstage/plugin-catalog-import@0.12.6
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes@0.12.0
+  - @backstage/plugin-home@0.8.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/plugin-signals@0.0.12
+  - @backstage/plugin-kubernetes-cluster@0.0.18
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-graph@0.4.12
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10
+  - @backstage/plugin-devtools@0.1.20
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17
+  - @backstage/plugin-user-settings@0.8.15
+
+## 0.2.103-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-search@1.4.19-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/plugin-scaffolder@1.27.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/plugin-api-docs@0.11.12-next.3
+  - @backstage/plugin-catalog-graph@0.4.12-next.3
+  - @backstage/plugin-catalog-import@0.12.6-next.3
+  - @backstage/plugin-org@0.6.32-next.3
+  - @backstage/plugin-user-settings@0.8.15-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.2
+  - @backstage/plugin-devtools@0.1.20-next.2
+  - @backstage/plugin-home@0.8.1-next.3
+  - @backstage/plugin-kubernetes@0.12.0-next.3
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.3
+  - @backstage/plugin-notifications@0.3.3-next.2
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-signals@0.0.12-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog-import@0.12.6-next.2
+  - @backstage/plugin-scaffolder@1.26.3-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-graph@0.4.12-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-home@0.8.1-next.2
+  - @backstage/plugin-org@0.6.32-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.2
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-devtools@0.1.20-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.2
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.2
+
+## 0.2.103-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/plugin-kubernetes@0.12.0-next.1
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-api-docs@0.11.12-next.1
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.1
+  - @backstage/plugin-catalog-import@0.12.6-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.1
+  - @backstage/plugin-devtools@0.1.20-next.1
+  - @backstage/plugin-home@0.8.1-next.1
+  - @backstage/plugin-notifications@0.3.3-next.1
+  - @backstage/plugin-org@0.6.32-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder@1.26.3-next.1
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+  - @backstage/plugin-search@1.4.19-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-signals@0.0.12-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+  - @backstage/plugin-user-settings@0.8.15-next.1
+
+## 0.2.103-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-api-docs@0.11.12-next.0
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-home@0.8.1-next.0
+  - @backstage/plugin-scaffolder@1.26.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/plugin-notifications@0.3.3-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-graph@0.4.12-next.0
+  - @backstage/plugin-catalog-import@0.12.6-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.10-next.0
+  - @backstage/plugin-devtools@0.1.20-next.0
+  - @backstage/plugin-kubernetes@0.11.17-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.18-next.0
+  - @backstage/plugin-org@0.6.32-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search@1.4.19-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-signals@0.0.12-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.17-next.0
+  - @backstage/plugin-user-settings@0.8.15-next.0
+
 ## 0.2.102
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index 2012f9888d..67228f4b74 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.102",
+  "version": "0.2.104-next.2",
   "backstage": {
     "role": "frontend"
   },
diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index 0c2ccbad22..e39122337f 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -26,6 +26,9 @@ import {
   discoveryApiRef,
 } from '@backstage/core-plugin-api';
 import { AuthProxyDiscoveryApi } from './AuthProxyDiscoveryApi';
+import { formDecoratorsApiRef } from '@backstage/plugin-scaffolder/alpha';
+import { DefaultScaffolderFormDecoratorsApi } from '@backstage/plugin-scaffolder/alpha';
+import { mockDecorator } from './components/scaffolder/decorators';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({
@@ -39,5 +42,14 @@ export const apis: AnyApiFactory[] = [
     factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi),
   }),
 
+  createApiFactory({
+    api: formDecoratorsApiRef,
+    deps: {},
+    factory: () =>
+      DefaultScaffolderFormDecoratorsApi.create({
+        decorators: [mockDecorator],
+      }),
+  }),
+
   ScmAuth.createDefaultApiFactory(),
 ];
diff --git a/packages/app/src/components/Root/LogoFull.tsx b/packages/app/src/components/Root/LogoFull.tsx
index c7b1c846c4..da6911bb17 100644
--- a/packages/app/src/components/Root/LogoFull.tsx
+++ b/packages/app/src/components/Root/LogoFull.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/packages/app/src/components/Root/LogoIcon.jsx b/packages/app/src/components/Root/LogoIcon.jsx
index 5ec778cca2..966b491674 100644
--- a/packages/app/src/components/Root/LogoIcon.jsx
+++ b/packages/app/src/components/Root/LogoIcon.jsx
@@ -17,7 +17,7 @@
 // NOTE: This file is intentionally .jsx, so that there is one file in this repo where we make sure .jsx files work.
 
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
index af053f623c..b74c6459d8 100644
--- a/packages/app/src/components/Root/Root.tsx
+++ b/packages/app/src/components/Root/Root.tsx
@@ -15,7 +15,7 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 import HomeIcon from '@material-ui/icons/Home';
 import RuleIcon from '@material-ui/icons/AssignmentTurnedIn';
 import MapIcon from '@material-ui/icons/MyLocation';
diff --git a/packages/app/src/components/advancedSettings/AdvancedSettings.tsx b/packages/app/src/components/advancedSettings/AdvancedSettings.tsx
index 574f7ec754..3383198a1f 100644
--- a/packages/app/src/components/advancedSettings/AdvancedSettings.tsx
+++ b/packages/app/src/components/advancedSettings/AdvancedSettings.tsx
@@ -16,14 +16,12 @@
 
 import React from 'react';
 import { InfoCard } from '@backstage/core-components';
-import {
-  List,
-  Grid,
-  ListItem,
-  ListItemText,
-  ListItemSecondaryAction,
-  Switch,
-} from '@material-ui/core';
+import List from '@material-ui/core/List';
+import Grid from '@material-ui/core/Grid';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
+import Switch from '@material-ui/core/Switch';
 import useLocalStorage from 'react-use/esm/useLocalStorage';
 
 export function AdvancedSettings() {
diff --git a/packages/app/src/components/catalog/EntityPage.test.tsx b/packages/app/src/components/catalog/EntityPage.test.tsx
index 0943a82efb..06a568279b 100644
--- a/packages/app/src/components/catalog/EntityPage.test.tsx
+++ b/packages/app/src/components/catalog/EntityPage.test.tsx
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { EntityLayout, catalogPlugin } from '@backstage/plugin-catalog';
 import {
   EntityProvider,
   starredEntitiesApiRef,
   MockStarredEntitiesApi,
+  catalogApiRef,
 } from '@backstage/plugin-catalog-react';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
@@ -28,6 +28,7 @@ import {
 } from '@backstage/test-utils';
 import React from 'react';
 import { cicdContent } from './EntityPage';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('EntityPage Test', () => {
   const entity = {
@@ -55,6 +56,7 @@ describe('EntityPage Test', () => {
           apis={[
             [starredEntitiesApiRef, new MockStarredEntitiesApi()],
             [permissionApiRef, mockApis.permission()],
+            [catalogApiRef, catalogApiMock()],
           ]}
         >
           <EntityProvider entity={entity}>
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 586c793a4f..11fc60bd0e 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -70,7 +70,8 @@ import {
   EntityOwnershipCard,
   EntityUserProfileCard,
 } from '@backstage/plugin-org';
-import { Button, Grid } from '@material-ui/core';
+import Button from '@material-ui/core/Button';
+import Grid from '@material-ui/core/Grid';
 import React, { ReactNode } from 'react';
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import {
@@ -84,15 +85,14 @@ const customEntityFilterKind = ['Component', 'API', 'System'];
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   return (
-    <>
-      <EntityLayout
-        UNSTABLE_contextMenuOptions={{
-          disableUnregister: 'visible',
-        }}
-      >
-        {props.children}
-      </EntityLayout>
-    </>
+    <EntityLayout
+      parentEntityRelations={['partOf', 'memberOf', 'childOf']}
+      UNSTABLE_contextMenuOptions={{
+        disableUnregister: 'visible',
+      }}
+    >
+      {props.children}
+    </EntityLayout>
   );
 };
 
diff --git a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
index cb3d684389..f16f98f9af 100644
--- a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
+++ b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
@@ -37,7 +37,8 @@ import {
   searchApiRef,
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
-import { Grid, makeStyles } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
+import { makeStyles } from '@material-ui/core/styles';
 import React, { ComponentType, PropsWithChildren } from 'react';
 
 const entities = [
@@ -126,8 +127,8 @@ const useStyles = makeStyles(theme => ({
     boxShadow: theme.shadows[1],
   },
   searchBarOutline: {
-    borderStyle: 'none'
-  }
+    borderStyle: 'none',
+  },
 }));
 
 const useLogoStyles = makeStyles(theme => ({
@@ -156,9 +157,14 @@ export const DefaultTemplate = () => {
               className={container}
               logo={<TemplateBackstageLogo classes={{ svg, path }} />}
             />
-            <Grid container item xs={12} justifyContent='center'>
+            <Grid container item xs={12} justifyContent="center">
               <HomePageSearchBar
-                InputProps={{ classes: { root: classes.searchBarInput, notchedOutline: classes.searchBarOutline }}}
+                InputProps={{
+                  classes: {
+                    root: classes.searchBarInput,
+                    notchedOutline: classes.searchBarOutline,
+                  },
+                }}
                 placeholder="Search"
               />
             </Grid>
diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
index e236e01d79..953420c3e6 100644
--- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -16,7 +16,7 @@
 import React from 'react';
 import type { FieldValidation } from '@rjsf/utils';
 import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
-import { TextField } from '@material-ui/core';
+import TextField from '@material-ui/core/TextField';
 import {
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
diff --git a/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx b/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
index b23d6e4073..d05635314f 100644
--- a/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderLayouts.tsx
@@ -19,7 +19,7 @@ import {
   LayoutTemplate,
   scaffolderPlugin,
 } from '@backstage/plugin-scaffolder';
-import { Grid } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
 
 const TwoColumn: LayoutTemplate = ({ properties, description, title }) => {
   const mid = Math.ceil(properties.length / 2);
diff --git a/packages/app/src/components/scaffolder/decorators.ts b/packages/app/src/components/scaffolder/decorators.ts
new file mode 100644
index 0000000000..ffb78562f8
--- /dev/null
+++ b/packages/app/src/components/scaffolder/decorators.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { githubAuthApiRef } from '@backstage/core-plugin-api';
+import { createScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha';
+
+export const mockDecorator = createScaffolderFormDecorator({
+  id: 'mock-decorator',
+  schema: {
+    input: {
+      test: z => z.string(),
+    },
+  },
+  deps: {
+    githubApi: githubAuthApiRef,
+  },
+  decorator: async (
+    { setSecrets, setFormState, input: { test } },
+    { githubApi: _githubApi },
+  ) => {
+    setFormState(state => ({ ...state, test, mock: 'MOCK' }));
+    setSecrets(state => ({ ...state, GITHUB_TOKEN: 'MOCK_TOKEN' }));
+  },
+});
diff --git a/packages/app/src/components/search/SearchModal.tsx b/packages/app/src/components/search/SearchModal.tsx
index 34caeeae63..0f80d0fc68 100644
--- a/packages/app/src/components/search/SearchModal.tsx
+++ b/packages/app/src/components/search/SearchModal.tsx
@@ -29,14 +29,12 @@ import {
 } from '@backstage/plugin-search-react';
 import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
 import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
-import {
-  Box,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Grid,
-  makeStyles,
-} from '@material-ui/core';
+import Box from '@material-ui/core/Box';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import Grid from '@material-ui/core/Grid';
+import { makeStyles } from '@material-ui/core/styles';
 import Button from '@material-ui/core/Button';
 import IconButton from '@material-ui/core/IconButton';
 import ArrowForwardIcon from '@material-ui/icons/ArrowForward';
diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 6914fa71cb..5a520e9211 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -25,8 +25,8 @@ import {
 import { useApi } from '@backstage/core-plugin-api';
 import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
 import {
-  catalogApiRef,
   CATALOG_FILTER_EXISTS,
+  catalogApiRef,
 } from '@backstage/plugin-catalog-react';
 import { SearchType } from '@backstage/plugin-search';
 import {
@@ -38,7 +38,10 @@ import {
   useSearch,
 } from '@backstage/plugin-search-react';
 import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
-import { Grid, makeStyles, Paper, Theme } from '@material-ui/core';
+import Paper from '@material-ui/core/Paper';
+import Grid from '@material-ui/core/Grid';
+import { Theme } from '@material-ui/core/styles/createTheme';
+import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
@@ -70,7 +73,7 @@ const SearchPage = () => {
           {!isMobile && (
             <Grid item xs={3}>
               <SearchType.Accordion
-                name="Result Type"
+                name="Result type"
                 defaultValue="software-catalog"
                 showCounts
                 types={[
@@ -114,7 +117,7 @@ const SearchPage = () => {
                   name="kind"
                   values={['Component', 'Template']}
                 />
-                <SearchFilter.Checkbox
+                <SearchFilter.Select
                   className={classes.filter}
                   label="Lifecycle"
                   name="lifecycle"
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index 2cf33454e6..f9164f025d 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,116 @@
 # @backstage/backend-app-api
 
+## 1.1.0-next.2
+
+### Minor Changes
+
+- ebf083d: Service factories added by feature loaders now have lower priority and will be ignored if a factory for the same service is added directly by `backend.add(serviceFactory)`.
+
+### Patch Changes
+
+- 0e9c9fa: As soon as a backend termination signal is received, call before shutting down root lifecycle hooks.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 1.1.0-next.1
+
+### Minor Changes
+
+- 12eac85: **EXPERIMENTAL**: Adds a new `instanceMetadataService` to hold information about a specific backend instance.
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 1.0.3-next.0
+
+### Patch Changes
+
+- eef3ef1: Removed unused `express` dependencies.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 1.0.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## 1.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 1.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 1.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 1.0.1
 
 ### Patch Changes
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 2c14985834..bced08abd2 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-app-api",
-  "version": "1.0.1",
+  "version": "1.1.0-next.2",
   "description": "Core API used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
@@ -50,7 +50,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli-common": "workspace:^",
     "@backstage/config": "workspace:^",
@@ -63,8 +62,6 @@
     "compression": "^1.7.4",
     "cookie": "^0.7.0",
     "cors": "^2.8.5",
-    "express": "^4.17.1",
-    "express-promise-router": "^4.1.0",
     "helmet": "^6.0.0",
     "jose": "^5.0.0",
     "knex": "^3.0.0",
@@ -74,13 +71,12 @@
     "minimatch": "^9.0.0",
     "minimist": "^1.2.5",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
     "path-to-regexp": "^8.0.0",
     "selfsigned": "^2.0.0",
     "stoppable": "^1.1.0",
     "triple-beam": "^1.4.1",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "winston-transport": "^4.5.0"
   },
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
index 8e92fc7120..86b0b51bd9 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
@@ -25,8 +25,10 @@ import {
   createBackendModule,
   createExtensionPoint,
   createBackendFeatureLoader,
+  ServiceRef,
 } from '@backstage/backend-plugin-api';
 import { BackendInitializer } from './BackendInitializer';
+import { instanceMetadataServiceRef } from '@backstage/backend-plugin-api/alpha';
 
 class MockLogger {
   debug() {}
@@ -49,6 +51,18 @@ const baseFactories = [
   loggerServiceFactory,
 ];
 
+function mkNoopFactory(ref: ServiceRef<{}, 'plugin'>) {
+  const fn = jest.fn().mockReturnValue({});
+  return Object.assign(
+    fn,
+    createServiceFactory({
+      service: ref,
+      deps: {},
+      factory: fn,
+    }),
+  );
+}
+
 const testPlugin = createBackendPlugin({
   pluginId: 'test',
   register(reg) {
@@ -166,6 +180,151 @@ describe('BackendInitializer', () => {
     expect(moduleInit).toHaveBeenCalled();
   });
 
+  it('should ignore services provided by feature loaders that have already been explicitly added', async () => {
+    const ref = createServiceRef<{}>({ id: '1' });
+    const factory1 = mkNoopFactory(ref);
+    const factory2 = mkNoopFactory(ref);
+    const factory3 = mkNoopFactory(ref);
+
+    const init = new BackendInitializer([...baseFactories, factory1]);
+    init.add(factory2);
+    init.add(
+      createBackendFeatureLoader({
+        deps: {},
+        *loader() {
+          yield factory3;
+        },
+      }),
+    );
+    init.add(
+      createBackendPlugin({
+        pluginId: 'tester',
+        register(reg) {
+          reg.registerInit({
+            deps: { ref },
+            async init() {},
+          });
+        },
+      }),
+    );
+
+    await init.start();
+
+    expect(factory1).not.toHaveBeenCalled();
+    expect(factory2).toHaveBeenCalled();
+    expect(factory3).not.toHaveBeenCalled();
+  });
+
+  it('should include all multiton service factories', async () => {
+    expect.assertions(5);
+
+    const ref = createServiceRef<number>({ id: '1', multiton: true });
+    const factory1 = mkNoopFactory(ref).mockResolvedValue(1);
+    const factory2 = mkNoopFactory(ref).mockResolvedValue(2);
+    const factory3 = mkNoopFactory(ref).mockResolvedValue(3);
+    const factory4 = mkNoopFactory(ref).mockResolvedValue(4);
+
+    const init = new BackendInitializer([...baseFactories, factory1]);
+    init.add(factory2);
+    init.add(
+      createBackendFeatureLoader({
+        deps: {},
+        *loader() {
+          yield factory3;
+          yield factory4;
+        },
+      }),
+    );
+    init.add(
+      createBackendPlugin({
+        pluginId: 'tester',
+        register(reg) {
+          reg.registerInit({
+            deps: { ns: ref },
+            async init({ ns }) {
+              expect(ns).toEqual([1, 2, 3, 4]);
+            },
+          });
+        },
+      }),
+    );
+
+    await init.start();
+
+    expect(factory1).toHaveBeenCalled();
+    expect(factory2).toHaveBeenCalled();
+    expect(factory3).toHaveBeenCalled();
+    expect(factory4).toHaveBeenCalled();
+  });
+
+  // Note: this is an important escape hatch in case to loaders conflict and you need to select the winning service factory
+  it('should allow duplicate service from feature loaders if overridden', async () => {
+    const ref = createServiceRef<{}>({ id: '1' });
+    const factory1 = mkNoopFactory(ref);
+    const factory2 = mkNoopFactory(ref);
+    const factory3 = mkNoopFactory(ref);
+    const factory4 = mkNoopFactory(ref);
+
+    const init = new BackendInitializer([...baseFactories, factory1]);
+    init.add(factory2);
+    init.add(
+      createBackendFeatureLoader({
+        deps: {},
+        *loader() {
+          yield factory3;
+          yield factory4;
+        },
+      }),
+    );
+    init.add(
+      createBackendPlugin({
+        pluginId: 'tester',
+        register(reg) {
+          reg.registerInit({
+            deps: { ref },
+            async init() {},
+          });
+        },
+      }),
+    );
+
+    await init.start();
+
+    expect(factory1).not.toHaveBeenCalled();
+    expect(factory2).toHaveBeenCalled();
+    expect(factory3).not.toHaveBeenCalled();
+    expect(factory4).not.toHaveBeenCalled();
+  });
+
+  it('should reject duplicate service factories from feature loader without an explicit override', async () => {
+    const ref = createServiceRef<{}>({ id: '1' });
+    const factory1 = mkNoopFactory(ref);
+    const factory2 = mkNoopFactory(ref);
+    const factory3 = mkNoopFactory(ref);
+
+    const init = new BackendInitializer([...baseFactories, factory1]);
+    init.add(
+      createBackendFeatureLoader({
+        deps: {},
+        *loader() {
+          yield factory2;
+        },
+      }),
+    );
+    init.add(
+      createBackendFeatureLoader({
+        deps: {},
+        *loader() {
+          yield factory3;
+        },
+      }),
+    );
+
+    await expect(init.start()).rejects.toThrow(
+      'Duplicate service implementations provided for 1 by both feature loader created at',
+    );
+  });
+
   it('should refuse to override already initialized services through loaded features', async () => {
     const ref1 = createServiceRef<{ x: number }>({
       id: '1',
@@ -724,4 +883,59 @@ describe('BackendInitializer', () => {
 
     await init.start();
   });
+
+  it('should properly add plugins + modules to the instance metadata service', async () => {
+    expect.assertions(1);
+    const backend = new BackendInitializer(baseFactories);
+    const plugin = createBackendPlugin({
+      pluginId: 'test',
+      register(reg) {
+        reg.registerInit({
+          deps: {},
+          async init() {},
+        });
+      },
+    });
+    const instanceMetadataPlugin = createBackendPlugin({
+      pluginId: 'instance-metadata',
+      register(reg) {
+        reg.registerInit({
+          deps: {
+            instanceMetadata: instanceMetadataServiceRef,
+          },
+          async init({ instanceMetadata }) {
+            expect(instanceMetadata.getInstalledFeatures()).toEqual([
+              {
+                pluginId: 'test',
+                type: 'plugin',
+              },
+              {
+                pluginId: 'test',
+                moduleId: 'test',
+                type: 'module',
+              },
+              {
+                pluginId: 'instance-metadata',
+                type: 'plugin',
+              },
+            ]);
+          },
+        });
+      },
+    });
+    const module = createBackendModule({
+      pluginId: 'test',
+      moduleId: 'test',
+      register(reg) {
+        reg.registerInit({
+          deps: {},
+          async init() {},
+        });
+      },
+    });
+    backend.add(plugin);
+    backend.add(module);
+    backend.add(instanceMetadataPlugin);
+    await backend.start();
+  });
 });
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index 3ea1200898..b8c37f7471 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -22,6 +22,7 @@ import {
   ServiceFactory,
   LifecycleService,
   RootLifecycleService,
+  createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { ServiceOrExtensionPoint } from './types';
 // Direct internal import to avoid duplication
@@ -34,7 +35,11 @@ import type {
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import type { InternalServiceFactory } from '../../../backend-plugin-api/src/services/system/types';
 import { ForwardedError, ConflictError } from '@backstage/errors';
-import { featureDiscoveryServiceRef } from '@backstage/backend-plugin-api/alpha';
+import {
+  instanceMetadataServiceRef,
+  featureDiscoveryServiceRef,
+  BackendFeatureMeta,
+} from '@backstage/backend-plugin-api/alpha';
 import { DependencyGraph } from '../lib/DependencyGraph';
 import { ServiceRegistry } from './ServiceRegistry';
 import { createInitializationLogger } from './createInitializationLogger';
@@ -96,6 +101,39 @@ const instanceRegistry = new (class InstanceRegistry {
   };
 })();
 
+function createInstanceMetadataServiceFactory(
+  registrations: InternalBackendRegistrations[],
+) {
+  const installedFeatures = registrations
+    .map(registration => {
+      if (registration.featureType === 'registrations') {
+        return registration
+          .getRegistrations()
+          .map(feature => {
+            if (feature.type === 'plugin') {
+              return { type: 'plugin', pluginId: feature.pluginId };
+            } else if (feature.type === 'module') {
+              return {
+                type: 'module',
+                pluginId: feature.pluginId,
+                moduleId: feature.moduleId,
+              };
+            }
+            // Ignore unknown feature types.
+            return undefined;
+          })
+          .filter(Boolean) as BackendFeatureMeta[];
+      }
+      return [];
+    })
+    .flat();
+  return createServiceFactory({
+    service: instanceMetadataServiceRef,
+    deps: {},
+    factory: async () => ({ getInstalledFeatures: () => installedFeatures }),
+  });
+}
+
 export class BackendInitializer {
   #startPromise?: Promise<void>;
   #stopPromise?: Promise<void>;
@@ -210,6 +248,10 @@ export class BackendInitializer {
 
     await this.#applyBackendFeatureLoaders(this.#registeredFeatureLoaders);
 
+    this.#serviceRegistry.add(
+      createInstanceMetadataServiceFactory(this.#registrations),
+    );
+
     // Initialize all root scoped services
     await this.#serviceRegistry.initializeEagerServicesWithScope('root');
 
@@ -407,6 +449,11 @@ export class BackendInitializer {
       // The startup failed, but we may still want to do cleanup so we continue silently
     }
 
+    const rootLifecycleService = await this.#getRootLifecycleImpl();
+
+    // Root services like the health one need to immediatelly be notified of the shutdown
+    await rootLifecycleService.beforeShutdown();
+
     // Get all plugins.
     const allPlugins = new Set<string>();
     for (const feature of this.#registrations) {
@@ -426,14 +473,14 @@ export class BackendInitializer {
     );
 
     // Once all plugin shutdown hooks are done, run root shutdown hooks.
-    const lifecycleService = await this.#getRootLifecycleImpl();
-    await lifecycleService.shutdown();
+    await rootLifecycleService.shutdown();
   }
 
   // Bit of a hacky way to grab the lifecycle services, potentially find a nicer way to do this
   async #getRootLifecycleImpl(): Promise<
     RootLifecycleService & {
       startup(): Promise<void>;
+      beforeShutdown(): Promise<void>;
       shutdown(): Promise<void>;
     }
   > {
@@ -477,6 +524,11 @@ export class BackendInitializer {
   }
 
   async #applyBackendFeatureLoaders(loaders: InternalBackendFeatureLoader[]) {
+    const servicesAddedByLoaders = new Map<
+      string,
+      InternalBackendFeatureLoader
+    >();
+
     for (const loader of loaders) {
       const deps = new Map<string, unknown>();
       const missingRefs = new Set<ServiceOrExtensionPoint>();
@@ -522,8 +574,32 @@ export class BackendInitializer {
         if (isBackendFeatureLoader(feature)) {
           newLoaders.push(feature);
         } else {
-          didAddServiceFactory ||= isServiceFactory(feature);
-          this.#addFeature(feature);
+          // This block makes sure that feature loaders do not provide duplicate
+          // implementations for the same service, but at the same time allows
+          // service factories provided by feature loaders to be overridden by
+          // ones that are explicitly installed with backend.add(serviceFactory).
+          //
+          // If a factory has already been explicitly installed, the service
+          // factory provided by the loader will simply be ignored.
+          if (isServiceFactory(feature) && !feature.service.multiton) {
+            const conflictingLoader = servicesAddedByLoaders.get(
+              feature.service.id,
+            );
+            if (conflictingLoader) {
+              throw new Error(
+                `Duplicate service implementations provided for ${feature.service.id} by both feature loader ${loader.description} and feature loader ${conflictingLoader.description}`,
+              );
+            }
+
+            // Check that this service wasn't already explicitly added by backend.add(serviceFactory)
+            if (!this.#serviceRegistry.hasBeenAdded(feature.service)) {
+              didAddServiceFactory = true;
+              servicesAddedByLoaders.set(feature.service.id, loader);
+              this.#addFeature(feature);
+            }
+          } else {
+            this.#addFeature(feature);
+          }
         }
       }
 
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
index 0abd5605ae..90b108206e 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
@@ -191,6 +191,13 @@ export class ServiceRegistry {
     }
   }
 
+  hasBeenAdded(ref: ServiceRef<any>) {
+    if (ref.id === coreServices.pluginMetadata.id) {
+      return true;
+    }
+    return this.#addedFactoryIds.has(ref.id);
+  }
+
   add(factory: ServiceFactory) {
     const factoryId = factory.service.id;
     if (factoryId === coreServices.pluginMetadata.id) {
diff --git a/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
index 1fd7fcbbec..32c1fbcd0e 100644
--- a/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
+++ b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
@@ -36,6 +36,7 @@ describe('createSpecializedBackend', () => {
             deps: {},
             factory: async () => ({
               addStartupHook: () => {},
+              addBeforeShutdownHook: () => {},
               addShutdownHook: () => {},
             }),
           }),
@@ -44,6 +45,7 @@ describe('createSpecializedBackend', () => {
             deps: {},
             factory: async () => ({
               addStartupHook: () => {},
+              addBeforeShutdownHook: () => {},
               addShutdownHook: () => {},
             }),
           }),
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index 6a0fb84a48..4d3cb90097 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,215 @@
 # @backstage/backend-defaults
 
+## 0.6.0-next.2
+
+### Minor Changes
+
+- fd5d337: Added a new `backend.health.headers` configuration that can be used to set additional headers to include in health check responses.
+
+  **BREAKING CONSUMERS**: As part of this change the `createHealthRouter` function exported from `@backstage/backend-defaults/rootHttpRouter` now requires the root config service to be passed through the `config` option.
+
+- 3f34ea9: Throttles Bitbucket Server API calls
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 57e0b11: The user and plugin token verification in the default `AuthService` implementation will no longer forward verification errors to the caller, and instead log them as warnings.
+- 57e0b11: The default `authServiceFactory` now correctly depends on the plugin scoped `Logger` services rather than the root scoped one.
+- 0e9c9fa: Implements the `DefaultRootLifecycleService.addBeforeShutdownHook` method, and updates `DefaultRootHttpRouterService` and `DefaultRootHealthService` to listen to that event to stop accepting traffic and close service connections.
+- d0cbd82: Remove use of the `stoppable` library on the `DefaultRootHttpRouterService` as Node's native http server [close](https://nodejs.org/api/http.html#serverclosecallback) method already drains requests.
+  Also, we pass a new `lifecycleMiddleware` to the `rootHttpRouterServiceFactory` configure function that must be called manually if you don't call `applyDefaults`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+
+## 0.6.0-next.1
+
+### Patch Changes
+
+- fe87fbf: Add task metrics as two gauges that track the last start and end timestamps as epoch seconds.
+- 1ac6b72: Support `connection.type: cloudsql` in database client for usage with `@google-cloud/cloud-sql-connector` and `iam` auth
+- 5c9cc05: Use native fetch instead of node-fetch
+- cf627c6: Fixed an issue in the WinstonLogger where Errors thrown and given to logger.error with field values that could not be cast to a string would throw a TypeError
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.6.0-next.0
+
+### Minor Changes
+
+- de6f280: **BREAKING** Upgraded @keyv/redis and keyv packages to resolve a bug related to incorrect resolution of cache keys.
+
+  This is a breaking change for clients using the `redis` store for cache with `useRedisSets` option set to false since cache keys will be calculated differently (without the sets:namespace: prefix). For clients with default configuration (or useRedisSets set to false) the cache keys will stay the same, but since @keyv/redis library no longer supports redis sets they won't be utilised anymore.
+
+  If you were using `useRedisSets` option in configuration make sure to remove it from `app-config.yaml`:
+
+  ```diff
+  backend:
+    cache:
+      store: redis
+      connection: redis://user:pass@cache.example.com:6379
+  -   useRedisSets: false
+  ```
+
+- 277092a: Implemented `AzureBlobStorageUrlReader` to read from the url of committed location from the entity provider
+- 18a2c00: All middleware used by the default `coreServices.http` is now exported for use by custom implementations.
+
+### Patch Changes
+
+- 8863b38: Export `PluginTokenHandler` and `pluginTokenHandlerDecoratorServiceRef` to allow for custom decoration of the plugin token handler without having to re-implement the entire handler.
+- 97c6837: Export `DefaultHttpAuthService` to allow for custom token extraction logic.
+- e5255f1: Log request and response metadata so it can be used for filtering log messages.
+  The format of the request date was also changed from `clf` to `utc`.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 0.5.3
+
+### Patch Changes
+
+- bf306cb: Removed dependency `@backstage/backend-common`.
+- e30bb46: Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- f6eaec2: Link to proper package in `rootLoggerServiceFactory` doc string.
+- ecf6b39: Use `node-fetch` instead of native fetch, as per https://backstage.io/docs/architecture-decisions/adrs-adr013
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-permission-node@0.8.5
+
+## 0.5.3-next.3
+
+### Patch Changes
+
+- ecf6b39: Use `node-fetch` instead of native fetch, as per https://backstage.io/docs/architecture-decisions/adrs-adr013
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.5.3-next.2
+
+### Patch Changes
+
+- e30bb46: Disabling database migrations now correctly uses the `backend.default.skipMigrations` config value.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 0.5.3-next.0
+
+### Patch Changes
+
+- f6eaec2: Link to proper package in `rootLoggerServiceFactory` doc string.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/packages/backend-defaults/config.d.ts b/packages/backend-defaults/config.d.ts
index a8c6e1c290..e2a748f85d 100644
--- a/packages/backend-defaults/config.d.ts
+++ b/packages/backend-defaults/config.d.ts
@@ -28,6 +28,29 @@ export interface Config {
      */
     baseUrl: string;
 
+    lifecycle?: {
+      /**
+       * The maximum time that paused requests will wait for the service to start, before returning an error.
+       * Defaults to 5 seconds
+       * Supported formats:
+       * - A string in the format of '1d', '2 seconds' etc. as supported by the `ms`
+       *   library.
+       * - A standard ISO formatted duration string, e.g. 'P2DT6H' or 'PT1M'.
+       * - An object with individual units (in plural) as keys, e.g. `{ days: 2, hours: 6 }`.
+       */
+      startupRequestPauseTimeout?: string | HumanDuration;
+      /**
+       * The minimum time that the HTTP server will delay the shutdown of the backend. During this delay health checks will be set to failing, allowing traffic to drain.
+       * Defaults to 0 seconds.
+       * Supported formats:
+       * - A string in the format of '1d', '2 seconds' etc. as supported by the `ms`
+       *   library.
+       * - A standard ISO formatted duration string, e.g. 'P2DT6H' or 'PT1M'.
+       * - An object with individual units (in plural) as keys, e.g. `{ days: 2, hours: 6 }`.
+       */
+      serverShutdownDelay?: string | HumanDuration;
+    };
+
     /** Address that the backend should listen to. */
     listen?:
       | string
@@ -384,6 +407,16 @@ export interface Config {
        */
       connection:
         | string
+        | {
+            /**
+             * The specific config for cloudsql connections
+             */
+            type: 'cloudsql';
+            /**
+             * The instance connection name for the cloudsql instance, e.g. `project:region:instance`
+             */
+            instance: string;
+          }
         | {
             /**
              * Password that belongs to the client User
@@ -441,7 +474,30 @@ export interface Config {
            * Database connection string or Knex object override
            * @visibility secret
            */
-          connection?: string | object;
+          connection?:
+            | string
+            | {
+                /**
+                 * The specific config for cloudsql connections
+                 */
+                type: 'cloudsql';
+                /**
+                 * The instance connection name for the cloudsql instance, e.g. `project:region:instance`
+                 */
+                instance: string;
+              }
+            | {
+                /**
+                 * Password that belongs to the client User
+                 * @visibility secret
+                 */
+                password?: string;
+                /**
+                 * Other connection settings
+                 */
+                [key: string]: unknown;
+              };
+
           /**
            * Whether to ensure the given database exists by creating it if it does not.
            * Defaults to base config if unspecified.
@@ -474,8 +530,8 @@ export interface Config {
     cache?:
       | {
           store: 'memory';
-          /** An optional default TTL (in milliseconds). */
-          defaultTtl?: number | HumanDuration;
+          /** An optional default TTL (in milliseconds, if given as a number). */
+          defaultTtl?: number | HumanDuration | string;
         }
       | {
           store: 'redis';
@@ -484,13 +540,8 @@ export interface Config {
            * @visibility secret
            */
           connection: string;
-          /** An optional default TTL (in milliseconds). */
-          defaultTtl?: number | HumanDuration;
-          /**
-           * Whether or not [useRedisSets](https://github.com/jaredwray/keyv/tree/main/packages/redis#useredissets) should be configured to this redis cache.
-           * Defaults to true if unspecified.
-           */
-          useRedisSets?: boolean;
+          /** An optional default TTL (in milliseconds, if given as a number). */
+          defaultTtl?: number | HumanDuration | string;
         }
       | {
           store: 'memcache';
@@ -500,7 +551,7 @@ export interface Config {
            */
           connection: string;
           /** An optional default TTL (in milliseconds). */
-          defaultTtl?: number | HumanDuration;
+          defaultTtl?: number | HumanDuration | string;
         };
 
     cors?: {
@@ -524,6 +575,23 @@ export interface Config {
      */
     csp?: { [policyId: string]: string[] | false };
 
+    /**
+     * Options for the health check service and endpoint.
+     */
+    health?: {
+      /**
+       * Additional headers to always include in the health check response.
+       *
+       * It can be a good idea to set a header that uniquely identifies your service
+       * in a multi-service environment. This ensures that the health check that is
+       * configured for your service is actually hitting your service and not another.
+       *
+       * For example, if using Envoy you can use the `service_name_matcher` configuration
+       * and set the `x-envoy-upstream-healthchecked-cluster` header to a matching value.
+       */
+      headers?: { [name: string]: string };
+    };
+
     /**
      * Configuration related to URL reading, used for example for reading catalog info
      * files, scaffolder templates, and techdocs content.
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index 687d7379f1..c384833c55 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-defaults",
-  "version": "0.5.1",
+  "version": "0.6.0-next.2",
   "description": "Backend defaults used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
@@ -119,8 +119,9 @@
     "@aws-sdk/client-s3": "^3.350.0",
     "@aws-sdk/credential-providers": "^3.350.0",
     "@aws-sdk/types": "^3.347.0",
+    "@azure/identity": "^4.0.0",
+    "@azure/storage-blob": "^12.5.0",
     "@backstage/backend-app-api": "workspace:^",
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-dev-utils": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli-common": "workspace:^",
@@ -135,11 +136,11 @@
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "@google-cloud/storage": "^7.0.0",
-    "@keyv/memcache": "^1.3.5",
-    "@keyv/redis": "^2.5.3",
+    "@keyv/memcache": "^2.0.1",
+    "@keyv/redis": "^4.0.1",
     "@manypkg/get-packages": "^1.1.3",
     "@octokit/rest": "^19.0.3",
-    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/api": "^1.9.0",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "archiver": "^7.0.0",
@@ -157,44 +158,51 @@
     "helmet": "^6.0.0",
     "isomorphic-git": "^1.23.0",
     "jose": "^5.0.0",
-    "keyv": "^4.5.2",
+    "keyv": "^5.2.1",
     "knex": "^3.0.0",
     "lodash": "^4.17.21",
     "logform": "^2.3.2",
     "luxon": "^3.0.0",
     "minimatch": "^9.0.0",
     "minimist": "^1.2.5",
-    "morgan": "^1.10.0",
     "mysql2": "^3.0.0",
     "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
     "p-limit": "^3.1.0",
+    "p-throttle": "^4.1.1",
     "path-to-regexp": "^8.0.0",
     "pg": "^8.11.3",
     "pg-connection-string": "^2.3.0",
     "pg-format": "^1.0.4",
     "raw-body": "^2.4.1",
     "selfsigned": "^2.0.0",
-    "stoppable": "^1.1.0",
     "tar": "^6.1.12",
     "triple-beam": "^1.4.1",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "winston-transport": "^4.5.0",
     "yauzl": "^3.0.0",
     "yn": "^4.0.0",
     "zod": "^3.22.4"
   },
+  "peerDependencies": {
+    "@google-cloud/cloud-sql-connector": "^1.4.0"
+  },
+  "peerDependenciesMeta": {
+    "@google-cloud/cloud-sql-connector": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@aws-sdk/util-stream-node": "^3.350.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
+    "@google-cloud/cloud-sql-connector": "^1.4.0",
     "@types/archiver": "^6.0.0",
     "@types/base64-stream": "^1.0.2",
     "@types/concat-stream": "^2.0.0",
     "@types/http-errors": "^2.0.0",
-    "@types/morgan": "^1.9.0",
     "@types/node-forge": "^1.3.0",
     "@types/pg-format": "^1.0.5",
     "@types/stoppable": "^1.1.0",
@@ -202,6 +210,7 @@
     "aws-sdk-client-mock": "^4.0.0",
     "http-errors": "^2.0.0",
     "msw": "^1.0.0",
+    "node-mocks-http": "^1.0.0",
     "supertest": "^7.0.0",
     "wait-for-expect": "^3.0.2"
   },
diff --git a/packages/backend-defaults/report-auth.api.md b/packages/backend-defaults/report-auth.api.md
index 2f201e4573..1883e65a6a 100644
--- a/packages/backend-defaults/report-auth.api.md
+++ b/packages/backend-defaults/report-auth.api.md
@@ -5,6 +5,7 @@
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
+import { ServiceRef } from '@backstage/backend-plugin-api';
 
 // @public
 export const authServiceFactory: ServiceFactory<
@@ -13,5 +14,35 @@ export const authServiceFactory: ServiceFactory<
   'singleton'
 >;
 
+// @public
+export interface PluginTokenHandler {
+  // (undocumented)
+  issueToken(options: {
+    pluginId: string;
+    targetPluginId: string;
+    onBehalfOf?: {
+      limitedUserToken: string;
+      expiresAt: Date;
+    };
+  }): Promise<{
+    token: string;
+  }>;
+  // (undocumented)
+  verifyToken(token: string): Promise<
+    | {
+        subject: string;
+        limitedUserToken?: string;
+      }
+    | undefined
+  >;
+}
+
+// @public
+export const pluginTokenHandlerDecoratorServiceRef: ServiceRef<
+  (defaultImplementation: PluginTokenHandler) => PluginTokenHandler,
+  'plugin',
+  'singleton'
+>;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-httpAuth.api.md b/packages/backend-defaults/report-httpAuth.api.md
index 6c08a6f4d0..b3843beb3d 100644
--- a/packages/backend-defaults/report-httpAuth.api.md
+++ b/packages/backend-defaults/report-httpAuth.api.md
@@ -3,9 +3,51 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { AuthService } from '@backstage/backend-plugin-api';
+import { BackstageCredentials } from '@backstage/backend-plugin-api';
+import { BackstagePrincipalTypes } from '@backstage/backend-plugin-api';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
+import { Request as Request_2 } from 'express';
+import { Response as Response_2 } from 'express';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 
+// @public
+export class DefaultHttpAuthService implements HttpAuthService {
+  // (undocumented)
+  static create(options: DefaultHttpAuthServiceOptions): DefaultHttpAuthService;
+  // (undocumented)
+  credentials<TAllowed extends keyof BackstagePrincipalTypes = 'unknown'>(
+    req: Request_2,
+    options?: {
+      allow?: Array<TAllowed>;
+      allowLimitedAccess?: boolean;
+    },
+  ): Promise<BackstageCredentials<BackstagePrincipalTypes[TAllowed]>>;
+  // (undocumented)
+  issueUserCookie(
+    res: Response_2,
+    options?: {
+      credentials?: BackstageCredentials;
+    },
+  ): Promise<{
+    expiresAt: Date;
+  }>;
+}
+
+// @public
+export interface DefaultHttpAuthServiceOptions {
+  // (undocumented)
+  auth: AuthService;
+  // (undocumented)
+  discovery: DiscoveryService;
+  getTokenFromRequest?: (req: Request_2) => {
+    token?: string;
+  };
+  // (undocumented)
+  pluginId: string;
+}
+
 // @public
 export const httpAuthServiceFactory: ServiceFactory<
   HttpAuthService,
diff --git a/packages/backend-defaults/report-httpRouter.api.md b/packages/backend-defaults/report-httpRouter.api.md
index 97805bc926..4f6c6f06dc 100644
--- a/packages/backend-defaults/report-httpRouter.api.md
+++ b/packages/backend-defaults/report-httpRouter.api.md
@@ -3,9 +3,45 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="express" />
+
+import { AuthService } from '@backstage/backend-plugin-api';
+import express from 'express';
+import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { HttpRouterService } from '@backstage/backend-plugin-api';
+import { HttpRouterServiceAuthPolicy } from '@backstage/backend-plugin-api';
+import { HumanDuration } from '@backstage/types';
+import { LifecycleService } from '@backstage/backend-plugin-api';
+import { RequestHandler } from 'express';
+import { RootConfigService } from '@backstage/backend-plugin-api';
+import { Router } from 'express';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 
+// @public (undocumented)
+export function createAuthIntegrationRouter(options: {
+  auth: AuthService;
+}): express.Router;
+
+// @public
+export function createCookieAuthRefreshMiddleware(options: {
+  auth: AuthService;
+  httpAuth: HttpAuthService;
+}): Router;
+
+// @public (undocumented)
+export function createCredentialsBarrier(options: {
+  httpAuth: HttpAuthService;
+  config: RootConfigService;
+}): {
+  middleware: RequestHandler;
+  addAuthPolicy: (policy: HttpRouterServiceAuthPolicy) => void;
+};
+
+// @public
+export function createLifecycleMiddleware(
+  options: LifecycleMiddlewareOptions,
+): RequestHandler;
+
 // @public
 export const httpRouterServiceFactory: ServiceFactory<
   HttpRouterService,
@@ -13,5 +49,12 @@ export const httpRouterServiceFactory: ServiceFactory<
   'singleton'
 >;
 
+// @public
+export interface LifecycleMiddlewareOptions {
+  // (undocumented)
+  lifecycle: LifecycleService;
+  startupRequestPauseTimeout?: HumanDuration;
+}
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-rootHttpRouter.api.md b/packages/backend-defaults/report-rootHttpRouter.api.md
index 3686f25a12..4489fed107 100644
--- a/packages/backend-defaults/report-rootHttpRouter.api.md
+++ b/packages/backend-defaults/report-rootHttpRouter.api.md
@@ -27,6 +27,7 @@ import { ServiceFactory } from '@backstage/backend-plugin-api';
 // @public (undocumented)
 export function createHealthRouter(options: {
   health: RootHealthService;
+  config: RootConfigService;
 }): Router;
 
 // @public
@@ -133,6 +134,8 @@ export interface RootHttpRouterConfigureContext {
   // (undocumented)
   lifecycle: LifecycleService;
   // (undocumented)
+  lifecycleMiddleware: RequestHandler;
+  // (undocumented)
   logger: LoggerService;
   // (undocumented)
   middleware: MiddlewareFactory;
diff --git a/packages/backend-defaults/report-urlReader.api.md b/packages/backend-defaults/report-urlReader.api.md
index f8b8db2954..efe4a9ae47 100644
--- a/packages/backend-defaults/report-urlReader.api.md
+++ b/packages/backend-defaults/report-urlReader.api.md
@@ -7,6 +7,8 @@
 
 import { AwsCredentialsManager } from '@backstage/integration-aws-node';
 import { AwsS3Integration } from '@backstage/integration';
+import { AzureBlobStorageIntergation } from '@backstage/integration';
+import { AzureCredentialsManager } from '@backstage/integration';
 import { AzureDevOpsCredentialsProvider } from '@backstage/integration';
 import { AzureIntegration } from '@backstage/integration';
 import { BitbucketCloudIntegration } from '@backstage/integration';
@@ -60,6 +62,35 @@ export class AwsS3UrlReader implements UrlReaderService {
   toString(): string;
 }
 
+// @public
+export class AzureBlobStorageUrlReader implements UrlReaderService {
+  constructor(
+    credsManager: AzureCredentialsManager,
+    integration: AzureBlobStorageIntergation,
+    deps: {
+      treeResponseFactory: ReadTreeResponseFactory;
+    },
+  );
+  // (undocumented)
+  static factory: ReaderFactory;
+  // (undocumented)
+  read(url: string): Promise<Buffer>;
+  // (undocumented)
+  readTree(
+    url: string,
+    options?: UrlReaderServiceReadTreeOptions,
+  ): Promise<UrlReaderServiceReadTreeResponse>;
+  // (undocumented)
+  readUrl(
+    url: string,
+    options?: UrlReaderServiceReadUrlOptions,
+  ): Promise<UrlReaderServiceReadUrlResponse>;
+  // (undocumented)
+  search(): Promise<UrlReaderServiceSearchResponse>;
+  // (undocumented)
+  toString(): string;
+}
+
 // @public
 export class AzureUrlReader implements UrlReaderService {
   constructor(
@@ -384,17 +415,29 @@ export interface ReadTreeResponseFactory {
 }
 
 // @public
-export type ReadTreeResponseFactoryOptions = {
-  stream: Readable;
-  subpath?: string;
-  etag: string;
-  filter?: (
-    path: string,
-    info?: {
-      size: number;
-    },
-  ) => boolean;
-};
+export type ReadTreeResponseFactoryOptions =
+  | {
+      stream: Readable;
+      subpath?: string;
+      etag: string;
+      filter?: (
+        path: string,
+        info?: {
+          size: number;
+        },
+      ) => boolean;
+    }
+  | {
+      response: Response;
+      subpath?: string;
+      etag?: string;
+      filter?: (
+        path: string,
+        info?: {
+          size: number;
+        },
+      ) => boolean;
+    };
 
 // @public
 export class ReadUrlResponseFactory {
@@ -406,6 +449,9 @@ export class ReadUrlResponseFactory {
     stream: Readable,
     options?: ReadUrlResponseFactoryFromStreamOptions,
   ): Promise<UrlReaderServiceReadUrlResponse>;
+  static fromResponse(
+    response: Response,
+  ): Promise<UrlReaderServiceReadUrlResponse>;
 }
 
 // @public
diff --git a/packages/backend-defaults/src/CreateBackend.test.ts b/packages/backend-defaults/src/CreateBackend.test.ts
index 55fdbe5a6a..57977e9647 100644
--- a/packages/backend-defaults/src/CreateBackend.test.ts
+++ b/packages/backend-defaults/src/CreateBackend.test.ts
@@ -47,6 +47,7 @@ describe('createBackend', () => {
         deps: {},
         factory: async () => ({
           addStartupHook: () => {},
+          addBeforeShutdownHook: () => {},
           addShutdownHook: () => {},
         }),
       }),
@@ -57,6 +58,7 @@ describe('createBackend', () => {
         deps: {},
         factory: async () => ({
           addStartupHook: () => {},
+          addBeforeShutdownHook: () => {},
           addShutdownHook: () => {},
         }),
       }),
diff --git a/packages/backend-defaults/src/entrypoints/auth/DefaultAuthService.ts b/packages/backend-defaults/src/entrypoints/auth/DefaultAuthService.ts
index 05d62a54a2..a81a99fec7 100644
--- a/packages/backend-defaults/src/entrypoints/auth/DefaultAuthService.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/DefaultAuthService.ts
@@ -169,7 +169,10 @@ export class DefaultAuthService implements AuthService {
         return this.pluginTokenHandler.issueToken({
           pluginId: this.pluginId,
           targetPluginId,
-          onBehalfOf,
+          onBehalfOf: {
+            limitedUserToken: onBehalfOf.token,
+            expiresAt: onBehalfOf.expiresAt,
+          },
         });
       }
       default:
diff --git a/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.test.ts b/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.test.ts
index cb672ed7f1..a244614135 100644
--- a/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.test.ts
@@ -19,12 +19,17 @@ import {
   mockServices,
   registerMswTestHooks,
 } from '@backstage/backend-test-utils';
-import { authServiceFactory } from './authServiceFactory';
+import {
+  authServiceFactory,
+  pluginTokenHandlerDecoratorServiceRef,
+} from './authServiceFactory';
 import { base64url, decodeJwt } from 'jose';
 import { discoveryServiceFactory } from '../discovery';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { toInternalBackstageCredentials } from './helpers';
+import { PluginTokenHandler } from './plugin/PluginTokenHandler';
+import { createServiceFactory } from '@backstage/backend-plugin-api';
 
 const server = setupServer();
 
@@ -104,8 +109,9 @@ describe('authServiceFactory', () => {
   });
 
   it('should authenticate issued tokens with new auth', async () => {
+    const logger = mockServices.logger.mock();
     const tester = ServiceFactoryTester.from(authServiceFactory, {
-      dependencies: mockDeps,
+      dependencies: [...mockDeps, logger.factory],
     });
 
     const searchAuth = await tester.getSubject('search');
@@ -129,8 +135,13 @@ describe('authServiceFactory', () => {
       targetPluginId: 'catalog',
     });
 
+    expect(logger.warn).not.toHaveBeenCalled();
     await expect(searchAuth.authenticate(searchToken)).rejects.toThrow(
-      'Invalid plugin token',
+      'Failed plugin token verification',
+    );
+    expect(logger.warn).toHaveBeenCalledWith(
+      'Failed to verify incoming plugin token',
+      expect.any(Error),
     );
     await expect(catalogAuth.authenticate(searchToken)).resolves.toEqual(
       expect.objectContaining({
@@ -407,4 +418,40 @@ describe('authServiceFactory', () => {
       principal: { subject: 'unlimited-static-subject' },
     });
   });
+
+  describe('decorate PluginTokenHandler', () => {
+    it('should allow custom logic to be injected into the plugin token handler', async () => {
+      const customLogic = jest.fn();
+      const customPluginTokenHandler = createServiceFactory({
+        service: pluginTokenHandlerDecoratorServiceRef,
+        deps: {},
+        async factory() {
+          return (defaultImplementation: PluginTokenHandler) =>
+            new (class CustomHandler implements PluginTokenHandler {
+              verifyToken(
+                token: string,
+              ): Promise<
+                { subject: string; limitedUserToken?: string } | undefined
+              > {
+                customLogic(token);
+                return defaultImplementation.verifyToken(token);
+              }
+              issueToken(options: {
+                pluginId: string;
+                targetPluginId: string;
+                limitedUserToken?: { token: string; expiresAt: Date };
+              }): Promise<{ token: string }> {
+                return defaultImplementation.issueToken(options);
+              }
+            })();
+        },
+      });
+      const tester = ServiceFactoryTester.from(authServiceFactory, {
+        dependencies: [...mockDeps, customPluginTokenHandler],
+      });
+      const searchAuth = await tester.getSubject('search');
+      searchAuth.authenticate('unlimited-static-token');
+      expect(customLogic).toHaveBeenCalledWith('unlimited-static-token');
+    });
+  });
 });
diff --git a/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.ts b/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.ts
index 34071ca541..91910292e6 100644
--- a/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/authServiceFactory.ts
@@ -17,13 +17,35 @@
 import {
   coreServices,
   createServiceFactory,
+  createServiceRef,
 } from '@backstage/backend-plugin-api';
 import { DefaultAuthService } from './DefaultAuthService';
 import { ExternalTokenHandler } from './external/ExternalTokenHandler';
-import { PluginTokenHandler } from './plugin/PluginTokenHandler';
+import {
+  DefaultPluginTokenHandler,
+  PluginTokenHandler,
+} from './plugin/PluginTokenHandler';
 import { createPluginKeySource } from './plugin/keys/createPluginKeySource';
 import { UserTokenHandler } from './user/UserTokenHandler';
 
+/**
+ * @public
+ * This service is used to decorate the default plugin token handler with custom logic.
+ */
+export const pluginTokenHandlerDecoratorServiceRef = createServiceRef<
+  (defaultImplementation: PluginTokenHandler) => PluginTokenHandler
+>({
+  id: 'core.auth.pluginTokenHandlerDecorator',
+  defaultFactory: async service =>
+    createServiceFactory({
+      service,
+      deps: {},
+      factory: async () => {
+        return impl => impl;
+      },
+    }),
+});
+
 /**
  * Handles token authentication and credentials management.
  *
@@ -37,12 +59,20 @@ export const authServiceFactory = createServiceFactory({
   service: coreServices.auth,
   deps: {
     config: coreServices.rootConfig,
-    logger: coreServices.rootLogger,
+    logger: coreServices.logger,
     discovery: coreServices.discovery,
     plugin: coreServices.pluginMetadata,
     database: coreServices.database,
+    pluginTokenHandlerDecorator: pluginTokenHandlerDecoratorServiceRef,
   },
-  async factory({ config, discovery, plugin, logger, database }) {
+  async factory({
+    config,
+    discovery,
+    plugin,
+    logger,
+    database,
+    pluginTokenHandlerDecorator,
+  }) {
     const disableDefaultAuthPolicy =
       config.getOptionalBoolean(
         'backend.auth.dangerouslyDisableDefaultAuthPolicy',
@@ -59,15 +89,18 @@ export const authServiceFactory = createServiceFactory({
 
     const userTokens = UserTokenHandler.create({
       discovery,
+      logger,
     });
 
-    const pluginTokens = PluginTokenHandler.create({
-      ownPluginId: plugin.getId(),
-      logger,
-      keySource,
-      keyDuration,
-      discovery,
-    });
+    const pluginTokens = pluginTokenHandlerDecorator(
+      DefaultPluginTokenHandler.create({
+        ownPluginId: plugin.getId(),
+        logger,
+        keySource,
+        keyDuration,
+        discovery,
+      }),
+    );
 
     const externalTokens = ExternalTokenHandler.create({
       ownPluginId: plugin.getId(),
diff --git a/packages/backend-defaults/src/entrypoints/auth/index.ts b/packages/backend-defaults/src/entrypoints/auth/index.ts
index 1b55d46a83..e48926f0ce 100644
--- a/packages/backend-defaults/src/entrypoints/auth/index.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/index.ts
@@ -14,4 +14,9 @@
  * limitations under the License.
  */
 
-export { authServiceFactory } from './authServiceFactory';
+export {
+  authServiceFactory,
+  pluginTokenHandlerDecoratorServiceRef,
+} from './authServiceFactory';
+
+export type { PluginTokenHandler } from './plugin/PluginTokenHandler';
diff --git a/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.test.ts b/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.test.ts
index ce470eff04..558bc5d0da 100644
--- a/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.test.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { mockServices } from '@backstage/backend-test-utils';
-import { PluginTokenHandler } from './PluginTokenHandler';
+import { DefaultPluginTokenHandler } from './PluginTokenHandler';
 import { decodeJwt } from 'jose';
 
 describe('PluginTokenHandler', () => {
@@ -42,7 +42,7 @@ describe('PluginTokenHandler', () => {
     });
 
     const getKeyMock = jest.fn(async () => mockPrivateKey);
-    const handler = PluginTokenHandler.create({
+    const handler = DefaultPluginTokenHandler.create({
       discovery: mockServices.discovery(),
       keyDuration: { seconds: 10 },
       logger: mockServices.logger.mock(),
diff --git a/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.ts b/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.ts
index ff594ecbd4..9aec52bc08 100644
--- a/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/plugin/PluginTokenHandler.ts
@@ -16,7 +16,7 @@
 
 import { DiscoveryService, LoggerService } from '@backstage/backend-plugin-api';
 import { decodeJwt, importJWK, SignJWT, decodeProtectedHeader } from 'jose';
-import { AuthenticationError } from '@backstage/errors';
+import { assertError, AuthenticationError } from '@backstage/errors';
 import { jwtVerify } from 'jose';
 import { tokenTypes } from '@backstage/plugin-auth-node';
 import { JwksClient } from '../JwksClient';
@@ -44,7 +44,22 @@ type Options = {
   algorithm?: string;
 };
 
-export class PluginTokenHandler {
+/**
+ * @public
+ * Issues and verifies {@link https://backstage.iceio/docs/auth/service-to-service-auth | service-to-service tokens}.
+ */
+export interface PluginTokenHandler {
+  verifyToken(
+    token: string,
+  ): Promise<{ subject: string; limitedUserToken?: string } | undefined>;
+  issueToken(options: {
+    pluginId: string;
+    targetPluginId: string;
+    onBehalfOf?: { limitedUserToken: string; expiresAt: Date };
+  }): Promise<{ token: string }>;
+}
+
+export class DefaultPluginTokenHandler implements PluginTokenHandler {
   private jwksMap = new Map<string, JwksClient>();
 
   // Tracking state for isTargetPluginSupported
@@ -52,7 +67,7 @@ export class PluginTokenHandler {
   private targetPluginInflightChecks = new Map<string, Promise<boolean>>();
 
   static create(options: Options) {
-    return new PluginTokenHandler(
+    return new DefaultPluginTokenHandler(
       options.logger,
       options.ownPluginId,
       options.keySource,
@@ -105,7 +120,8 @@ export class PluginTokenHandler {
         requiredClaims: ['iat', 'exp', 'sub', 'aud'],
       },
     ).catch(e => {
-      throw new AuthenticationError('Invalid plugin token', e);
+      this.logger.warn('Failed to verify incoming plugin token', e);
+      throw new AuthenticationError('Failed plugin token verification');
     });
 
     return { subject: `plugin:${payload.sub}`, limitedUserToken: payload.obo };
@@ -114,7 +130,7 @@ export class PluginTokenHandler {
   async issueToken(options: {
     pluginId: string;
     targetPluginId: string;
-    onBehalfOf?: { token: string; expiresAt: Date };
+    onBehalfOf?: { limitedUserToken: string; expiresAt: Date };
   }): Promise<{ token: string }> {
     const { pluginId, targetPluginId, onBehalfOf } = options;
     const key = await this.keySource.getPrivateSigningKey();
@@ -130,7 +146,7 @@ export class PluginTokenHandler {
         )
       : ourExp;
 
-    const claims = { sub, aud, iat, exp, obo: onBehalfOf?.token };
+    const claims = { sub, aud, iat, exp, obo: onBehalfOf?.limitedUserToken };
     const token = await new SignJWT(claims)
       .setProtectedHeader({
         typ: tokenTypes.plugin.typParam,
@@ -180,6 +196,7 @@ export class PluginTokenHandler {
         this.supportedTargetPlugins.add(targetPluginId);
         return true;
       } catch (error) {
+        assertError(error);
         this.logger.error('Unexpected failure for target JWKS check', error);
         return false;
       } finally {
diff --git a/packages/backend-defaults/src/entrypoints/auth/plugin/keys/DatabaseKeyStore.test.ts b/packages/backend-defaults/src/entrypoints/auth/plugin/keys/DatabaseKeyStore.test.ts
index 551cccaf73..feb253e7ed 100644
--- a/packages/backend-defaults/src/entrypoints/auth/plugin/keys/DatabaseKeyStore.test.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/plugin/keys/DatabaseKeyStore.test.ts
@@ -46,7 +46,7 @@ describe('DatabaseKeyStore', () => {
       knex,
       logger,
       keyStore: await DatabaseKeyStore.create({
-        database: { getClient: async () => knex },
+        database: mockServices.database({ knex }),
         logger,
       }),
     };
diff --git a/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.test.ts b/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.test.ts
index e85ec8db63..251e4c3adf 100644
--- a/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.test.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.test.ts
@@ -64,13 +64,17 @@ async function createToken(options: {
 describe('UserTokenHandler', () => {
   let userTokenHandler: UserTokenHandler;
 
+  const logger = mockServices.logger.mock();
+
   registerMswTestHooks(server);
 
   beforeEach(() => {
     jest.useRealTimers();
+    jest.resetAllMocks();
 
     userTokenHandler = UserTokenHandler.create({
       discovery: mockServices.discovery(),
+      logger,
     });
 
     server.use(
@@ -120,7 +124,7 @@ describe('UserTokenHandler', () => {
             signature: 'sig',
           }),
         ),
-      ).rejects.toThrow('signature verification failed');
+      ).rejects.toThrow('Failed user token verification');
 
       await expect(
         userTokenHandler.verifyToken(
@@ -130,7 +134,7 @@ describe('UserTokenHandler', () => {
             signature: 'sig',
           }),
         ),
-      ).rejects.toThrow('signature verification failed');
+      ).rejects.toThrow('Failed user token verification');
     });
 
     it('should fail to verify tokens that have a bad alg', async () => {
@@ -156,8 +160,13 @@ describe('UserTokenHandler', () => {
       });
       const token = `${header}.${payload}.`;
 
+      expect(logger.warn).not.toHaveBeenCalled();
       await expect(userTokenHandler.verifyToken(token)).rejects.toThrow(
-        /Unsupported "alg" value/,
+        'Failed user token verification',
+      );
+      expect(logger.warn).toHaveBeenCalledWith(
+        'Failed to verify incoming user token',
+        expect.any(Error),
       );
     });
 
diff --git a/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.ts b/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.ts
index 4dd1874843..d205fa6b82 100644
--- a/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/user/UserTokenHandler.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DiscoveryService } from '@backstage/backend-plugin-api';
+import { DiscoveryService, LoggerService } from '@backstage/backend-plugin-api';
 import { AuthenticationError } from '@backstage/errors';
 import { tokenTypes } from '@backstage/plugin-auth-node';
 import {
@@ -33,15 +33,21 @@ import { JwksClient } from '../JwksClient';
  * @internal
  */
 export class UserTokenHandler {
-  static create(options: { discovery: DiscoveryService }): UserTokenHandler {
+  static create(options: {
+    discovery: DiscoveryService;
+    logger: LoggerService;
+  }): UserTokenHandler {
     const jwksClient = new JwksClient(async () => {
       const url = await options.discovery.getBaseUrl('auth');
       return new URL(`${url}/.well-known/jwks.json`);
     });
-    return new UserTokenHandler(jwksClient);
+    return new UserTokenHandler(jwksClient, options.logger);
   }
 
-  constructor(private readonly jwksClient: JwksClient) {}
+  constructor(
+    private readonly jwksClient: JwksClient,
+    private readonly logger: LoggerService,
+  ) {}
 
   async verifyToken(token: string) {
     const verifyOpts = this.#getTokenVerificationOptions(token);
@@ -57,7 +63,8 @@ export class UserTokenHandler {
       this.jwksClient.getKey,
       verifyOpts,
     ).catch(e => {
-      throw new AuthenticationError('Invalid token', e);
+      this.logger.warn('Failed to verify incoming user token', e);
+      throw new AuthenticationError('Failed user token verification');
     });
 
     const userEntityRef = payload.sub;
diff --git a/packages/backend-defaults/src/entrypoints/cache/CacheManager.test.ts b/packages/backend-defaults/src/entrypoints/cache/CacheManager.test.ts
index 997739faa2..d15671d5d2 100644
--- a/packages/backend-defaults/src/entrypoints/cache/CacheManager.test.ts
+++ b/packages/backend-defaults/src/entrypoints/cache/CacheManager.test.ts
@@ -25,15 +25,21 @@ import { CacheManager } from './CacheManager';
 // Contrived code because it's hard to spy on a default export
 jest.mock('@keyv/redis', () => {
   const Actual = jest.requireActual('@keyv/redis');
-  return jest.fn((...args: any[]) => {
-    return new Actual(...args);
-  });
+  const DefaultConstructor = Actual.default;
+  return {
+    ...Actual,
+    __esModule: true,
+    default: jest.fn((...args: any[]) => new DefaultConstructor(...args)),
+  };
 });
 jest.mock('@keyv/memcache', () => {
   const Actual = jest.requireActual('@keyv/memcache');
-  return jest.fn((...args: any[]) => {
-    return new Actual(...args);
-  });
+  const DefaultConstructor = Actual.default;
+  return {
+    ...Actual,
+    __esModule: true,
+    default: jest.fn((...args: any[]) => new DefaultConstructor(...args)),
+  };
 });
 
 describe('CacheManager integration', () => {
@@ -42,7 +48,7 @@ describe('CacheManager integration', () => {
   afterEach(jest.clearAllMocks);
 
   it.each(caches.eachSupportedId())(
-    'only creates one underlying connection, %p',
+    'only creates one underlying connection per plugin, %p',
     async cacheId => {
       const { store, connection } = await caches.init(cacheId);
 
@@ -59,10 +65,10 @@ describe('CacheManager integration', () => {
 
       if (store === 'redis') {
         // eslint-disable-next-line jest/no-conditional-expect
-        expect(KeyvRedis).toHaveBeenCalledTimes(1);
+        expect(KeyvRedis).toHaveBeenCalledTimes(3);
       } else if (store === 'memcache') {
         // eslint-disable-next-line jest/no-conditional-expect
-        expect(KeyvMemcache).toHaveBeenCalledTimes(1);
+        expect(KeyvMemcache).toHaveBeenCalledTimes(3);
       }
     },
   );
@@ -185,6 +191,6 @@ describe('CacheManager integration', () => {
           },
         }),
       ),
-    ).toThrow(/Invalid configuration backend.cache.defaultTtl/);
+    ).toThrow(/Invalid duration 'hello' in config/);
   });
 });
diff --git a/packages/backend-defaults/src/entrypoints/cache/CacheManager.ts b/packages/backend-defaults/src/entrypoints/cache/CacheManager.ts
index a54959f155..57c326f00d 100644
--- a/packages/backend-defaults/src/entrypoints/cache/CacheManager.ts
+++ b/packages/backend-defaults/src/entrypoints/cache/CacheManager.ts
@@ -24,6 +24,7 @@ import Keyv from 'keyv';
 import { DefaultCacheClient } from './CacheClient';
 import { CacheManagerOptions, ttlToMilliseconds } from './types';
 import { durationToMilliseconds } from '@backstage/types';
+import { readDurationFromConfig } from '@backstage/config';
 
 type StoreFactory = (pluginId: string, defaultTtl: number | undefined) => Keyv;
 
@@ -48,7 +49,6 @@ export class CacheManager {
   private readonly logger?: LoggerService;
   private readonly store: keyof CacheManager['storeFactories'];
   private readonly connection: string;
-  private readonly useRedisSets: boolean;
   private readonly errorHandler: CacheManagerOptions['onError'];
   private readonly defaultTtl?: number;
 
@@ -68,24 +68,23 @@ export class CacheManager {
     const defaultTtlConfig = config.getOptional('backend.cache.defaultTtl');
     const connectionString =
       config.getOptionalString('backend.cache.connection') || '';
-    const useRedisSets =
-      config.getOptionalBoolean('backend.cache.useRedisSets') ?? true;
     const logger = options.logger?.child({
       type: 'cacheManager',
     });
 
+    if (config.has('backend.cache.useRedisSets')) {
+      logger?.warn(
+        "The 'backend.cache.useRedisSets' configuration key is deprecated and no longer has any effect. The underlying '@keyv/redis' library no longer supports redis sets.",
+      );
+    }
+
     let defaultTtl: number | undefined;
-    if (defaultTtlConfig !== undefined && defaultTtlConfig !== null) {
+    if (defaultTtlConfig !== undefined) {
       if (typeof defaultTtlConfig === 'number') {
         defaultTtl = defaultTtlConfig;
-      } else if (
-        typeof defaultTtlConfig === 'object' &&
-        !Array.isArray(defaultTtlConfig)
-      ) {
-        defaultTtl = durationToMilliseconds(defaultTtlConfig);
       } else {
-        throw new Error(
-          `Invalid configuration backend.cache.defaultTtl: ${defaultTtlConfig}, expected milliseconds number or HumanDuration object`,
+        defaultTtl = durationToMilliseconds(
+          readDurationFromConfig(config, { key: 'backend.cache.defaultTtl' }),
         );
       }
     }
@@ -93,7 +92,6 @@ export class CacheManager {
     return new CacheManager(
       store,
       connectionString,
-      useRedisSets,
       options.onError,
       logger,
       defaultTtl,
@@ -104,7 +102,6 @@ export class CacheManager {
   constructor(
     store: string,
     connectionString: string,
-    useRedisSets: boolean,
     errorHandler: CacheManagerOptions['onError'],
     logger?: LoggerService,
     defaultTtl?: number,
@@ -115,7 +112,6 @@ export class CacheManager {
     this.logger = logger;
     this.store = store as keyof CacheManager['storeFactories'];
     this.connection = connectionString;
-    this.useRedisSets = useRedisSets;
     this.errorHandler = errorHandler;
     this.defaultTtl = defaultTtl;
   }
@@ -143,15 +139,16 @@ export class CacheManager {
   }
 
   private createRedisStoreFactory(): StoreFactory {
-    const KeyvRedis = require('@keyv/redis');
-    let store: typeof KeyvRedis | undefined;
+    const KeyvRedis = require('@keyv/redis').default;
+    const stores: Record<string, typeof KeyvRedis> = {};
+
     return (pluginId, defaultTtl) => {
-      if (!store) {
-        store = new KeyvRedis(this.connection, {
-          useRedisSets: this.useRedisSets,
+      if (!stores[pluginId]) {
+        stores[pluginId] = new KeyvRedis(this.connection, {
+          keyPrefixSeparator: ':',
         });
         // Always provide an error handler to avoid stopping the process
-        store.on('error', (err: Error) => {
+        stores[pluginId].on('error', (err: Error) => {
           this.logger?.error('Failed to create redis cache client', err);
           this.errorHandler?.(err);
         });
@@ -159,21 +156,22 @@ export class CacheManager {
       return new Keyv({
         namespace: pluginId,
         ttl: defaultTtl,
-        store,
+        store: stores[pluginId],
         emitErrors: false,
-        useRedisSets: this.useRedisSets,
+        useKeyPrefix: false,
       });
     };
   }
 
   private createMemcacheStoreFactory(): StoreFactory {
-    const KeyvMemcache = require('@keyv/memcache');
-    let store: typeof KeyvMemcache | undefined;
+    const KeyvMemcache = require('@keyv/memcache').default;
+    const stores: Record<string, typeof KeyvMemcache> = {};
+
     return (pluginId, defaultTtl) => {
-      if (!store) {
-        store = new KeyvMemcache(this.connection);
+      if (!stores[pluginId]) {
+        stores[pluginId] = new KeyvMemcache(this.connection);
         // Always provide an error handler to avoid stopping the process
-        store.on('error', (err: Error) => {
+        stores[pluginId].on('error', (err: Error) => {
           this.logger?.error('Failed to create memcache cache client', err);
           this.errorHandler?.(err);
         });
@@ -182,7 +180,7 @@ export class CacheManager {
         namespace: pluginId,
         ttl: defaultTtl,
         emitErrors: false,
-        store,
+        store: stores[pluginId],
       });
     };
   }
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
index 27cb511477..fb8e4011a8 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
@@ -106,12 +106,8 @@ describe('DatabaseManagerImpl', () => {
     const impl = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: {
-            skipMigrations: true,
-            plugin: { plugin1: { skipMigrations: true } },
-          },
-        },
+        skipMigrations: true,
+        plugin: { plugin1: { skipMigrations: true } },
       }),
       {
         pg: connector,
@@ -139,9 +135,7 @@ describe('DatabaseManagerImpl', () => {
     const impl = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: { plugin: { plugin1: { skipMigrations: true } } },
-        },
+        plugin: { plugin1: { skipMigrations: true } },
       }),
       {
         pg: connector,
@@ -158,12 +152,8 @@ describe('DatabaseManagerImpl', () => {
     const impl2 = new DatabaseManagerImpl(
       new ConfigReader({
         client: 'pg',
-        backend: {
-          database: {
-            skipMigrations: true,
-            plugin: { plugin1: { skipMigrations: false } },
-          },
-        },
+        skipMigrations: true,
+        plugin: { plugin1: { skipMigrations: false } },
       }),
       {
         pg: connector,
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
index 7fddb17987..75e7d35eee 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
@@ -96,10 +96,8 @@ export class DatabaseManagerImpl {
 
     const skip =
       this.options?.migrations?.skip ??
-      this.config.getOptionalBoolean(
-        `backend.database.plugin.${pluginId}.skipMigrations`,
-      ) ??
-      this.config.getOptionalBoolean('backend.database.skipMigrations') ??
+      this.config.getOptionalBoolean(`plugin.${pluginId}.skipMigrations`) ??
+      this.config.getOptionalBoolean('skipMigrations') ??
       false;
 
     return { getClient, migrations: { skip } };
diff --git a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
index 1e07984967..1a3691c83b 100644
--- a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
+++ b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
@@ -22,6 +22,8 @@ import {
   parsePgConnectionString,
 } from './postgres';
 
+jest.mock('@google-cloud/cloud-sql-connector');
+
 describe('postgres', () => {
   const createMockConnection = () => ({
     host: 'acme',
@@ -37,33 +39,35 @@ describe('postgres', () => {
     new ConfigReader({ client: 'pg', connection });
 
   describe('buildPgDatabaseConfig', () => {
-    it('builds a postgres config', () => {
+    it('builds a postgres config', async () => {
       const mockConnection = createMockConnection();
 
-      expect(buildPgDatabaseConfig(createConfig(mockConnection))).toEqual({
-        client: 'pg',
-        connection: mockConnection,
-        useNullAsDefault: true,
-      });
-    });
-
-    it('builds a connection string config', () => {
-      const mockConnectionString = createMockConnectionString();
-
-      expect(buildPgDatabaseConfig(createConfig(mockConnectionString))).toEqual(
+      expect(await buildPgDatabaseConfig(createConfig(mockConnection))).toEqual(
         {
           client: 'pg',
-          connection: mockConnectionString,
+          connection: mockConnection,
           useNullAsDefault: true,
         },
       );
     });
 
-    it('overrides the database name', () => {
+    it('builds a connection string config', async () => {
+      const mockConnectionString = createMockConnectionString();
+
+      expect(
+        await buildPgDatabaseConfig(createConfig(mockConnectionString)),
+      ).toEqual({
+        client: 'pg',
+        connection: mockConnectionString,
+        useNullAsDefault: true,
+      });
+    });
+
+    it('overrides the database name', async () => {
       const mockConnection = createMockConnection();
 
       expect(
-        buildPgDatabaseConfig(createConfig(mockConnection), {
+        await buildPgDatabaseConfig(createConfig(mockConnection), {
           connection: { database: 'other_db' },
         }),
       ).toEqual({
@@ -76,14 +80,14 @@ describe('postgres', () => {
       });
     });
 
-    it('overrides the schema name', () => {
+    it('overrides the schema name', async () => {
       const mockConnection = {
         ...createMockConnection(),
         schema: 'schemaName',
       };
 
       expect(
-        buildPgDatabaseConfig(createConfig(mockConnection), {
+        await buildPgDatabaseConfig(createConfig(mockConnection), {
           searchPath: ['schemaName'],
         }),
       ).toEqual({
@@ -94,11 +98,11 @@ describe('postgres', () => {
       });
     });
 
-    it('adds additional config settings', () => {
+    it('adds additional config settings', async () => {
       const mockConnection = createMockConnection();
 
       expect(
-        buildPgDatabaseConfig(createConfig(mockConnection), {
+        await buildPgDatabaseConfig(createConfig(mockConnection), {
           connection: { database: 'other_db' },
           pool: { min: 0, max: 7 },
           debug: true,
@@ -115,12 +119,12 @@ describe('postgres', () => {
       });
     });
 
-    it('overrides the database from connection string', () => {
+    it('overrides the database from connection string', async () => {
       const mockConnectionString = createMockConnectionString();
       const mockConnection = createMockConnection();
 
       expect(
-        buildPgDatabaseConfig(createConfig(mockConnectionString), {
+        await buildPgDatabaseConfig(createConfig(mockConnectionString), {
           connection: { database: 'other_db' },
         }),
       ).toEqual({
@@ -133,6 +137,124 @@ describe('postgres', () => {
         useNullAsDefault: true,
       });
     });
+
+    it('uses the correct config when using cloudsql', async () => {
+      expect(
+        await buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'pg',
+            connection: {
+              type: 'cloudsql',
+              user: 'ben@gke.com',
+              instance: 'project:region:instance',
+              port: 5423,
+            },
+          }),
+          { connection: { database: 'other_db' } },
+        ),
+      ).toEqual({
+        client: 'pg',
+        connection: {
+          user: 'ben@gke.com',
+          port: 5423,
+          database: 'other_db',
+        },
+        useNullAsDefault: true,
+      });
+    });
+
+    it('should throw with incorrect config', async () => {
+      await expect(
+        buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'pg',
+            connection: {
+              type: 'cloudsql',
+            },
+          }),
+        ),
+      ).rejects.toThrow(/Missing instance connection name for Cloud SQL/);
+
+      await expect(
+        buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'not-pg',
+            connection: {
+              type: 'cloudsql',
+              instance: 'asd:asd:asd',
+            },
+          }),
+        ),
+      ).rejects.toThrow(/Cloud SQL only supports the pg client/);
+    });
+
+    it('adds the settings from cloud-sql-connector', async () => {
+      const { Connector } = jest.requireMock(
+        '@google-cloud/cloud-sql-connector',
+      ) as jest.Mocked<typeof import('@google-cloud/cloud-sql-connector')>;
+
+      const mockStream = (): any => {};
+      Connector.prototype.getOptions.mockResolvedValue({ stream: mockStream });
+
+      expect(
+        await buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'pg',
+            connection: {
+              type: 'cloudsql',
+              user: 'ben@gke.com',
+              instance: 'project:region:instance',
+              port: 5423,
+            },
+          }),
+          { connection: { database: 'other_db' } },
+        ),
+      ).toEqual({
+        client: 'pg',
+        connection: {
+          user: 'ben@gke.com',
+          port: 5423,
+          stream: mockStream,
+          database: 'other_db',
+        },
+        useNullAsDefault: true,
+      });
+    });
+
+    it('throws an error when the connection type is not supported', async () => {
+      await expect(
+        buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'pg',
+            connection: {
+              type: 'not-supported',
+            },
+          }),
+        ),
+      ).rejects.toThrow('Unknown connection type: not-supported');
+    });
+
+    it('supports default as the default connection type', async () => {
+      await expect(
+        buildPgDatabaseConfig(
+          new ConfigReader({
+            client: 'pg',
+            connection: {
+              type: 'default',
+              port: '5432',
+              database: 'other_db',
+            },
+          }),
+        ),
+      ).resolves.toEqual({
+        client: 'pg',
+        connection: {
+          port: '5432',
+          database: 'other_db',
+        },
+        useNullAsDefault: true,
+      });
+    });
   });
 
   describe('getPgConnectionConfig', () => {
@@ -174,9 +296,9 @@ describe('postgres', () => {
   });
 
   describe('createPgDatabaseClient', () => {
-    it('creates a postgres knex instance', () => {
+    it('creates a postgres knex instance', async () => {
       expect(
-        createPgDatabaseClient(
+        await createPgDatabaseClient(
           createConfig({
             host: 'acme',
             user: 'foo',
@@ -187,14 +309,14 @@ describe('postgres', () => {
       ).toBeTruthy();
     });
 
-    it('attempts to read an ssl cert', () => {
-      expect(() =>
+    it('attempts to read an ssl cert', async () => {
+      await expect(() =>
         createPgDatabaseClient(
           createConfig(
             'postgresql://postgres:pass@localhost:5432/dbname?sslrootcert=/path/to/file',
           ),
         ),
-      ).toThrow(/no such file or directory/);
+      ).rejects.toThrow(/no such file or directory/);
     });
   });
 
diff --git a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
index b5cfffd1f4..e7e973ae4b 100644
--- a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
+++ b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
@@ -37,11 +37,11 @@ const ddlLimiter = limiterFactory(1);
  * @param dbConfig - The database config
  * @param overrides - Additional options to merge with the config
  */
-export function createPgDatabaseClient(
+export async function createPgDatabaseClient(
   dbConfig: Config,
   overrides?: Knex.Config,
 ) {
-  const knexConfig = buildPgDatabaseConfig(dbConfig, overrides);
+  const knexConfig = await buildPgDatabaseConfig(dbConfig, overrides);
   const database = knexFactory(knexConfig);
 
   const role = dbConfig.getOptionalString('role');
@@ -64,11 +64,11 @@ export function createPgDatabaseClient(
  * @param dbConfig - The database config
  * @param overrides - Additional options to merge with the config
  */
-export function buildPgDatabaseConfig(
+export async function buildPgDatabaseConfig(
   dbConfig: Config,
   overrides?: Knex.Config,
 ) {
-  return mergeDatabaseConfig(
+  const config = mergeDatabaseConfig(
     dbConfig.get(),
     {
       connection: getPgConnectionConfig(dbConfig, !!overrides),
@@ -76,6 +76,49 @@ export function buildPgDatabaseConfig(
     },
     overrides,
   );
+
+  const sanitizedConfig = JSON.parse(JSON.stringify(config));
+
+  // Trim additional properties from the connection object passed to knex
+  delete sanitizedConfig.connection.type;
+  delete sanitizedConfig.connection.instance;
+
+  if (config.connection.type === 'default' || !config.connection.type) {
+    return sanitizedConfig;
+  }
+
+  if (config.connection.type !== 'cloudsql') {
+    throw new Error(`Unknown connection type: ${config.connection.type}`);
+  }
+
+  if (config.client !== 'pg') {
+    throw new Error('Cloud SQL only supports the pg client');
+  }
+
+  if (!config.connection.instance) {
+    throw new Error('Missing instance connection name for Cloud SQL');
+  }
+
+  const {
+    Connector: CloudSqlConnector,
+    IpAddressTypes,
+    AuthTypes,
+  } = await import('@google-cloud/cloud-sql-connector');
+  const connector = new CloudSqlConnector();
+  const clientOpts = await connector.getOptions({
+    instanceConnectionName: config.connection.instance,
+    ipType: IpAddressTypes.PUBLIC,
+    authType: AuthTypes.IAM,
+  });
+
+  return {
+    ...sanitizedConfig,
+    client: 'pg',
+    connection: {
+      ...sanitizedConfig.connection,
+      ...clientOpts,
+    },
+  };
 }
 
 /**
@@ -130,7 +173,7 @@ export async function ensurePgDatabaseExists(
   dbConfig: Config,
   ...databases: Array<string>
 ) {
-  const admin = createPgDatabaseClient(dbConfig, {
+  const admin = await createPgDatabaseClient(dbConfig, {
     connection: {
       database: 'postgres',
     },
@@ -186,7 +229,7 @@ export async function ensurePgSchemaExists(
   dbConfig: Config,
   ...schemas: Array<string>
 ): Promise<void> {
-  const admin = createPgDatabaseClient(dbConfig);
+  const admin = await createPgDatabaseClient(dbConfig);
   const role = dbConfig.getOptionalString('role');
 
   try {
@@ -219,7 +262,7 @@ export async function dropPgDatabase(
   dbConfig: Config,
   ...databases: Array<string>
 ) {
-  const admin = createPgDatabaseClient(dbConfig);
+  const admin = await createPgDatabaseClient(dbConfig);
   try {
     await Promise.all(
       databases.map(async database => {
diff --git a/packages/backend-defaults/src/entrypoints/httpAuth/DefaultHttpAuthService.test.ts b/packages/backend-defaults/src/entrypoints/httpAuth/DefaultHttpAuthService.test.ts
new file mode 100644
index 0000000000..e314564b59
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/httpAuth/DefaultHttpAuthService.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { DefaultHttpAuthService } from './httpAuthServiceFactory';
+import { mockServices } from '@backstage/backend-test-utils';
+import { createRequest } from 'node-mocks-http';
+
+describe('DefaultHttpAuthService', () => {
+  it('should extract token from custom header', async () => {
+    const auth = mockServices.auth.mock();
+    const httpAuthService = DefaultHttpAuthService.create({
+      discovery: mockServices.discovery(),
+      auth,
+      pluginId: 'test',
+      getTokenFromRequest: req => {
+        let token: string | undefined;
+        const header = req.headers.test;
+        if (typeof header === 'string') {
+          token = header;
+        }
+        return { token };
+      },
+    });
+    await httpAuthService.credentials(
+      createRequest({ headers: { test: 'mock-user-token' } }),
+    );
+    expect(auth.authenticate).toHaveBeenCalledWith('mock-user-token');
+  });
+});
diff --git a/packages/backend-defaults/src/entrypoints/httpAuth/httpAuthServiceFactory.ts b/packages/backend-defaults/src/entrypoints/httpAuth/httpAuthServiceFactory.ts
index 76550873f6..4bc6b3b1fc 100644
--- a/packages/backend-defaults/src/entrypoints/httpAuth/httpAuthServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/httpAuth/httpAuthServiceFactory.ts
@@ -33,17 +33,14 @@ const FIVE_MINUTES_MS = 5 * 60 * 1000;
 const BACKSTAGE_AUTH_COOKIE = 'backstage-auth';
 
 function getTokenFromRequest(req: Request) {
-  // TODO: support multiple auth headers (iterate rawHeaders)
+  let token: string | undefined;
   const authHeader = req.headers.authorization;
   if (typeof authHeader === 'string') {
     const matches = authHeader.match(/^Bearer[ ]+(\S+)$/i);
-    const token = matches?.[1];
-    if (token) {
-      return token;
-    }
+    token = matches?.[1];
   }
 
-  return undefined;
+  return { token };
 }
 
 function getCookieFromRequest(req: Request) {
@@ -71,23 +68,55 @@ type RequestWithCredentials = Request & {
   [limitedCredentialsSymbol]?: Promise<BackstageCredentials>;
 };
 
-class DefaultHttpAuthService implements HttpAuthService {
+/**
+ * @public
+ * Options for creating a DefaultHttpAuthService.
+ */
+export interface DefaultHttpAuthServiceOptions {
+  auth: AuthService;
+  discovery: DiscoveryService;
+  pluginId: string;
+  /**
+   * Optionally override logic for extracting the token from the request.
+   */
+  getTokenFromRequest?: (req: Request) => { token?: string };
+}
+
+/**
+ * @public
+ * DefaultHttpAuthService is the default implementation of the HttpAuthService
+ */
+export class DefaultHttpAuthService implements HttpAuthService {
   readonly #auth: AuthService;
   readonly #discovery: DiscoveryService;
   readonly #pluginId: string;
+  readonly #getToken: (req: Request) => { token?: string };
 
-  constructor(
+  private constructor(
     auth: AuthService,
     discovery: DiscoveryService,
     pluginId: string,
+    getToken?: (req: Request) => { token?: string },
   ) {
     this.#auth = auth;
     this.#discovery = discovery;
     this.#pluginId = pluginId;
+    this.#getToken = getToken ?? getTokenFromRequest;
+  }
+
+  static create(
+    options: DefaultHttpAuthServiceOptions,
+  ): DefaultHttpAuthService {
+    return new DefaultHttpAuthService(
+      options.auth,
+      options.discovery,
+      options.pluginId,
+      options.getTokenFromRequest,
+    );
   }
 
   async #extractCredentialsFromRequest(req: Request) {
-    const token = getTokenFromRequest(req);
+    const { token } = this.#getToken(req);
     if (!token) {
       return await this.#auth.getNoneCredentials();
     }
@@ -96,7 +125,7 @@ class DefaultHttpAuthService implements HttpAuthService {
   }
 
   async #extractLimitedCredentialsFromRequest(req: Request) {
-    const token = getTokenFromRequest(req);
+    const { token } = this.#getToken(req);
     if (token) {
       return await this.#auth.authenticate(token, {
         allowLimitedAccess: true,
@@ -289,6 +318,10 @@ export const httpAuthServiceFactory = createServiceFactory({
     plugin: coreServices.pluginMetadata,
   },
   async factory({ auth, discovery, plugin }) {
-    return new DefaultHttpAuthService(auth, discovery, plugin.getId());
+    return DefaultHttpAuthService.create({
+      auth,
+      discovery,
+      pluginId: plugin.getId(),
+    });
   },
 });
diff --git a/packages/backend-defaults/src/entrypoints/httpAuth/index.ts b/packages/backend-defaults/src/entrypoints/httpAuth/index.ts
index edd7e53026..9afe06ae0e 100644
--- a/packages/backend-defaults/src/entrypoints/httpAuth/index.ts
+++ b/packages/backend-defaults/src/entrypoints/httpAuth/index.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { httpAuthServiceFactory } from './httpAuthServiceFactory';
+export {
+  httpAuthServiceFactory,
+  DefaultHttpAuthService,
+} from './httpAuthServiceFactory';
+export type { DefaultHttpAuthServiceOptions } from './httpAuthServiceFactory';
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createAuthIntegrationRouter.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createAuthIntegrationRouter.ts
similarity index 98%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createAuthIntegrationRouter.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createAuthIntegrationRouter.ts
index ef36e7ba2d..3d36ef8e34 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/createAuthIntegrationRouter.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/http/createAuthIntegrationRouter.ts
@@ -18,6 +18,9 @@ import { AuthService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import Router from 'express-promise-router';
 
+/**
+ * @public
+ */
 export function createAuthIntegrationRouter(options: {
   auth: AuthService;
 }): express.Router {
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCookieAuthRefreshMiddleware.test.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createCookieAuthRefreshMiddleware.test.ts
similarity index 100%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createCookieAuthRefreshMiddleware.test.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createCookieAuthRefreshMiddleware.test.ts
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCookieAuthRefreshMiddleware.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createCookieAuthRefreshMiddleware.ts
similarity index 100%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createCookieAuthRefreshMiddleware.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createCookieAuthRefreshMiddleware.ts
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createCredentialsBarrier.test.ts
similarity index 100%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createCredentialsBarrier.test.ts
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createCredentialsBarrier.ts
similarity index 99%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createCredentialsBarrier.ts
index dd6c95ca82..f6332c6d28 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/http/createCredentialsBarrier.ts
@@ -36,6 +36,9 @@ export function createPathPolicyPredicate(policyPath: string) {
   };
 }
 
+/**
+ * @public
+ */
 export function createCredentialsBarrier(options: {
   httpAuth: HttpAuthService;
   config: RootConfigService;
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.test.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.test.ts
similarity index 96%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.test.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.test.ts
index 31eecf14bb..3b85c8cb92 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.test.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { createLifecycleMiddleware } from './createLifecycleMiddleware';
-import { BackendLifecycleImpl } from '../rootLifecycle/rootLifecycleServiceFactory';
+import { BackendLifecycleImpl } from '../../rootLifecycle/rootLifecycleServiceFactory';
 import { mockServices } from '@backstage/backend-test-utils';
 import { ServiceUnavailableError } from '@backstage/errors';
 
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.ts
similarity index 99%
rename from packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.ts
rename to packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.ts
index 18ff2f0840..3f8ee3ea69 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/createLifecycleMiddleware.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/http/createLifecycleMiddleware.ts
@@ -23,7 +23,7 @@ export const DEFAULT_TIMEOUT = { seconds: 5 };
 
 /**
  * Options for {@link createLifecycleMiddleware}.
- * @internal
+ * @public
  */
 export interface LifecycleMiddlewareOptions {
   lifecycle: LifecycleService;
@@ -47,7 +47,7 @@ export interface LifecycleMiddlewareOptions {
  * If the service is shutting down, all requests will be rejected with a
  * {@link @backstage/errors#ServiceUnavailableError}.
  *
- * @internal
+ * @public
  */
 export function createLifecycleMiddleware(
   options: LifecycleMiddlewareOptions,
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/http/index.ts b/packages/backend-defaults/src/entrypoints/httpRouter/http/index.ts
new file mode 100644
index 0000000000..d31ea74fe8
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/http/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { createAuthIntegrationRouter } from './createAuthIntegrationRouter';
+export { createCredentialsBarrier } from './createCredentialsBarrier';
+export { createLifecycleMiddleware } from './createLifecycleMiddleware';
+export type { LifecycleMiddlewareOptions } from './createLifecycleMiddleware';
+export { createCookieAuthRefreshMiddleware } from './createCookieAuthRefreshMiddleware';
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/httpRouterServiceFactory.ts b/packages/backend-defaults/src/entrypoints/httpRouter/httpRouterServiceFactory.ts
index fb2646580b..a448827e16 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/httpRouterServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/httpRouterServiceFactory.ts
@@ -21,10 +21,11 @@ import {
   createServiceFactory,
   HttpRouterServiceAuthPolicy,
 } from '@backstage/backend-plugin-api';
-import { createLifecycleMiddleware } from './createLifecycleMiddleware';
-import { createCredentialsBarrier } from './createCredentialsBarrier';
-import { createAuthIntegrationRouter } from './createAuthIntegrationRouter';
-import { createCookieAuthRefreshMiddleware } from './createCookieAuthRefreshMiddleware';
+import {
+  createCookieAuthRefreshMiddleware,
+  createCredentialsBarrier,
+  createAuthIntegrationRouter,
+} from './http';
 
 /**
  * HTTP route registration for plugins.
@@ -41,12 +42,11 @@ export const httpRouterServiceFactory = createServiceFactory({
   deps: {
     plugin: coreServices.pluginMetadata,
     config: coreServices.rootConfig,
-    lifecycle: coreServices.lifecycle,
     rootHttpRouter: coreServices.rootHttpRouter,
     auth: coreServices.auth,
     httpAuth: coreServices.httpAuth,
   },
-  async factory({ auth, httpAuth, config, plugin, rootHttpRouter, lifecycle }) {
+  async factory({ auth, httpAuth, config, plugin, rootHttpRouter }) {
     const router = PromiseRouter();
 
     rootHttpRouter.use(`/api/${plugin.getId()}`, router);
@@ -57,7 +57,6 @@ export const httpRouterServiceFactory = createServiceFactory({
     });
 
     router.use(createAuthIntegrationRouter({ auth }));
-    router.use(createLifecycleMiddleware({ lifecycle }));
     router.use(credentialsBarrier.middleware);
     router.use(createCookieAuthRefreshMiddleware({ auth, httpAuth }));
 
diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/index.ts b/packages/backend-defaults/src/entrypoints/httpRouter/index.ts
index 15bced5ef3..fc9752bdc1 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/index.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { httpRouterServiceFactory } from './httpRouterServiceFactory';
+export * from './http';
diff --git a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
index 0eee5c18c6..ca9085273c 100644
--- a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
@@ -53,11 +53,11 @@ describe('DefaultRootHealthService', () => {
 
     it(`should return a 500 response if the server has stopped`, async () => {
       let mockServerStartedFn = () => {};
-      let mockServerStoppedFn = () => {};
+      let mockServerBeforeStoppedFn = () => {};
 
       const lifecycle = mockServices.rootLifecycle.mock({
         addStartupHook: jest.fn(fn => (mockServerStartedFn = fn)),
-        addShutdownHook: jest.fn(fn => (mockServerStoppedFn = fn)),
+        addBeforeShutdownHook: jest.fn(fn => (mockServerBeforeStoppedFn = fn)),
       });
 
       const service = new DefaultRootHealthService({
@@ -65,11 +65,11 @@ describe('DefaultRootHealthService', () => {
       });
 
       mockServerStartedFn();
-      mockServerStoppedFn();
+      mockServerBeforeStoppedFn();
       await expect(service.getReadiness()).resolves.toEqual({
         status: 503,
         payload: {
-          message: 'Backend has not started yet',
+          message: 'Backend is shuttting down',
           status: 'error',
         },
       });
diff --git a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.ts b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.ts
index c8b4ad5394..b201079b4f 100644
--- a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.ts
@@ -23,14 +23,14 @@ import {
 
 /** @internal */
 export class DefaultRootHealthService implements RootHealthService {
-  #isRunning = false;
+  #state: 'init' | 'up' | 'down' = 'init';
 
   constructor(readonly options: { lifecycle: RootLifecycleService }) {
     options.lifecycle.addStartupHook(() => {
-      this.#isRunning = true;
+      this.#state = 'up';
     });
-    options.lifecycle.addShutdownHook(() => {
-      this.#isRunning = false;
+    options.lifecycle.addBeforeShutdownHook(() => {
+      this.#state = 'down';
     });
   }
 
@@ -39,12 +39,18 @@ export class DefaultRootHealthService implements RootHealthService {
   }
 
   async getReadiness(): Promise<{ status: number; payload?: any }> {
-    if (!this.#isRunning) {
+    if (this.#state === 'init') {
       return {
         status: 503,
         payload: { message: 'Backend has not started yet', status: 'error' },
       };
     }
+    if (this.#state === 'down') {
+      return {
+        status: 503,
+        payload: { message: 'Backend is shuttting down', status: 'error' },
+      };
+    }
 
     return { status: 200, payload: { status: 'ok' } };
   }
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
index 3772ab0fab..a22f4f32a0 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
@@ -14,20 +14,50 @@
  * limitations under the License.
  */
 
-import { RootHealthService } from '@backstage/backend-plugin-api';
+import {
+  RootConfigService,
+  RootHealthService,
+} from '@backstage/backend-plugin-api';
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 
+const HEADER_CONFIG_KEY = 'backend.health.headers';
+
 /**
  * @public
  */
-export function createHealthRouter(options: { health: RootHealthService }) {
+export function createHealthRouter(options: {
+  health: RootHealthService;
+  config: RootConfigService;
+}) {
+  const headersConfig = options.config
+    .getOptionalConfig(HEADER_CONFIG_KEY)
+    ?.get();
+  if (headersConfig) {
+    for (const [key, value] of Object.entries(headersConfig)) {
+      if (!key || typeof key !== 'string') {
+        throw new Error(
+          `Invalid header name in at ${HEADER_CONFIG_KEY}, must be a non-empty string`,
+        );
+      }
+      if (!value || typeof value !== 'string') {
+        throw new Error(
+          `Invalid header value in at ${HEADER_CONFIG_KEY}, must be a non-empty string`,
+        );
+      }
+    }
+  }
+  const headers = headersConfig && new Headers(headersConfig as HeadersInit);
+
   const router = Router();
 
   router.get(
     '/.backstage/health/v1/readiness',
     async (_request: Request, response: Response) => {
       const { status, payload } = await options.health.getReadiness();
+      if (headers) {
+        response.setHeaders(headers);
+      }
       response.status(status).json(payload);
     },
   );
@@ -36,6 +66,9 @@ export function createHealthRouter(options: { health: RootHealthService }) {
     '/.backstage/health/v1/liveness',
     async (_request: Request, response: Response) => {
       const { status, payload } = await options.health.getLiveness();
+      if (headers) {
+        response.setHeaders(headers);
+      }
       response.status(status).json(payload);
     },
   );
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.test.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.test.ts
new file mode 100644
index 0000000000..76af28cc6e
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.test.ts
@@ -0,0 +1,108 @@
+/*
+ * 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 { createLifecycleMiddleware } from './createLifecycleMiddleware';
+import { BackendLifecycleImpl } from '../rootLifecycle/rootLifecycleServiceFactory';
+import { mockServices } from '@backstage/backend-test-utils';
+import { ServiceUnavailableError } from '@backstage/errors';
+
+describe('createLifecycleMiddleware', () => {
+  it('should pause requests when plugin is not ready', async () => {
+    const lifecycle = new BackendLifecycleImpl(mockServices.rootLogger());
+
+    const middleware = createLifecycleMiddleware({ lifecycle });
+
+    const next = jest.fn();
+    middleware({} as any, {} as any, next);
+    expect(next).not.toHaveBeenCalled();
+    await lifecycle.startup();
+
+    // pending call
+    expect(next).toHaveBeenCalledWith();
+
+    // new call
+    const next2 = jest.fn();
+    middleware({} as any, {} as any, next2);
+    expect(next2).toHaveBeenCalledWith();
+  });
+
+  it('should throw ServiceUnavailableError after shutdown', async () => {
+    const lifecycle = new BackendLifecycleImpl(mockServices.rootLogger());
+    const middleware = createLifecycleMiddleware({ lifecycle });
+
+    const next = jest.fn();
+    middleware({} as any, {} as any, next);
+    expect(next).not.toHaveBeenCalled();
+    await lifecycle.shutdown();
+
+    // pending call
+    expect(next).toHaveBeenCalledWith(
+      new ServiceUnavailableError('Service is shutting down'),
+    );
+
+    // new call
+    const next2 = jest.fn();
+    middleware({} as any, {} as any, next2);
+    expect(next2).toHaveBeenCalledWith(
+      new ServiceUnavailableError('Service is shutting down'),
+    );
+  });
+
+  it('should throw ServiceUnavailableError after timeout', async () => {
+    const lifecycle = new BackendLifecycleImpl(mockServices.rootLogger());
+    const middleware = createLifecycleMiddleware({
+      lifecycle,
+      startupRequestPauseTimeout: { milliseconds: 1 },
+    });
+
+    const next = jest.fn();
+    middleware({} as any, {} as any, next);
+    expect(next).not.toHaveBeenCalled();
+
+    await new Promise(r => setTimeout(r, 2));
+
+    expect(next).toHaveBeenCalledWith(
+      new ServiceUnavailableError('Service has not started up yet'),
+    );
+  });
+
+  it('should delay service shutdown for the default timeout duration', async () => {
+    jest.useFakeTimers();
+    const defaultTimeout = 30000;
+    const lifecycle = new BackendLifecycleImpl(mockServices.rootLogger());
+    createLifecycleMiddleware({ lifecycle });
+    const beforeShutdownPromise = lifecycle.beforeShutdown().then(() => {
+      jest.useRealTimers();
+    });
+    jest.advanceTimersByTime(defaultTimeout);
+    return expect(beforeShutdownPromise).resolves.toBeUndefined();
+  });
+
+  it('should delay service shutdown for the configured timeout duration - time in human duration', async () => {
+    jest.useFakeTimers();
+    const configuredTimeout = 20000;
+    const lifecycle = new BackendLifecycleImpl(mockServices.rootLogger());
+    createLifecycleMiddleware({
+      lifecycle,
+      serverShutdownDelay: { milliseconds: configuredTimeout },
+    });
+    const beforeShutdownPromise = lifecycle.beforeShutdown().then(() => {
+      jest.useRealTimers();
+    });
+    jest.advanceTimersByTime(configuredTimeout);
+    return expect(beforeShutdownPromise).resolves.toBeUndefined();
+  });
+});
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.ts
new file mode 100644
index 0000000000..3745f7f48d
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createLifecycleMiddleware.ts
@@ -0,0 +1,124 @@
+/*
+ * 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 { RootLifecycleService } from '@backstage/backend-plugin-api';
+import { ServiceUnavailableError } from '@backstage/errors';
+import { HumanDuration, durationToMilliseconds } from '@backstage/types';
+import { RequestHandler } from 'express';
+
+export const DEFAULT_STARTUP_REQUEST_PAUSE_TIMEOUT = { seconds: 5 };
+export const DEFAULT_SERVER_SHUTDOWN_TIMEOUT = { seconds: 0 };
+
+/**
+ * Options for {@link createLifecycleMiddleware}.
+ * @public
+ */
+export interface LifecycleMiddlewareOptions {
+  lifecycle: RootLifecycleService;
+  /**
+   * The maximum time that paused requests will wait for the service to start, before returning an error.
+   *
+   * Defaults to 5 seconds.
+   */
+  startupRequestPauseTimeout?: HumanDuration;
+  /**
+   * The maximum time that the server will wait for stop accepting traffic, before returning an error.
+   *
+   * Defaults to 0 seconds.
+   */
+  serverShutdownDelay?: HumanDuration;
+}
+
+/**
+ * Creates a middleware that pauses requests until the service has started.
+ *
+ * @remarks
+ *
+ * Requests that arrive before the service has started will be paused until startup is complete.
+ * If the service does not start within the provided timeout, the request will be rejected with a
+ * {@link @backstage/errors#ServiceUnavailableError}.
+ *
+ * If the service is shutting down, all requests will be rejected with a
+ * {@link @backstage/errors#ServiceUnavailableError}.
+ *
+ * @public
+ */
+export function createLifecycleMiddleware(
+  options: LifecycleMiddlewareOptions,
+): RequestHandler {
+  const { lifecycle, startupRequestPauseTimeout, serverShutdownDelay } =
+    options;
+
+  let state: 'init' | 'up' | 'down' = 'init';
+  const waiting = new Set<{
+    next: (err?: Error) => void;
+    timeout: NodeJS.Timeout;
+  }>();
+
+  lifecycle.addStartupHook(async () => {
+    if (state === 'init') {
+      state = 'up';
+      for (const item of waiting) {
+        clearTimeout(item.timeout);
+        item.next();
+      }
+      waiting.clear();
+    }
+  });
+
+  lifecycle.addBeforeShutdownHook(async () => {
+    const timeoutMs = durationToMilliseconds(
+      serverShutdownDelay ?? DEFAULT_SERVER_SHUTDOWN_TIMEOUT,
+    );
+    return await new Promise(resolve => {
+      setTimeout(resolve, timeoutMs);
+    });
+  });
+
+  lifecycle.addShutdownHook(async () => {
+    state = 'down';
+    for (const item of waiting) {
+      clearTimeout(item.timeout);
+      item.next(new ServiceUnavailableError('Service is shutting down'));
+    }
+    waiting.clear();
+  });
+
+  return (_req, _res, next) => {
+    if (state === 'up') {
+      next();
+      return;
+    } else if (state === 'down') {
+      next(new ServiceUnavailableError('Service is shutting down'));
+      return;
+    }
+
+    const timeoutMs = durationToMilliseconds(
+      startupRequestPauseTimeout ?? DEFAULT_STARTUP_REQUEST_PAUSE_TIMEOUT,
+    );
+
+    const item = {
+      next,
+      timeout: setTimeout(() => {
+        if (waiting.delete(item)) {
+          next(new ServiceUnavailableError('Service has not started up yet'));
+        }
+      }, timeoutMs),
+    };
+
+    waiting.add(item);
+  };
+}
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
index 418d170365..1c140791b6 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
@@ -27,33 +27,22 @@ import express from 'express';
 import createError from 'http-errors';
 import request from 'supertest';
 import { MiddlewareFactory } from './MiddlewareFactory';
-import { ConfigReader } from '@backstage/config';
+import { mockServices } from '@backstage/backend-test-utils';
+
+jest.useFakeTimers({ now: new Date('2024-11-20T00:00:00Z') });
 
 describe('MiddlewareFactory', () => {
   describe('middleware.error', () => {
-    const childLogger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      debug: jest.fn(),
-      child: jest.fn(),
-    };
-
-    const logger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      debug: jest.fn(),
-      child: () => childLogger,
-    };
+    const childLogger = mockServices.logger.mock();
+    const logger = mockServices.logger.mock({ child: () => childLogger });
 
     const middleware = MiddlewareFactory.create({
       logger,
-      config: new ConfigReader({}),
+      config: mockServices.rootConfig.mock(),
     });
 
     beforeEach(() => {
-      jest.resetAllMocks();
+      jest.clearAllMocks();
     });
 
     it('gives default code and message', async () => {
@@ -195,9 +184,7 @@ describe('MiddlewareFactory', () => {
     it('should filter out internal errors', async () => {
       const app = express();
 
-      const grandChildLogger = {
-        error: jest.fn(),
-      };
+      const grandChildLogger = mockServices.logger.mock();
       childLogger.child.mockReturnValue(grandChildLogger);
 
       class DatabaseError extends Error {}
@@ -254,5 +241,57 @@ describe('MiddlewareFactory', () => {
 
       expect(childLogger.error).toHaveBeenCalled();
     });
+
+    it('should log incoming requests', async () => {
+      const app = express();
+      app.use(middleware.logging());
+      app.get('/', (_req, res) => res.send(''));
+
+      await request(app).get('/').expect(200);
+
+      expect(logger.info).toHaveBeenCalledWith(
+        expect.stringContaining(
+          '[2024-11-20T00:00:00.000Z] "GET / HTTP/1.1" 200 0 "-" "-"',
+        ),
+        {
+          type: 'incomingRequest',
+          date: '2024-11-20T00:00:00.000Z',
+          method: 'GET',
+          url: '/',
+          status: 200,
+          httpVersion: '1.1',
+          contentLength: 0,
+        },
+      );
+    });
+
+    it('should log request with all data fields', async () => {
+      const app = express();
+      app.use(middleware.logging());
+      app.get('/', (_req, res) => res.send('Hello World'));
+
+      await request(app)
+        .get('/')
+        .set('User-Agent', 'test-agent')
+        .set('referrer', 'test-referrer')
+        .expect(200);
+
+      expect(logger.info).toHaveBeenCalledWith(
+        expect.stringContaining(
+          '[2024-11-20T00:00:00.000Z] "GET / HTTP/1.1" 200 11 "test-referrer" "test-agent"',
+        ),
+        {
+          type: 'incomingRequest',
+          date: '2024-11-20T00:00:00.000Z',
+          method: 'GET',
+          url: '/',
+          status: 200,
+          httpVersion: '1.1',
+          userAgent: 'test-agent',
+          referrer: 'test-referrer',
+          contentLength: 11,
+        },
+      );
+    });
   });
 });
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
index f38c10820a..1ff9bd15d1 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
@@ -27,7 +27,6 @@ import {
 } from 'express';
 import cors from 'cors';
 import helmet from 'helmet';
-import morgan from 'morgan';
 import compression from 'compression';
 import { readHelmetOptions } from './readHelmetOptions';
 import { readCorsOptions } from './readCorsOptions';
@@ -45,6 +44,45 @@ import {
 import { NotImplementedError } from '@backstage/errors';
 import { applyInternalErrorFilter } from './applyInternalErrorFilter';
 
+type LogMeta = {
+  date: string;
+  method: string;
+  url: string;
+  status: number;
+  httpVersion: string;
+  userAgent?: string;
+  contentLength?: number;
+  referrer?: string;
+};
+
+function getLogMeta(req: Request, res: Response): LogMeta {
+  const referrer = req.headers.referer ?? req.headers.referrer;
+  const userAgent = req.headers['user-agent'];
+  const contentLength = Number(res.getHeader('content-length'));
+
+  const meta: LogMeta = {
+    date: new Date().toISOString(),
+    method: req.method,
+    url: req.originalUrl ?? req.url,
+    status: res.statusCode,
+    httpVersion: `${req.httpVersionMajor}.${req.httpVersionMinor}`,
+  };
+
+  if (userAgent) {
+    meta.userAgent = userAgent;
+  }
+
+  if (isFinite(contentLength)) {
+    meta.contentLength = contentLength;
+  }
+
+  if (referrer) {
+    meta.referrer = Array.isArray(referrer) ? referrer.join(', ') : referrer;
+  }
+
+  return meta;
+}
+
 /**
  * Options used to create a {@link MiddlewareFactory}.
  *
@@ -137,18 +175,24 @@ export class MiddlewareFactory {
    * @returns An Express request handler
    */
   logging(): RequestHandler {
-    const logger = this.#logger.child({
-      type: 'incomingRequest',
-    });
-    const customMorganFormat =
-      '[:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"';
-    return morgan(customMorganFormat, {
-      stream: {
-        write(message: string) {
-          logger.info(message.trimEnd());
-        },
-      },
-    });
+    const logger = this.#logger;
+    return (req: Request, res: Response, next: NextFunction) => {
+      res.on('finish', () => {
+        const meta = getLogMeta(req, res);
+        logger.info(
+          `[${meta.date}] "${meta.method} ${meta.url} HTTP/${
+            meta.httpVersion
+          }" ${meta.status} ${meta.contentLength ?? 0} "${
+            meta.referrer ?? '-'
+          }" "${meta.userAgent ?? '-'}"`,
+          {
+            type: 'incomingRequest',
+            ...meta,
+          },
+        );
+      });
+      next();
+    };
   }
 
   /**
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/createHttpServer.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/createHttpServer.ts
index 5c526ba1e2..9449291628 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/createHttpServer.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/createHttpServer.ts
@@ -16,7 +16,6 @@
 
 import * as http from 'http';
 import * as https from 'https';
-import stoppableServer from 'stoppable';
 import { RequestListener } from 'http';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { HttpServerOptions, ExtendedHttpServer } from './types';
@@ -33,13 +32,6 @@ export async function createHttpServer(
   deps: { logger: LoggerService },
 ): Promise<ExtendedHttpServer> {
   const server = await createServer(listener, options, deps);
-
-  const stopper = stoppableServer(server, 0);
-  // The stopper here is actually the server itself, so if we try
-  // to call stopper.stop() down in the stop implementation, we'll
-  // be calling ourselves.
-  const stopServer = stopper.stop.bind(stopper);
-
   return Object.assign(server, {
     start() {
       return new Promise<void>((resolve, reject) => {
@@ -61,7 +53,7 @@ export async function createHttpServer(
 
     stop() {
       return new Promise<void>((resolve, reject) => {
-        stopServer((error?: Error) => {
+        server.close(error => {
           if (error) {
             reject(error);
           } else {
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts
index dea0159dff..fb0d6cdad0 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts
@@ -21,16 +21,205 @@ import {
 import { Express } from 'express';
 import request from 'supertest';
 import { rootHttpRouterServiceFactory } from './rootHttpRouterServiceFactory';
-import { coreServices } from '@backstage/backend-plugin-api';
+import {
+  ServiceFactory,
+  coreServices,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+import { BackendLifecycleImpl } from '../rootLifecycle/rootLifecycleServiceFactory';
+
+async function createExpressApp(...dependencies: ServiceFactory[]) {
+  let app: Express | undefined = undefined;
+
+  const tester = ServiceFactoryTester.from(
+    rootHttpRouterServiceFactory({
+      configure(options) {
+        options.applyDefaults();
+        app = options.app;
+      },
+    }),
+    {
+      dependencies,
+    },
+  );
+
+  // Trigger creation of the http service, accessing the app instance through the configure callback
+  await tester.getSubject();
+
+  if (!app) {
+    throw new Error('App not yet created');
+  }
+
+  return { app, tester };
+}
 
 describe('rootHttpRouterServiceFactory', () => {
   it('should make the health endpoints available', async () => {
+    const { app, tester } = await createExpressApp(
+      mockServices.rootConfig.factory({
+        data: {
+          backend: {
+            listen: { port: 0 },
+          },
+        },
+      }),
+    );
+
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend has not started yet',
+      status: 'error',
+    });
+
+    const lifecycle = await tester.getService(coreServices.rootLifecycle);
+
+    await (lifecycle as any).startup(); // Trigger startup by calling the private startup method
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(200, {
+      status: 'ok',
+    });
+
+    expect('test').toBe('test');
+  });
+
+  it('should include custom headers for health endpoint', async () => {
+    const { app, tester } = await createExpressApp(
+      mockServices.rootConfig.factory({
+        data: {
+          backend: {
+            listen: { port: 0 },
+            health: {
+              headers: {
+                'x-test-header': 'test',
+              },
+            },
+          },
+        },
+      }),
+    );
+
+    const lRes = await request(app).get('/.backstage/health/v1/liveness');
+
+    expect(lRes.status).toBe(200);
+    expect(lRes.get('x-test-header')).toBe('test');
+
+    const r1Res = await request(app).get('/.backstage/health/v1/readiness');
+
+    expect(r1Res.status).toBe(503);
+    expect(r1Res.get('x-test-header')).toBe('test');
+
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend has not started yet',
+      status: 'error',
+    });
+
+    const lifecycle = await tester.getService(coreServices.rootLifecycle);
+
+    await (lifecycle as any).startup(); // Trigger startup by calling the private startup method
+
+    const r2Res = await request(app).get('/.backstage/health/v1/readiness');
+
+    expect(r2Res.status).toBe(200);
+    expect(r2Res.get('x-test-header')).toBe('test');
+  });
+
+  it('should reject invalid health headers config', async () => {
+    await expect(
+      createExpressApp(
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              listen: { port: 0 },
+              health: {
+                headers: 'not-an-object',
+              },
+            },
+          },
+        }),
+      ),
+    ).rejects.toThrow(
+      "Invalid type in config for key 'backend.health.headers' in 'mock-config', got string, wanted object",
+    );
+
+    await expect(
+      createExpressApp(
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              listen: { port: 0 },
+              health: {
+                headers: [],
+              },
+            },
+          },
+        }),
+      ),
+    ).rejects.toThrow(
+      "Invalid type in config for key 'backend.health.headers' in 'mock-config', got array, wanted object",
+    );
+
+    await expect(
+      createExpressApp(
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              listen: { port: 0 },
+              health: {
+                headers: {
+                  'invalid-header': {},
+                },
+              },
+            },
+          },
+        }),
+      ),
+    ).rejects.toThrow(
+      'Invalid header value in at backend.health.headers, must be a non-empty string',
+    );
+
+    await expect(
+      createExpressApp(
+        mockServices.rootConfig.factory({
+          data: {
+            backend: {
+              listen: { port: 0 },
+              health: {
+                headers: {
+                  'invalid-header': '',
+                },
+              },
+            },
+          },
+        }),
+      ),
+    ).rejects.toThrow(
+      'Invalid header value in at backend.health.headers, must be a non-empty string',
+    );
+  });
+
+  it('should wait the server to shutdown', async () => {
+    jest.useFakeTimers();
+
     let app: Express | undefined = undefined;
+    const lifecycleMock = new BackendLifecycleImpl(mockServices.rootLogger());
 
     const tester = ServiceFactoryTester.from(
       rootHttpRouterServiceFactory({
         configure(options) {
-          options.applyDefaults();
+          console.log('configure');
+          options.app.use(options.healthRouter);
+          options.app.use(options.lifecycleMiddleware);
+          options.app.get('/test', (_req, res) => {
+            res.status(200).send({ status: 'ok' }).end();
+          });
+          options.app.use(options.middleware.error());
           app = options.app;
         },
       }),
@@ -42,33 +231,102 @@ describe('rootHttpRouterServiceFactory', () => {
               backend: {
                 baseUrl: 'http://localhost',
                 listen: { host: '', port: 0 },
+                lifecycle: {
+                  serverShutdownDelay: '30s',
+                },
               },
             },
           }),
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory() {
+              return lifecycleMock;
+            },
+          }),
         ],
       },
     );
 
-    // Trigger creation of the http service, accessing the app instance through the configure callback
     await tester.getSubject();
 
-    await request(app!)
-      .get('/.backstage/health/v1/liveness')
-      .expect(200, { status: 'ok' });
-
-    await request(app!).get('/.backstage/health/v1/readiness').expect(503, {
-      message: 'Backend has not started yet',
-      status: 'error',
-    });
-
+    // Trigger creation of the http service, accessing the app instance through the configure callback
     const lifecycle = await tester.getService(coreServices.rootLifecycle);
 
     await (lifecycle as any).startup(); // Trigger startup by calling the private startup method
 
-    await request(app!).get('/.backstage/health/v1/readiness').expect(200, {
+    await request(app!).get('/test').expect(200, {
       status: 'ok',
     });
 
-    expect('test').toBe('test');
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(200, {
+      status: 'ok',
+    });
+
+    const beforeShutdownPromise = (lifecycle as any)
+      .beforeShutdown()
+      .then(() => {
+        return (lifecycle as any).shutdown();
+      });
+
+    // Continue accepting requests
+    await request(app!).get('/test').expect(200, {
+      status: 'ok',
+    });
+
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    // Immediately start failing the readiness health check
+    await request(app).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend is shuttting down',
+      status: 'error',
+    });
+
+    jest.advanceTimersByTime(29999);
+
+    // Still accepting requests 1 ms before shutdown
+    await request(app!).get('/test').expect(200, {
+      status: 'ok',
+    });
+
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend is shuttting down',
+      status: 'error',
+    });
+
+    jest.advanceTimersByTime(1);
+
+    // No longer accepting requests after shutdown
+    await request(app!)
+      .get('/test')
+      .expect(503, {
+        error: {
+          name: 'ServiceUnavailableError',
+          message: 'Service is shutting down',
+        },
+        request: { method: 'GET', url: '/test' },
+        response: { statusCode: 503 },
+      });
+
+    await request(app)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend is shuttting down',
+      status: 'error',
+    });
+
+    return await expect(beforeShutdownPromise).resolves.toBeUndefined();
   });
 });
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
index 59811c15d4..4afdfb1ec2 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
@@ -30,6 +30,9 @@ import {
 } from './http';
 import { DefaultRootHttpRouter } from './DefaultRootHttpRouter';
 import { createHealthRouter } from './createHealthRouter';
+import { createLifecycleMiddleware } from './createLifecycleMiddleware';
+import { readDurationFromConfig } from '@backstage/config';
+import { HumanDuration } from '@backstage/types';
 
 /**
  * @public
@@ -43,6 +46,7 @@ export interface RootHttpRouterConfigureContext {
   logger: LoggerService;
   lifecycle: LifecycleService;
   healthRouter: RequestHandler;
+  lifecycleMiddleware: RequestHandler;
   applyDefaults: () => void;
 }
 
@@ -89,7 +93,28 @@ const rootHttpRouterServiceFactoryWithOptions = (
       const middleware = MiddlewareFactory.create({ config, logger });
       const routes = router.handler();
 
-      const healthRouter = createHealthRouter({ health });
+      const healthRouter = createHealthRouter({ config, health });
+
+      let startupRequestPauseTimeout: HumanDuration | undefined;
+      if (config.has('backend.lifecycle.startupRequestPauseTimeout')) {
+        startupRequestPauseTimeout = readDurationFromConfig(config, {
+          key: 'backend.lifecycle.startupRequestPauseTimeout',
+        });
+      }
+
+      let serverShutdownDelay: HumanDuration | undefined;
+      if (config.has('backend.lifecycle.serverShutdownDelay')) {
+        serverShutdownDelay = readDurationFromConfig(config, {
+          key: 'backend.lifecycle.serverShutdownDelay',
+        });
+      }
+
+      const lifecycleMiddleware = createLifecycleMiddleware({
+        lifecycle,
+        startupRequestPauseTimeout,
+        serverShutdownDelay,
+      });
+
       const server = await createHttpServer(
         app,
         readHttpServerOptions(config.getOptionalConfig('backend')),
@@ -105,6 +130,7 @@ const rootHttpRouterServiceFactoryWithOptions = (
         logger,
         lifecycle,
         healthRouter,
+        lifecycleMiddleware,
         applyDefaults() {
           if (process.env.NODE_ENV === 'development') {
             app.set('json spaces', 2);
@@ -114,6 +140,7 @@ const rootHttpRouterServiceFactoryWithOptions = (
           app.use(middleware.compression());
           app.use(middleware.logging());
           app.use(healthRouter);
+          app.use(lifecycleMiddleware);
           app.use(routes);
           app.use(middleware.notFound());
           app.use(middleware.error());
diff --git a/packages/backend-defaults/src/entrypoints/rootLifecycle/rootLifecycleServiceFactory.ts b/packages/backend-defaults/src/entrypoints/rootLifecycle/rootLifecycleServiceFactory.ts
index e724c2f5cb..abba4beece 100644
--- a/packages/backend-defaults/src/entrypoints/rootLifecycle/rootLifecycleServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootLifecycle/rootLifecycleServiceFactory.ts
@@ -65,6 +65,39 @@ export class BackendLifecycleImpl implements RootLifecycleService {
     );
   }
 
+  #hasBeforeShutdown = false;
+  #beforeShutdownTasks: Array<{ hook: () => void | Promise<void> }> = [];
+
+  addBeforeShutdownHook(hook: () => void): void {
+    if (this.#hasBeforeShutdown) {
+      throw new Error(
+        'Attempt to add before shutdown hook after shutdown has started',
+      );
+    }
+    this.#beforeShutdownTasks.push({ hook });
+  }
+
+  async beforeShutdown(): Promise<void> {
+    if (this.#hasBeforeShutdown) {
+      return;
+    }
+    this.#hasBeforeShutdown = true;
+
+    this.logger.debug(
+      `Running ${this.#beforeShutdownTasks.length} before shutdown tasks...`,
+    );
+    await Promise.all(
+      this.#beforeShutdownTasks.map(async ({ hook }) => {
+        try {
+          await hook();
+          this.logger.debug(`Before shutdown hook succeeded`);
+        } catch (error) {
+          this.logger.error(`Before shutdown hook failed, ${error}`);
+        }
+      }),
+    );
+  }
+
   #hasShutdown = false;
   #shutdownTasks: Array<{
     hook: LifecycleServiceShutdownHook;
diff --git a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.test.ts b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.test.ts
index 0f9e079943..ec46f22759 100644
--- a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.test.ts
@@ -93,4 +93,28 @@ describe('WinstonLogger', () => {
       expect.any(Function),
     );
   });
+
+  it('gracefully handles fields that are not castable to a string', () => {
+    const mockTransport = new Transport({
+      log: jest.fn(),
+      logv: jest.fn(),
+    });
+
+    const logger = WinstonLogger.create({
+      transports: [mockTransport],
+    });
+
+    logger.error('something went wrong', {
+      field: Object.create(null),
+    });
+
+    expect(mockTransport.log).toHaveBeenCalledWith(
+      expect.objectContaining({
+        [MESSAGE]: expect.stringContaining(
+          '[field value not castable to string]',
+        ),
+      }),
+      expect.any(Function),
+    );
+  });
 });
diff --git a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
index 38d05f6511..9f7532e66b 100644
--- a/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
+++ b/packages/backend-defaults/src/entrypoints/rootLogger/WinstonLogger.ts
@@ -147,10 +147,17 @@ export class WinstonLogger implements RootLoggerService {
         const prefixColor = colorizer.colorize('prefix', prefix);
 
         const extraFields = Object.entries(fields)
-          .map(
-            ([key, value]) =>
-              `${colorizer.colorize('field', `${key}`)}=${value}`,
-          )
+          .map(([key, value]) => {
+            let stringValue = '';
+
+            try {
+              stringValue = `${value}`;
+            } catch (e) {
+              stringValue = '[field value not castable to string]';
+            }
+
+            return `${colorizer.colorize('field', `${key}`)}=${stringValue}`;
+          })
           .join(' ');
 
         return `${timestampColor} ${prefixColor} ${level} ${message} ${extraFields}`;
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.test.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.test.ts
index 63b900fab2..199d25f2aa 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.test.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.test.ts
@@ -14,16 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  TestDatabaseId,
-  TestDatabases,
-  mockServices,
-} from '@backstage/backend-test-utils';
+import { TestDatabases, mockServices } from '@backstage/backend-test-utils';
 import { Duration } from 'luxon';
 import waitForExpect from 'wait-for-expect';
 import { DefaultSchedulerService } from './DefaultSchedulerService';
 import { createTestScopedSignal } from './__testUtils__/createTestScopedSignal';
-import { DatabaseService } from '@backstage/backend-plugin-api';
 
 jest.setTimeout(60_000);
 
@@ -32,19 +27,12 @@ describe('TaskScheduler', () => {
   const databases = TestDatabases.create();
   const testScopedSignal = createTestScopedSignal();
 
-  async function createDatabase(
-    databaseId: TestDatabaseId,
-  ): Promise<DatabaseService> {
-    const knex = await databases.init(databaseId);
-    return {
-      getClient: async () => knex,
-    };
-  }
-
   it.each(databases.eachSupportedId())(
     'can return a working v1 plugin impl, %p',
     async databaseId => {
-      const database = await createDatabase(databaseId);
+      const knex = await databases.init(databaseId);
+      const database = mockServices.database({ knex });
+
       const manager = DefaultSchedulerService.create({ database, logger });
       const fn = jest.fn();
 
@@ -65,7 +53,9 @@ describe('TaskScheduler', () => {
   it.each(databases.eachSupportedId())(
     'can return a working v2 plugin impl, %p',
     async databaseId => {
-      const database = await createDatabase(databaseId);
+      const knex = await databases.init(databaseId);
+      const database = mockServices.database({ knex });
+
       const manager = DefaultSchedulerService.create({ database, logger });
       const fn = jest.fn();
 
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
index 3cb41a0b48..1ce1401829 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
@@ -26,14 +26,7 @@ import {
   PluginTaskSchedulerImpl,
   parseDuration,
 } from './PluginTaskSchedulerImpl';
-
-function defer() {
-  let resolve = () => {};
-  const promise = new Promise<void>(_resolve => {
-    resolve = _resolve;
-  });
-  return { promise, resolve };
-}
+import { createDeferred } from '@backstage/types';
 
 jest.setTimeout(60_000);
 
@@ -62,7 +55,11 @@ describe('PluginTaskManagerImpl', () => {
     const manager = new PluginTaskSchedulerImpl(
       async () => knex,
       mockServices.logger.mock(),
-      { addShutdownHook, addStartupHook: jest.fn() },
+      {
+        addShutdownHook,
+        addBeforeShutdownHook: jest.fn(),
+        addStartupHook: jest.fn(),
+      },
     );
     return { knex, manager };
   }
@@ -188,14 +185,14 @@ describe('PluginTaskManagerImpl', () => {
       async databaseId => {
         const { manager } = await init(databaseId);
 
-        const { promise, resolve } = defer();
+        const promise = createDeferred();
 
         await manager.scheduleTask({
           id: 'task1',
           timeout: Duration.fromMillis(5000),
           frequency: Duration.fromObject({ years: 1 }),
           fn: async () => {
-            resolve();
+            promise.resolve();
             await new Promise(r => setTimeout(r, 20000));
           },
           scope: 'global',
@@ -313,14 +310,14 @@ describe('PluginTaskManagerImpl', () => {
     it('cant trigger a running task', async () => {
       const { manager } = await init('SQLITE_3');
 
-      const { promise, resolve } = defer();
+      const promise = createDeferred();
 
       await manager.scheduleTask({
         id: 'task1',
         timeout: Duration.fromMillis(5000),
         frequency: Duration.fromObject({ years: 1 }),
         fn: async () => {
-          resolve();
+          promise.resolve();
           await new Promise(r => setTimeout(r, 20000));
         },
         scope: 'local',
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
index 5c04521149..ce1ff823cf 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
@@ -24,7 +24,7 @@ import {
   SchedulerServiceTaskRunner,
   SchedulerServiceTaskScheduleDefinition,
 } from '@backstage/backend-plugin-api';
-import { Counter, Histogram, metrics, trace } from '@opentelemetry/api';
+import { Counter, Histogram, Gauge, metrics, trace } from '@opentelemetry/api';
 import { Knex } from 'knex';
 import { Duration } from 'luxon';
 import { LocalTaskWorker } from './LocalTaskWorker';
@@ -44,6 +44,8 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
 
   private readonly counter: Counter;
   private readonly duration: Histogram;
+  private readonly lastStarted: Gauge;
+  private readonly lastCompleted: Gauge;
 
   constructor(
     private readonly databaseFactory: () => Promise<Knex>,
@@ -58,6 +60,17 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
       description: 'Histogram of task run durations',
       unit: 'seconds',
     });
+    this.lastStarted = meter.createGauge('backend_tasks.task.runs.started', {
+      description: 'Epoch timestamp seconds when the task was last started',
+      unit: 'seconds',
+    });
+    this.lastCompleted = meter.createGauge(
+      'backend_tasks.task.runs.completed',
+      {
+        description: 'Epoch timestamp seconds when the task was last completed',
+        unit: 'seconds',
+      },
+    );
     this.shutdownInitiated = new Promise(shutdownInitiated => {
       rootLifecycle?.addShutdownHook(() => shutdownInitiated(true));
     });
@@ -144,6 +157,7 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
         scope,
       };
       this.counter.add(1, { ...labels, result: 'started' });
+      this.lastStarted.record(Date.now() / 1000, { taskId: task.id });
 
       const startTime = process.hrtime();
 
@@ -170,6 +184,7 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
         const endTime = delta[0] + delta[1] / 1e9;
         this.counter.add(1, labels);
         this.duration.record(endTime, labels);
+        this.lastCompleted.record(Date.now() / 1000, labels);
       }
     };
   }
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureBlobStorageUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureBlobStorageUrlReader.ts
new file mode 100644
index 0000000000..069b772a15
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureBlobStorageUrlReader.ts
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  BlobDownloadOptions,
+  BlobServiceClient,
+  ContainerClient,
+  StorageSharedKeyCredential,
+} from '@azure/storage-blob';
+import { ReaderFactory, ReadTreeResponseFactory } from './types';
+import { ForwardedError, NotModifiedError } from '@backstage/errors';
+import { Readable } from 'stream';
+import { relative } from 'path/posix';
+import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
+import {
+  AzureBlobStorageIntergation,
+  AzureCredentialsManager,
+  DefaultAzureCredentialsManager,
+  ScmIntegrations,
+} from '@backstage/integration';
+import {
+  UrlReaderService,
+  UrlReaderServiceReadTreeOptions,
+  UrlReaderServiceReadTreeResponse,
+  UrlReaderServiceReadUrlOptions,
+  UrlReaderServiceReadUrlResponse,
+  UrlReaderServiceSearchResponse,
+} from '@backstage/backend-plugin-api';
+
+export function parseUrl(url: string): { path: string; container: string } {
+  const parsedUrl = new URL(url);
+  const pathSegments = parsedUrl.pathname.split('/').filter(Boolean);
+
+  if (pathSegments.length < 2) {
+    throw new Error(`Invalid Azure Blob Storage URL format: ${url}`);
+  }
+
+  // First segment is the container name, rest is the blob path
+  const container = pathSegments[0];
+  const path = pathSegments.slice(1).join('/');
+
+  return { path, container };
+}
+
+/**
+ * Implements a {@link @backstage/backend-plugin-api#UrlReaderService} for Azure storage accounts urls.
+ *
+ * @public
+ */
+export class AzureBlobStorageUrlReader implements UrlReaderService {
+  static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
+    const integrations = ScmIntegrations.fromConfig(config);
+
+    const credsManager =
+      DefaultAzureCredentialsManager.fromIntegrations(integrations);
+
+    return integrations.azureBlobStorage.list().map(integrationConfig => {
+      const reader = new AzureBlobStorageUrlReader(
+        credsManager,
+        integrationConfig,
+        {
+          treeResponseFactory,
+        },
+      );
+
+      const predicate = (url: URL) =>
+        url.host.endsWith(
+          `${integrationConfig.config.accountName}.${integrationConfig.config.host}`,
+        );
+      return { reader, predicate };
+    });
+  };
+
+  // private readonly blobServiceClient: BlobServiceClient;
+
+  constructor(
+    private readonly credsManager: AzureCredentialsManager,
+    private readonly integration: AzureBlobStorageIntergation,
+    private readonly deps: {
+      treeResponseFactory: ReadTreeResponseFactory;
+    },
+  ) {}
+
+  private async createContainerClient(
+    containerName: string,
+  ): Promise<ContainerClient> {
+    const accountName = this.integration.config.accountName; // Use the account name from the integration config
+    const accountKey = this.integration.config.accountKey; // Get the account key if it exists
+
+    if (accountKey && accountName) {
+      const creds = new StorageSharedKeyCredential(accountName, accountKey);
+      const blobServiceClient = new BlobServiceClient(
+        `https://${accountName}.${this.integration.config.host}`,
+        creds,
+      );
+      return blobServiceClient.getContainerClient(containerName);
+    }
+    // Use the credentials manager to get the correct credentials
+    const credential = await this.credsManager.getCredentials(
+      accountName as string,
+    );
+
+    let blobServiceClientUrl: string;
+
+    if (this.integration.config.endpoint) {
+      if (this.integration.config.sasToken) {
+        blobServiceClientUrl = `${this.integration.config.endpoint}?${this.integration.config.sasToken}`;
+      } else {
+        blobServiceClientUrl = `${this.integration.config.endpoint}`;
+      }
+    } else {
+      blobServiceClientUrl = `https://${this.integration.config.accountName}.${this.integration.config.host}`;
+    }
+
+    const blobServiceClient = new BlobServiceClient(
+      blobServiceClientUrl,
+      credential,
+    );
+    return blobServiceClient.getContainerClient(containerName);
+  }
+
+  async read(url: string): Promise<Buffer> {
+    const response = await this.readUrl(url);
+    return response.buffer();
+  }
+
+  async readUrl(
+    url: string,
+    options?: UrlReaderServiceReadUrlOptions,
+  ): Promise<UrlReaderServiceReadUrlResponse> {
+    const { etag, lastModifiedAfter } = options ?? {};
+
+    try {
+      const { path, container } = parseUrl(url);
+
+      const containerClient = await this.createContainerClient(container);
+      const blobClient = containerClient.getBlobClient(path);
+
+      const getBlobOptions: BlobDownloadOptions = {
+        abortSignal: options?.signal,
+        conditions: {
+          ...(etag && { ifNoneMatch: etag }),
+          ...(lastModifiedAfter && { ifModifiedSince: lastModifiedAfter }),
+        },
+      };
+
+      const downloadBlockBlobResponse = await blobClient.download(
+        0,
+        undefined,
+        getBlobOptions,
+      );
+
+      return ReadUrlResponseFactory.fromReadable(
+        downloadBlockBlobResponse.readableStreamBody as Readable,
+        {
+          etag: downloadBlockBlobResponse.etag,
+          lastModifiedAt: downloadBlockBlobResponse.lastModified,
+        },
+      );
+    } catch (e) {
+      if (e.$metadata && e.$metadata.httpStatusCode === 304) {
+        throw new NotModifiedError();
+      }
+
+      throw new ForwardedError(
+        'Could not retrieve file from Azure Blob Storage',
+        e,
+      );
+    }
+  }
+
+  async readTree(
+    url: string,
+    options?: UrlReaderServiceReadTreeOptions,
+  ): Promise<UrlReaderServiceReadTreeResponse> {
+    try {
+      const { path, container } = parseUrl(url);
+
+      const containerClient = await this.createContainerClient(container);
+
+      const blobs = containerClient.listBlobsFlat({ prefix: path });
+
+      const responses = [];
+
+      for await (const blob of blobs) {
+        const blobClient = containerClient.getBlobClient(blob.name);
+        const downloadBlockBlobResponse = await blobClient.download(
+          undefined,
+          undefined,
+          { abortSignal: options?.signal },
+        );
+
+        responses.push({
+          data: Readable.from(
+            downloadBlockBlobResponse.readableStreamBody as Readable,
+          ),
+          path: relative(path, blob.name),
+          lastModifiedAt: blob.properties.lastModified,
+        });
+      }
+
+      return this.deps.treeResponseFactory.fromReadableArray(responses);
+    } catch (e) {
+      throw new ForwardedError(
+        'Could not retrieve file tree from Azure Blob Storage',
+        e,
+      );
+    }
+  }
+
+  async search(): Promise<UrlReaderServiceSearchResponse> {
+    throw new Error('AzureBlobStorageUrlReader does not implement search');
+  }
+
+  toString() {
+    const accountName = this.integration.config.accountName;
+    const accountKey = this.integration.config.accountKey;
+    return `azureBlobStorage{accountName=${accountName},authed=${Boolean(
+      accountKey,
+    )}}`;
+  }
+}
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.ts
index 50513fcdcc..b46e7c20cd 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.ts
@@ -32,9 +32,7 @@ import {
   ScmIntegrations,
   AzureIntegration,
 } from '@backstage/integration';
-import fetch, { Response } from 'node-fetch';
 import { Minimatch } from 'minimatch';
-import { Readable } from 'stream';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import { ReadTreeResponseFactory, ReaderFactory } from './types';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
@@ -101,7 +99,7 @@ export class AzureUrlReader implements UrlReaderService {
 
     // for private repos when PAT is not valid, Azure API returns a http status code 203 with sign in page html
     if (response.ok && response.status !== 203) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body);
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
@@ -172,7 +170,7 @@ export class AzureUrlReader implements UrlReaderService {
     }
 
     return await this.deps.treeResponseFactory.fromZipArchive({
-      stream: Readable.from(archiveAzureResponse.body),
+      response: archiveAzureResponse,
       etag: commitSha,
       filter,
       subpath,
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.ts
index b7b733867e..f6742c7423 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.ts
@@ -32,14 +32,11 @@ import {
   getBitbucketCloudRequestOptions,
   ScmIntegrations,
 } from '@backstage/integration';
-import fetch, { Response } from 'node-fetch';
 import parseGitUrl from 'git-url-parse';
 import { trimEnd } from 'lodash';
 import { Minimatch } from 'minimatch';
-import { Readable } from 'stream';
 import { ReaderFactory, ReadTreeResponseFactory } from './types';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
-import { parseLastModified } from './util';
 
 /**
  * Implements a {@link @backstage/backend-plugin-api#UrlReaderService} for files from Bitbucket Cloud.
@@ -116,12 +113,7 @@ export class BitbucketCloudUrlReader implements UrlReaderService {
     }
 
     if (response.ok) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body, {
-        etag: response.headers.get('ETag') ?? undefined,
-        lastModifiedAt: parseLastModified(
-          response.headers.get('Last-Modified'),
-        ),
-      });
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `${url} could not be read as ${bitbucketUrl}, ${response.status} ${response.statusText}`;
@@ -159,7 +151,7 @@ export class BitbucketCloudUrlReader implements UrlReaderService {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: Readable.from(archiveResponse.body),
+      response: archiveResponse,
       subpath: filepath,
       etag: lastCommitShortHash,
       filter: options?.filter,
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.ts
index 332e300cb8..d327f80704 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.ts
@@ -31,14 +31,25 @@ import {
   getBitbucketServerRequestOptions,
   ScmIntegrations,
 } from '@backstage/integration';
-import fetch, { Response } from 'node-fetch';
 import parseGitUrl from 'git-url-parse';
 import { trimEnd } from 'lodash';
 import { Minimatch } from 'minimatch';
-import { Readable } from 'stream';
 import { ReaderFactory, ReadTreeResponseFactory } from './types';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
-import { parseLastModified } from './util';
+
+import pThrottle from 'p-throttle';
+
+// 1 per second
+const throttle = pThrottle({
+  limit: 1,
+  interval: 1000,
+});
+
+const throttledFetch = throttle(
+  async (url: RequestInfo, options?: RequestInit) => {
+    return await fetch(url, options);
+  },
+);
 
 /**
  * Implements a {@link @backstage/backend-plugin-api#UrlReaderService} for files from Bitbucket Server APIs.
@@ -82,7 +93,7 @@ export class BitbucketServerUrlReader implements UrlReaderService {
 
     let response: Response;
     try {
-      response = await fetch(bitbucketUrl.toString(), {
+      response = await throttledFetch(bitbucketUrl.toString(), {
         headers: {
           ...requestOptions.headers,
           ...(etag && { 'If-None-Match': etag }),
@@ -107,12 +118,7 @@ export class BitbucketServerUrlReader implements UrlReaderService {
     }
 
     if (response.ok) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body, {
-        etag: response.headers.get('ETag') ?? undefined,
-        lastModifiedAt: parseLastModified(
-          response.headers.get('Last-Modified'),
-        ),
-      });
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `${url} could not be read as ${bitbucketUrl}, ${response.status} ${response.statusText}`;
@@ -137,7 +143,7 @@ export class BitbucketServerUrlReader implements UrlReaderService {
       url,
       this.integration.config,
     );
-    const archiveResponse = await fetch(
+    const archiveResponse = await throttledFetch(
       downloadUrl,
       getBitbucketServerRequestOptions(this.integration.config),
     );
@@ -150,7 +156,7 @@ export class BitbucketServerUrlReader implements UrlReaderService {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: Readable.from(archiveResponse.body),
+      response: archiveResponse,
       subpath: filepath,
       etag: lastCommitShortHash,
       filter: options?.filter,
@@ -206,7 +212,7 @@ export class BitbucketServerUrlReader implements UrlReaderService {
     // https://docs.atlassian.com/bitbucket-server/rest/7.9.0/bitbucket-rest.html#idp211 (branches docs)
     const branchListUrl = `${this.integration.config.apiBaseUrl}/projects/${project}/repos/${repoName}/branches${branchParameter}`;
 
-    const branchListResponse = await fetch(
+    const branchListResponse = await throttledFetch(
       branchListUrl,
       getBitbucketServerRequestOptions(this.integration.config),
     );
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.ts
index 55d676ed91..c12998509e 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.ts
@@ -32,15 +32,12 @@ import {
   getBitbucketRequestOptions,
   ScmIntegrations,
 } from '@backstage/integration';
-import fetch, { Response } from 'node-fetch';
 import parseGitUrl from 'git-url-parse';
 import { trimEnd } from 'lodash';
 import { Minimatch } from 'minimatch';
-import { Readable } from 'stream';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { ReaderFactory, ReadTreeResponseFactory } from './types';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
-import { parseLastModified } from './util';
 
 /**
  * Implements a {@link @backstage/backend-plugin-api#UrlReaderService} for files from Bitbucket v1 and v2 APIs, such
@@ -127,12 +124,7 @@ export class BitbucketUrlReader implements UrlReaderService {
     }
 
     if (response.ok) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body, {
-        etag: response.headers.get('ETag') ?? undefined,
-        lastModifiedAt: parseLastModified(
-          response.headers.get('Last-Modified'),
-        ),
-      });
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `${url} could not be read as ${bitbucketUrl}, ${response.status} ${response.statusText}`;
@@ -170,7 +162,7 @@ export class BitbucketUrlReader implements UrlReaderService {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: Readable.from(archiveBitbucketResponse.body),
+      response: archiveBitbucketResponse,
       subpath: filepath,
       etag: lastCommitShortHash,
       filter: options?.filter,
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/FetchUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/FetchUrlReader.ts
index 55041cf036..0e5a279c4d 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/FetchUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/FetchUrlReader.ts
@@ -22,11 +22,9 @@ import {
   UrlReaderServiceSearchResponse,
 } from '@backstage/backend-plugin-api';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
-import fetch, { Response } from 'node-fetch';
 import { ReaderFactory } from './types';
 import path from 'path';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
-import { parseLastModified } from './util';
 
 const isInRange = (num: number, [start, end]: [number, number]) => {
   return num >= start && num <= end;
@@ -150,12 +148,7 @@ export class FetchUrlReader implements UrlReaderService {
     }
 
     if (response.ok) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body, {
-        etag: response.headers.get('ETag') ?? undefined,
-        lastModifiedAt: parseLastModified(
-          response.headers.get('Last-Modified'),
-        ),
-      });
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `could not read ${url}, ${response.status} ${response.statusText}`;
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.ts
index d8471c43f3..502c2d2ff9 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.ts
@@ -32,7 +32,6 @@ import {
   ScmIntegrations,
 } from '@backstage/integration';
 import { ReaderFactory, ReadTreeResponseFactory } from './types';
-import fetch, { Response } from 'node-fetch';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
 import {
   AuthenticationError,
@@ -149,7 +148,7 @@ export class GiteaUrlReader implements UrlReaderService {
     const parsedUri = parseGiteaUrl(this.integration.config, url);
 
     return this.deps.treeResponseFactory.fromTarArchive({
-      stream: Readable.from(response.body),
+      response: response,
       subpath: parsedUri.path,
       etag: lastCommitHash,
       filter: options?.filter,
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
index f5050cca5e..c1d8c02a53 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
@@ -34,11 +34,8 @@ import {
 import parseGitUrl from 'git-url-parse';
 import { trimEnd, trimStart } from 'lodash';
 import { Minimatch } from 'minimatch';
-import fetch, { Response } from 'node-fetch';
-import { Readable } from 'stream';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
 import { ReadTreeResponseFactory, ReaderFactory } from './types';
-import { parseLastModified } from './util';
 
 /**
  * Implements a {@link @backstage/backend-plugin-api#UrlReaderService} for files on GitLab.
@@ -101,12 +98,7 @@ export class GitlabUrlReader implements UrlReaderService {
     }
 
     if (response.ok) {
-      return ReadUrlResponseFactory.fromNodeJSReadable(response.body, {
-        etag: response.headers.get('ETag') ?? undefined,
-        lastModifiedAt: parseLastModified(
-          response.headers.get('Last-Modified'),
-        ),
-      });
+      return ReadUrlResponseFactory.fromResponse(response);
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
@@ -228,7 +220,7 @@ export class GitlabUrlReader implements UrlReaderService {
     }
 
     return await this.deps.treeResponseFactory.fromTarArchive({
-      stream: Readable.from(archiveGitLabResponse.body),
+      response: archiveGitLabResponse,
       subpath: filepath,
       etag: commitSha,
       filter: options?.filter,
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/ReadUrlResponseFactory.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/ReadUrlResponseFactory.ts
index ecc1bd6101..1f4f297c5a 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/ReadUrlResponseFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/ReadUrlResponseFactory.ts
@@ -19,6 +19,7 @@ import { UrlReaderServiceReadUrlResponse } from '@backstage/backend-plugin-api';
 import getRawBody from 'raw-body';
 import { Readable } from 'stream';
 import { ReadUrlResponseFactoryFromStreamOptions } from './types';
+import { parseLastModified, responseToReadable } from './util';
 
 /**
  * Utility class for UrlReader implementations to create valid ReadUrlResponse
@@ -28,7 +29,7 @@ import { ReadUrlResponseFactoryFromStreamOptions } from './types';
  */
 export class ReadUrlResponseFactory {
   /**
-   * Resolves a ReadUrlResponse from a Readable stream.
+   * Resolves a UrlReaderServiceReadUrlResponse from a Readable stream.
    */
   static async fromReadable(
     stream: Readable,
@@ -64,7 +65,7 @@ export class ReadUrlResponseFactory {
   }
 
   /**
-   * Resolves a ReadUrlResponse from an old-style NodeJS.ReadableStream.
+   * Resolves a UrlReaderServiceReadUrlResponse from an old-style NodeJS.ReadableStream.
    */
   static async fromNodeJSReadable(
     oldStyleStream: NodeJS.ReadableStream,
@@ -73,4 +74,21 @@ export class ReadUrlResponseFactory {
     const readable = Readable.from(oldStyleStream);
     return ReadUrlResponseFactory.fromReadable(readable, options);
   }
+
+  /**
+   * Resolves a UrlReaderServiceReadUrlResponse from a native fetch response body.
+   */
+  static async fromResponse(
+    response: Response,
+  ): Promise<UrlReaderServiceReadUrlResponse> {
+    const etag = response.headers.get('etag') || undefined;
+    const lastModifiedAt = parseLastModified(
+      response.headers.get('last-modified'),
+    );
+
+    return ReadUrlResponseFactory.fromReadable(responseToReadable(response), {
+      etag,
+      lastModifiedAt,
+    });
+  }
 }
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/UrlReaders.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/UrlReaders.ts
index 96e9ed6509..229bdd4903 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/UrlReaders.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/UrlReaders.ts
@@ -35,6 +35,7 @@ import { AwsS3UrlReader } from './AwsS3UrlReader';
 import { GiteaUrlReader } from './GiteaUrlReader';
 import { AwsCodeCommitUrlReader } from './AwsCodeCommitUrlReader';
 import { HarnessUrlReader } from './HarnessUrlReader';
+import { AzureBlobStorageUrlReader } from './AzureBlobStorageUrlReader';
 
 /**
  * Creation options for {@link @backstage/backend-plugin-api#UrlReaderService}.
@@ -99,6 +100,7 @@ export class UrlReaders {
         GoogleGcsUrlReader.factory,
         HarnessUrlReader.factory,
         AwsS3UrlReader.factory,
+        AzureBlobStorageUrlReader.factory,
         AwsCodeCommitUrlReader.factory,
         FetchUrlReader.factory,
       ]),
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/index.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/index.ts
index 678c6ef64b..fc33efbc3a 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/index.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/index.ts
@@ -24,6 +24,7 @@ export { GitlabUrlReader } from './GitlabUrlReader';
 export { GiteaUrlReader } from './GiteaUrlReader';
 export { HarnessUrlReader } from './HarnessUrlReader';
 export { AwsS3UrlReader } from './AwsS3UrlReader';
+export { AzureBlobStorageUrlReader } from './AzureBlobStorageUrlReader';
 export { FetchUrlReader } from './FetchUrlReader';
 export { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
 export type {
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/tree/ReadTreeResponseFactory.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/tree/ReadTreeResponseFactory.ts
index 1973b2158f..a8f187d7b8 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/tree/ReadTreeResponseFactory.ts
@@ -15,6 +15,7 @@
  */
 
 import os from 'os';
+import { Readable } from 'stream';
 import { Config } from '@backstage/config';
 import {
   ReadTreeResponseFactoryOptions,
@@ -25,6 +26,7 @@ import { TarArchiveResponse } from './TarArchiveResponse';
 import { ZipArchiveResponse } from './ZipArchiveResponse';
 import { ReadableArrayResponse } from './ReadableArrayResponse';
 import { UrlReaderServiceReadTreeResponse } from '@backstage/backend-plugin-api';
+import { responseToReadable } from '../util';
 
 export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
   static create(options: { config: Config }): DefaultReadTreeResponseFactory {
@@ -41,11 +43,21 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
       stripFirstDirectory?: boolean;
     },
   ): Promise<UrlReaderServiceReadTreeResponse> {
+    let stream: Readable;
+    let etag: string;
+    if ('stream' in options) {
+      stream = options.stream;
+      etag = options.etag;
+    } else {
+      stream = responseToReadable(options.response);
+      etag = (options.etag ?? options.response.headers.get('etag')) || '';
+    }
+
     return new TarArchiveResponse(
-      options.stream,
+      stream,
       options.subpath ?? '',
       this.workDir,
-      options.etag,
+      etag,
       options.filter,
       options.stripFirstDirectory ?? true,
     );
@@ -54,11 +66,21 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
   async fromZipArchive(
     options: ReadTreeResponseFactoryOptions,
   ): Promise<UrlReaderServiceReadTreeResponse> {
+    let stream: Readable;
+    let etag: string;
+    if ('stream' in options) {
+      stream = options.stream;
+      etag = options.etag;
+    } else {
+      stream = responseToReadable(options.response);
+      etag = (options.etag ?? options.response.headers.get('etag')) || '';
+    }
+
     return new ZipArchiveResponse(
-      options.stream,
+      stream,
       options.subpath ?? '',
       this.workDir,
-      options.etag,
+      etag,
       options.filter,
     );
   }
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/types.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/types.ts
index 5afbed178f..f8f03a6f3b 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/types.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/types.ts
@@ -60,17 +60,28 @@ export type ReadUrlResponseFactoryFromStreamOptions = {
  *
  * @public
  */
-export type ReadTreeResponseFactoryOptions = {
-  // A binary stream of a tar archive.
-  stream: Readable;
-  // If unset, the files at the root of the tree will be read.
-  // subpath must not contain the name of the top level directory.
-  subpath?: string;
-  // etag of the blob
-  etag: string;
-  // Filter passed on from the ReadTreeOptions
-  filter?: (path: string, info?: { size: number }) => boolean;
-};
+export type ReadTreeResponseFactoryOptions =
+  | {
+      // A binary stream of a tar archive.
+      stream: Readable;
+      // If unset, the files at the root of the tree will be read.
+      // subpath must not contain the name of the top level directory.
+      subpath?: string;
+      // etag of the blob
+      etag: string;
+      // Filter passed on from the ReadTreeOptions
+      filter?: (path: string, info?: { size: number }) => boolean;
+    }
+  | {
+      /** A response from a fetch request */
+      response: Response;
+      /** If unset, the files at the root of the tree will be read. Subpath must not contain the name of the top level directory. */
+      subpath?: string;
+      /** etag of the blob, to optionally override what the response header may or may not say */
+      etag?: string;
+      /** Filter passed on from the ReadTreeOptions */
+      filter?: (path: string, info?: { size: number }) => boolean;
+    };
 
 /**
  * Options that control {@link ReadTreeResponseFactory.fromReadableArray}
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/util.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/util.ts
index 3d65c2c527..bd19feef2d 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/util.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/util.ts
@@ -14,10 +14,47 @@
  * limitations under the License.
  */
 
-export function parseLastModified(value: string | null | undefined) {
+import { PassThrough, Readable } from 'stream';
+import { ReadableStream as WebReadableStream } from 'stream/web';
+
+export function parseLastModified(
+  value: string | null | undefined,
+): Date | undefined {
   if (!value) {
     return undefined;
   }
 
-  return new Date(value);
+  try {
+    const result = new Date(value);
+    result.toISOString(); // triggers exception if input was invalid
+    return result;
+  } catch {
+    return undefined;
+  }
+}
+
+export function responseToReadable(response: Response): Readable {
+  return response.body
+    ? Readable.from(toWeb(response.body))
+    : new PassThrough().end();
+}
+
+// The NodeJS ReadableStream is that fetch returns is super basic and not even
+// iterable. This function converts it to the smarter, iterable stream/web
+// variant instead.
+export function toWeb(
+  responseBody: ReadableStream<Uint8Array>,
+): WebReadableStream<Uint8Array> {
+  const reader = responseBody.getReader();
+  return new WebReadableStream({
+    async pull(controller) {
+      const { value, done } = await reader.read();
+      if (value) {
+        controller.enqueue(value);
+      }
+      if (done) {
+        controller.close();
+      }
+    },
+  });
 }
diff --git a/packages/backend-defaults/src/entrypoints/userInfo/DefaultUserInfoService.ts b/packages/backend-defaults/src/entrypoints/userInfo/DefaultUserInfoService.ts
index 83bbba89b7..21f8de5631 100644
--- a/packages/backend-defaults/src/entrypoints/userInfo/DefaultUserInfoService.ts
+++ b/packages/backend-defaults/src/entrypoints/userInfo/DefaultUserInfoService.ts
@@ -22,7 +22,6 @@ import {
 } from '@backstage/backend-plugin-api';
 import { ResponseError } from '@backstage/errors';
 import { decodeJwt } from 'jose';
-import fetch from 'node-fetch';
 import { toInternalBackstageCredentials } from '../auth/helpers';
 
 export type Options = {
diff --git a/packages/backend-dynamic-feature-service/CHANGELOG.md b/packages/backend-dynamic-feature-service/CHANGELOG.md
index 57e3a086b7..d01ee9ab5c 100644
--- a/packages/backend-dynamic-feature-service/CHANGELOG.md
+++ b/packages/backend-dynamic-feature-service/CHANGELOG.md
@@ -1,5 +1,233 @@
 # @backstage/backend-dynamic-feature-service
 
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-app-node@0.1.28-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.0
+
+### Minor Changes
+
+- e939cd7: **BREAKING** The `dynamicPluginsFeatureLoader` options related to the root logger behavior (`transports`, `level`, `format`) are now gathered under a single `logger` option which is a function taking an optional `Config` argument and returning the logger options.
+
+  This breaking change is required for 2 reasons:
+
+  - it's totally possible that the current `Config` would be required to provide the logger options,
+  - the logger-related options should be gathered under a common `logger` option because, when the root auditing service is introduced, distinct but similarly-named options would be required for the auditor as well.
+
+### Patch Changes
+
+- 1aeec12: Enhance the `CommonJSModuleLoader` to add support for `resolvePackagePath` calls from backend dynamic plugins, with customizable package resolution, and make the `CommonJSModuleLoader` public API.
+  Fixing this backend dynamic plugin limitation related to `resolvePackagePath` is important for backend dynamic plugins which use the database, since database migration scripts systematically use `resolvePackagePath`.
+- 8593dfa: Improve the way alpha packages are supported when loading dynamic backend plugins.
+  The `ScannedPluginPackage` descriptor of dynamic backend plugins loaded from their alpha `package.json` now contain both the main package manifest and the alpha manifest. Previously it used to contain only the content of the alpha `package.json`, which is nearly empty.
+  This will make it easier to use or display metadata of loaded dynamic backend plugins, which is contained in the main manifest.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-app-node@0.1.27
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.5.0-next.2
+
+### Minor Changes
+
+- e939cd7: **BREAKING** The `dynamicPluginsFeatureLoader` options related to the root logger behavior (`transports`, `level`, `format`) are now gathered under a single `logger` option which is a function taking an optional `Config` argument and returning the logger options.
+
+  This breaking change is required for 2 reasons:
+
+  - it's totally possible that the current `Config` would be required to provide the logger options,
+  - the logger-related options should be gathered under a common `logger` option because, when the root auditing service is introduced, distinct but similarly-named options would be required for the auditor as well.
+
+### Patch Changes
+
+- 1aeec12: Enhance the `CommonJSModuleLoader` to add support for `resolvePackagePath` calls from backend dynamic plugins, with customizable package resolution, and make the `CommonJSModuleLoader` public API.
+  Fixing this backend dynamic plugin limitation related to `resolvePackagePath` is important for backend dynamic plugins which use the database, since database migration scripts systematically use `resolvePackagePath`.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.4.4-next.0
+
+### Patch Changes
+
+- 8593dfa: Improve the way alpha packages are supported when loading dynamic backend plugins.
+  The `ScannedPluginPackage` descriptor of dynamic backend plugins loaded from their alpha `package.json` now contain both the main package manifest and the alpha manifest. Previously it used to contain only the content of the alpha `package.json`, which is nearly empty.
+  This will make it easier to use or display metadata of loaded dynamic backend plugins, which is contained in the main manifest.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/packages/backend-dynamic-feature-service/package.json b/packages/backend-dynamic-feature-service/package.json
index d0cfcce912..cb34c886e7 100644
--- a/packages/backend-dynamic-feature-service/package.json
+++ b/packages/backend-dynamic-feature-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-dynamic-feature-service",
-  "version": "0.4.2",
+  "version": "0.5.2-next.2",
   "description": "Backstage dynamic feature service",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-dynamic-feature-service/report.api.md b/packages/backend-dynamic-feature-service/report.api.md
index 7003b3bc2c..6e53f3747f 100644
--- a/packages/backend-dynamic-feature-service/report.api.md
+++ b/packages/backend-dynamic-feature-service/report.api.md
@@ -68,6 +68,32 @@ export interface BaseDynamicPlugin {
   version: string;
 }
 
+// @public (undocumented)
+export class CommonJSModuleLoader implements ModuleLoader {
+  constructor(options: CommonJSModuleLoaderOptions);
+  // (undocumented)
+  bootstrap(
+    backstageRoot: string,
+    dynamicPluginsPaths: string[],
+    scannedPluginManifests: Map<string, ScannedPluginManifest>,
+  ): Promise<void>;
+  // (undocumented)
+  load(packagePath: string): Promise<any>;
+  // (undocumented)
+  readonly options: CommonJSModuleLoaderOptions;
+}
+
+// @public (undocumented)
+export type CommonJSModuleLoaderOptions = {
+  logger: LoggerService;
+  dynamicPluginPackageNameSuffixes?: String[];
+  customResolveDynamicPackage?: (
+    logger: LoggerService,
+    searchedPackageName: string,
+    scannedPluginManifests: Map<string, ScannedPluginManifest>,
+  ) => string | undefined;
+};
+
 // @public (undocumented)
 export type DynamicPlugin = FrontendDynamicPlugin | BackendDynamicPlugin;
 
@@ -139,8 +165,9 @@ export const dynamicPluginsFeatureLoader: ((
 
 // @public (undocumented)
 export type DynamicPluginsFeatureLoaderOptions = DynamicPluginsFactoryOptions &
-  DynamicPluginsSchemasOptions &
-  DynamicPluginsRootLoggerFactoryOptions;
+  DynamicPluginsSchemasOptions & {
+    logger?: (config?: Config) => DynamicPluginsRootLoggerFactoryOptions;
+  };
 
 // @public @deprecated (undocumented)
 export const dynamicPluginsFrontendSchemas: BackendFeature;
@@ -263,7 +290,11 @@ export type LegacyPluginEnvironment = {
 // @public (undocumented)
 export interface ModuleLoader {
   // (undocumented)
-  bootstrap(backstageRoot: string, dynamicPluginPaths: string[]): Promise<void>;
+  bootstrap(
+    backstageRoot: string,
+    dynamicPluginPaths: string[],
+    scannedPluginManifests?: Map<string, ScannedPluginManifest>,
+  ): Promise<void>;
   // (undocumented)
   load(id: string): Promise<any>;
 }
@@ -287,6 +318,8 @@ export type ScannedPluginManifest = BackstagePackageJson &
 
 // @public (undocumented)
 export interface ScannedPluginPackage {
+  // (undocumented)
+  alphaManifest?: BackstagePackageJson;
   // (undocumented)
   location: URL;
   // (undocumented)
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/alpha/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/alpha/package.json
new file mode 100644
index 0000000000..0b10e92f3b
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/alpha/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "plugin-test-backend-alpha-dynamic__alpha",
+  "version": "0.0.0",
+  "main": "../dist/alpha.cjs.js"
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/alpha.cjs.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/alpha.cjs.js
new file mode 100644
index 0000000000..1b4cb79d30
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/alpha.cjs.js
@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var backendPluginApi = require('@backstage/backend-plugin-api');
+
+const testAlphaPlugin = backendPluginApi.createBackendPlugin({
+  pluginId: "test-alpha",
+  register(env) {
+    env.registerInit({
+      deps: {
+        logger: backendPluginApi.coreServices.rootLogger,
+      },
+      async init({
+        logger,
+      }) {
+        logger.info("This plugin has been loaded from the alpha package.");
+      }
+    });
+  }
+});
+
+exports.default = testAlphaPlugin;
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/index.cjs.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/index.cjs.js
new file mode 100644
index 0000000000..cf5c9078e2
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/dist/index.cjs.js
@@ -0,0 +1,3 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/package.json
new file mode 100644
index 0000000000..90cee28b0f
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root-for-alpha/test-backend-alpha-dynamic/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "plugin-test-backend-alpha-dynamic",
+  "version": "0.0.0",
+  "description": "A test dynamic backend module that exposes alpha API.",
+  "backstage": {
+    "role": "backend-plugin",
+    "pluginId": "test-alpha",
+    "pluginPackages": [
+      "plugin-test-backend-alpha"
+    ]
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "backstage",
+    "dynamic"
+  ],
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "default": "./dist/index.cjs.js"
+    },
+    "./alpha": {
+      "require": "./dist/alpha.cjs.js",
+      "default": "./dist/alpha.cjs.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.cjs.js",
+  "files": [
+    "dist",
+    "alpha"
+  ],
+  "bundleDependencies": true
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
index 6cc4a4f125..77c2e32bef 100644
--- a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
@@ -10,6 +10,8 @@ const url = require('url');
 
 const privateDep = require('private-dep-with-frontend-plugin-index-path');
 
+const someResource = backendPluginApi.resolvePackagePath('plugin-test-backend', 'someResource.txt');
+
 const testPlugin = backendPluginApi.createBackendPlugin({
   pluginId: "test",
   register(env) {
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/someResource.txt b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/someResource.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/backend-dynamic-feature-service/src/features/features.test.ts b/packages/backend-dynamic-feature-service/src/features/features.test.ts
index ad46b0c5f8..fb6aa5e48a 100644
--- a/packages/backend-dynamic-feature-service/src/features/features.test.ts
+++ b/packages/backend-dynamic-feature-service/src/features/features.test.ts
@@ -25,24 +25,29 @@ import path, { resolve as resolvePath } from 'path';
 import {
   BackendFeature,
   createBackendPlugin,
-  LoggerService,
 } from '@backstage/backend-plugin-api';
-import { CommonJSModuleLoader } from '../loader/CommonJSModuleLoader';
+import {
+  CommonJSModuleLoader,
+  CommonJSModuleLoaderOptions,
+} from '../loader/CommonJSModuleLoader';
 import * as winston from 'winston';
+import * as url from 'url';
 import { MESSAGE } from 'triple-beam';
 import { overridePackagePathResolution } from '@backstage/backend-plugin-api/testUtils';
+import { ScannedPluginPackage } from '../scanner';
 
 // these can get a bit slow in CI
 jest.setTimeout(60_000);
 
 async function jestFreeTypescriptAwareModuleLoader(
-  logger: LoggerService,
-  dontBootstrap: boolean = false,
+  options: CommonJSModuleLoaderOptions & {
+    dontBootstrap?: boolean;
+  },
 ) {
-  const loader = new CommonJSModuleLoader(logger);
+  const loader = new CommonJSModuleLoader(options);
   (loader as any).module = await loader.load('node:module');
   loader.load(path.resolve(__dirname, '../../../cli/config/nodeTransform.cjs'));
-  if (dontBootstrap) {
+  if (options.dontBootstrap) {
     loader.bootstrap = async () => {};
   }
   return loader;
@@ -67,6 +72,8 @@ class MockedTransport extends winston.transports.Console {
 
 class DynamicPluginLister {
   readonly loadedPlugins: DynamicPlugin[] = [];
+  getScannedPackage?: (plugin: DynamicPlugin) => ScannedPluginPackage;
+
   feature(): BackendFeature {
     // eslint-disable-next-line consistent-this
     const that = this;
@@ -78,6 +85,8 @@ class DynamicPluginLister {
             dynamicPlugins: dynamicPluginsServiceRef,
           },
           async init({ dynamicPlugins }) {
+            that.getScannedPackage = plugin =>
+              dynamicPlugins.getScannedPackage(plugin);
             that.loadedPlugins.push(
               ...dynamicPlugins.plugins({ includeFailed: true }),
             );
@@ -112,9 +121,14 @@ describe('dynamicPluginsFeatureLoader', () => {
         }),
         dynamicPluginsFeatureLoader({
           moduleLoader: logger =>
-            jestFreeTypescriptAwareModuleLoader(logger, true),
-          transports: [mockedTransport],
-          format: winston.format.simple(),
+            jestFreeTypescriptAwareModuleLoader({
+              logger,
+              dontBootstrap: true,
+            }),
+          logger: () => ({
+            transports: [mockedTransport],
+            format: winston.format.simple(),
+          }),
         }),
         dynamicPLuginsLister.feature(),
       ],
@@ -137,6 +151,57 @@ describe('dynamicPluginsFeatureLoader', () => {
     ]);
   });
 
+  it('should fail on resolvePackagePath because -dynamic suffix is not allowed for dynamic plugin packages.', async () => {
+    const dynamicPLuginsLister = new DynamicPluginLister();
+    const mockedTransport = new MockedTransport();
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({
+              logger,
+              dynamicPluginPackageNameSuffixes: [],
+            }),
+          logger: () => ({
+            transports: [mockedTransport],
+            format: winston.format.simple(),
+          }),
+        }),
+        dynamicPLuginsLister.feature(),
+      ],
+    });
+    expect(mockedTransport.logs).toContainEqual(
+      expect.stringMatching(
+        "error: an error occurred while loading dynamic backend plugin 'plugin-test-backend-dynamic' from '.*/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic",
+      ),
+    );
+    expect(dynamicPLuginsLister.loadedPlugins).toMatchObject([
+      {
+        name: 'plugin-test-backend-dynamic',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+        failure:
+          expect.stringMatching(`Error: Cannot find module 'plugin-test-backend/package.json'
+Require stack:
+- .*/packages/backend-plugin-api/src/paths.ts
+- .*/packages/backend-plugin-api/src/index.ts
+- .*/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
+- .*/packages/backend-dynamic-feature-service/src/manager/index.ts
+- .*/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
+`),
+      },
+      expect.anything(),
+    ]);
+  });
+
   it('should load and show the 2 dynamic plugins in a list of dynamic plugins returned by a static backend plugin', async () => {
     const dynamicPLuginsLister = new DynamicPluginLister();
     await startTestBackend({
@@ -149,7 +214,8 @@ describe('dynamicPluginsFeatureLoader', () => {
           },
         }),
         dynamicPluginsFeatureLoader({
-          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
         }),
         dynamicPLuginsLister.feature(),
       ],
@@ -174,6 +240,43 @@ describe('dynamicPluginsFeatureLoader', () => {
     ]);
   });
 
+  it('should allow overriding logger options based on config', async () => {
+    const mockedTransport = new MockedTransport();
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+            customLogLabel: 'a very nice label',
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
+          logger: config => {
+            const label = config?.getString('customLogLabel') ?? 'no-label';
+            return {
+              transports: [mockedTransport],
+              format: winston.format.combine(
+                winston.format.label({
+                  label,
+                  message: true,
+                }),
+                winston.format.simple(),
+              ),
+            };
+          },
+        }),
+      ],
+    });
+
+    expect(mockedTransport.logs).toContainEqual(
+      'info: [a very nice label] Found 0 new secrets in config that will be redacted {"service":"backstage"}',
+    );
+  });
+
   it('should redact the secret config values of dynamic plugin config schemas in logs', async () => {
     const mockedTransport = new MockedTransport();
     await startTestBackend({
@@ -189,9 +292,12 @@ describe('dynamicPluginsFeatureLoader', () => {
           },
         }),
         dynamicPluginsFeatureLoader({
-          moduleLoader: jestFreeTypescriptAwareModuleLoader,
-          transports: [mockedTransport],
-          format: winston.format.simple(),
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
+          logger: () => ({
+            transports: [mockedTransport],
+            format: winston.format.simple(),
+          }),
         }),
       ],
     });
@@ -239,7 +345,8 @@ describe('dynamicPluginsFeatureLoader', () => {
           },
         }),
         dynamicPluginsFeatureLoader({
-          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
         }),
         import('@backstage/plugin-app-backend'),
       ],
@@ -275,7 +382,8 @@ describe('dynamicPluginsFeatureLoader', () => {
           },
         }),
         dynamicPluginsFeatureLoader({
-          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
         }),
       ],
     });
@@ -308,4 +416,73 @@ describe('dynamicPluginsFeatureLoader', () => {
       },
     });
   });
+
+  it('should load a backend plugin from the alpha package first', async () => {
+    const dynamicPLuginsLister = new DynamicPluginLister();
+    const mockedTransport = new MockedTransport();
+    const dynamicPluginsRootForAlpha = resolvePath(
+      __dirname,
+      '__fixtures__/dynamic-plugins-root-for-alpha',
+    );
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootForAlpha,
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader({ logger }),
+          logger: () => ({
+            transports: [mockedTransport],
+            format: winston.format.simple(),
+          }),
+        }),
+        dynamicPLuginsLister.feature(),
+      ],
+    });
+
+    expect(mockedTransport.logs).toContainEqual(
+      'info: This plugin has been loaded from the alpha package. {"service":"backstage"}',
+    );
+
+    const loadedPlugins = dynamicPLuginsLister.loadedPlugins;
+    expect(loadedPlugins).toMatchObject([
+      {
+        installer: {
+          kind: 'new',
+        },
+        name: 'plugin-test-backend-alpha-dynamic',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+      },
+    ]);
+    expect(
+      dynamicPLuginsLister.getScannedPackage?.(loadedPlugins[0]),
+    ).toMatchObject({
+      location: url.pathToFileURL(
+        path.resolve(dynamicPluginsRootForAlpha, 'test-backend-alpha-dynamic'),
+      ),
+      manifest: {
+        name: 'plugin-test-backend-alpha-dynamic',
+        version: '0.0.0',
+        description: 'A test dynamic backend module that exposes alpha API.',
+        backstage: {
+          role: 'backend-plugin',
+          pluginId: 'test-alpha',
+          pluginPackages: ['plugin-test-backend-alpha'],
+        },
+        keywords: ['backstage', 'dynamic'],
+      },
+      alphaManifest: {
+        name: 'plugin-test-backend-alpha-dynamic__alpha',
+        version: '0.0.0',
+        main: '../dist/alpha.cjs.js',
+      },
+    });
+  });
 });
diff --git a/packages/backend-dynamic-feature-service/src/features/features.ts b/packages/backend-dynamic-feature-service/src/features/features.ts
index 4788f1da75..94711816d7 100644
--- a/packages/backend-dynamic-feature-service/src/features/features.ts
+++ b/packages/backend-dynamic-feature-service/src/features/features.ts
@@ -18,26 +18,28 @@ import {
   coreServices,
   createBackendFeatureLoader,
 } from '@backstage/backend-plugin-api';
-import {
-  DynamicPluginsSchemasOptions,
-  dynamicPluginsFrontendSchemas,
-  dynamicPluginsRootLoggerServiceFactory,
-  dynamicPluginsSchemasServiceFactory,
-} from '../schemas';
+import type { Config } from '@backstage/config';
 import {
   DynamicPluginsFactoryOptions,
   dynamicPluginsFeatureDiscoveryLoader,
   dynamicPluginsServiceFactory,
 } from '../manager';
-import { DynamicPluginsRootLoggerFactoryOptions } from '../schemas';
 import { configKey } from '../scanner/plugin-scanner';
+import {
+  DynamicPluginsRootLoggerFactoryOptions,
+  DynamicPluginsSchemasOptions,
+  dynamicPluginsFrontendSchemas,
+  dynamicPluginsRootLoggerServiceFactory,
+  dynamicPluginsSchemasServiceFactory,
+} from '../schemas';
 
 /**
  * @public
  */
 export type DynamicPluginsFeatureLoaderOptions = DynamicPluginsFactoryOptions &
-  DynamicPluginsSchemasOptions &
-  DynamicPluginsRootLoggerFactoryOptions;
+  DynamicPluginsSchemasOptions & {
+    logger?: (config?: Config) => DynamicPluginsRootLoggerFactoryOptions;
+  };
 
 const dynamicPluginsFeatureLoaderWithOptions = (
   options?: DynamicPluginsFeatureLoaderOptions,
@@ -49,13 +51,18 @@ const dynamicPluginsFeatureLoaderWithOptions = (
     *loader({ config }) {
       const dynamicPluginsEnabled = config.has(configKey);
 
+      let rootLoggerOptions: DynamicPluginsRootLoggerFactoryOptions = {};
+      if (options?.logger) {
+        rootLoggerOptions = options.logger(config);
+      }
+
       yield* [
         dynamicPluginsSchemasServiceFactory(options),
         dynamicPluginsServiceFactory(options),
       ];
       if (dynamicPluginsEnabled) {
         yield* [
-          dynamicPluginsRootLoggerServiceFactory(options),
+          dynamicPluginsRootLoggerServiceFactory(rootLoggerOptions),
           dynamicPluginsFrontendSchemas,
           dynamicPluginsFeatureDiscoveryLoader,
         ];
@@ -94,12 +101,13 @@ const dynamicPluginsFeatureLoaderWithOptions = (
  * import { dynamicPluginsFeatureLoader } from '@backstage/backend-dynamic-feature-service';
  * import { myCustomModuleLoader } from './myCustomModuleLoader';
  * import { myCustomSchemaLocator } from './myCustomSchemaLocator';
+ * import { myConfiguredLoggerOptions } from './myConfiguredLoggerOptions';
  *
  * const backend = createBackend();
  * backend.add(dynamicPluginsFeatureLoader({
  *   moduleLoader: myCustomModuleLoader,
  *   schemaLocator: myCustomSchemaLocator,
- *
+ *   logger: (config) => myConfiguredLoggerOptions(config),
  * }));
  * //...
  * backend.start();
diff --git a/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts b/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
index f9d4a48a44..50a6028422 100644
--- a/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
+++ b/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
@@ -16,17 +16,35 @@
 import { ModuleLoader } from './types';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import path from 'path';
+import { ScannedPluginManifest } from '../scanner';
 
+/**
+ * @public
+ */
+export type CommonJSModuleLoaderOptions = {
+  logger: LoggerService;
+  dynamicPluginPackageNameSuffixes?: String[];
+  customResolveDynamicPackage?: (
+    logger: LoggerService,
+    searchedPackageName: string,
+    scannedPluginManifests: Map<string, ScannedPluginManifest>,
+  ) => string | undefined;
+};
+
+/**
+ * @public
+ */
 export class CommonJSModuleLoader implements ModuleLoader {
   private module: any;
 
-  constructor(public readonly logger: LoggerService) {
+  constructor(public readonly options: CommonJSModuleLoaderOptions) {
     this.module = require('node:module');
   }
 
   async bootstrap(
     backstageRoot: string,
     dynamicPluginsPaths: string[],
+    scannedPluginManifests: Map<string, ScannedPluginManifest>,
   ): Promise<void> {
     const backstageRootNodeModulesPath = `${backstageRoot}/node_modules`;
     const dynamicNodeModulesPaths = [
@@ -44,11 +62,91 @@ export class CommonJSModuleLoader implements ModuleLoader {
           dynamicNodeModulesPaths.some(p => nodeModulePath.startsWith(p))
         );
       });
-      this.logger.debug(
+      this.options.logger.debug(
         `Overriding node_modules search path for dynamic plugin ${from} to: ${filtered}`,
       );
       return filtered;
     };
+
+    // The whole piece of code below is a way to accomodate the limitations of
+    // the current `resolvePackagePath` implementation, which cannot be provided
+    // some custom locations where it should find the assets of some given packages.
+    //
+    // Since the packages for dynamic plugins are not located in the main backstage
+    // monorepo structure, and since dynamic plugins could also be repackaged
+    // (typically renamed with a `-dynamic` suffix), for now we have to customize
+    // module file name resolution here to support these use-cases.
+    //
+    // This might not be necessary anymore according to future enhancements to the
+    // `resolvePackagePath` feature.
+    const oldResolveFileName = this.module._resolveFilename;
+    this.module._resolveFilename = (
+      request: string,
+      mod: NodeModule,
+      _: boolean,
+      options: any,
+    ): any => {
+      let errorToThrow: any;
+      try {
+        return oldResolveFileName(request, mod, _, options);
+      } catch (e) {
+        errorToThrow = e;
+        this.options.logger.debug(
+          `Could not resolve '${request}' inside the Core backstage backend application`,
+          e instanceof Error ? e : undefined,
+        );
+      }
+
+      // Are we trying to resolve a `package.json` from an originating module of the core backstage application
+      // (this is mostly done by calling `@backstage/backend-plugin-api/resolvePackagePath`).
+      const resolvingPackageJsonFromBackstageApplication =
+        request?.endsWith('/package.json') &&
+        mod?.path &&
+        !dynamicPluginsPaths.some(p => mod.path.startsWith(p));
+
+      // If not, we don't need the dedicated specfic case below.
+      if (!resolvingPackageJsonFromBackstageApplication) {
+        throw errorToThrow;
+      }
+
+      this.options.logger.info(
+        `Resolving '${request}' in the dynamic backend plugins`,
+      );
+      const searchedPackageName = request.replace(/\/package.json$/, '');
+
+      // First search for a dynamic plugin package matching the expected package name,
+      // taking in account accepted dynamic plugin package name suffixes
+      // (suffix accepted by default is '-dynamic').
+      const searchedPackageNamesWithSuffixes = (
+        this.options.dynamicPluginPackageNameSuffixes ?? ['-dynamic']
+      ).map(s => `${searchedPackageName}${s}`);
+      for (const [realPath, pkg] of scannedPluginManifests.entries()) {
+        if (
+          [searchedPackageName, ...searchedPackageNamesWithSuffixes].includes(
+            pkg.name,
+          )
+        ) {
+          const resolvedPath = path.resolve(realPath, 'package.json');
+          this.options.logger.info(`Resolved '${request}' at ${resolvedPath}`);
+          return resolvedPath;
+        }
+      }
+
+      // If a custom resolution is provided, use it.
+      // This allows accomodating alternate ways to package dynamic plugins:
+      // static plugin package wrapped inside a distinct dynamic plugin package for example.
+      if (this.options.customResolveDynamicPackage) {
+        const resolvedPath = this.options.customResolveDynamicPackage(
+          this.options.logger,
+          searchedPackageName,
+          scannedPluginManifests,
+        );
+        if (resolvedPath) {
+          return resolvedPath;
+        }
+      }
+      throw errorToThrow;
+    };
   }
 
   async load(packagePath: string): Promise<any> {
diff --git a/packages/backend-dynamic-feature-service/src/loader/index.ts b/packages/backend-dynamic-feature-service/src/loader/index.ts
index ff0892e66d..fe4f34dc90 100644
--- a/packages/backend-dynamic-feature-service/src/loader/index.ts
+++ b/packages/backend-dynamic-feature-service/src/loader/index.ts
@@ -15,3 +15,5 @@
  */
 
 export type { ModuleLoader } from './types';
+export type { CommonJSModuleLoaderOptions } from './CommonJSModuleLoader';
+export { CommonJSModuleLoader } from './CommonJSModuleLoader';
diff --git a/packages/backend-dynamic-feature-service/src/loader/types.ts b/packages/backend-dynamic-feature-service/src/loader/types.ts
index 12a051e482..99f3c00607 100644
--- a/packages/backend-dynamic-feature-service/src/loader/types.ts
+++ b/packages/backend-dynamic-feature-service/src/loader/types.ts
@@ -14,11 +14,17 @@
  * limitations under the License.
  */
 
+import { ScannedPluginManifest } from '../scanner';
+
 /**
  * @public
  */
 export interface ModuleLoader {
-  bootstrap(backstageRoot: string, dynamicPluginPaths: string[]): Promise<void>;
+  bootstrap(
+    backstageRoot: string,
+    dynamicPluginPaths: string[],
+    scannedPluginManifests?: Map<string, ScannedPluginManifest>,
+  ): Promise<void>;
 
   load(id: string): Promise<any>;
 }
diff --git a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
index b6854e3263..d7133a804a 100644
--- a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
+++ b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
@@ -44,7 +44,7 @@ import { PluginScanner } from '../scanner/plugin-scanner';
 import { findPaths } from '@backstage/cli-common';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 import { rootLifecycleServiceFactory } from '@backstage/backend-defaults/rootLifecycle';
-import { PackageRole } from '@backstage/cli-node';
+import { BackstagePackageJson, PackageRole } from '@backstage/cli-node';
 
 describe('backend-dynamic-feature-service', () => {
   const mockDir = createMockDirectory();
@@ -61,6 +61,13 @@ describe('backend-dynamic-feature-service', () => {
         relativePath: string[];
         content: string;
       };
+      alpha?: {
+        packageManifest: BackstagePackageJson;
+        indexFile: {
+          relativePath: string[];
+          content: string;
+        };
+      };
       expectedLogs?(location: URL): {
         errors?: LogContent[];
         warns?: LogContent[];
@@ -127,7 +134,7 @@ describe('backend-dynamic-feature-service', () => {
         },
         indexFile: {
           relativePath: ['dist', 'index.cjs.js'],
-          content: `const alpha = { $$type: '@backstage/BackendFeature' }; exports["default"] = alpha;`,
+          content: `const feature = { $$type: '@backstage/BackendFeature' }; exports["default"] = feature;`,
         },
         expectedLogs(location) {
           return {
@@ -158,6 +165,60 @@ describe('backend-dynamic-feature-service', () => {
           );
         },
       },
+      {
+        name: 'should load the alpha variant of a backend plugin in priority',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        indexFile: {
+          relativePath: ['dist', 'index.cjs.js'],
+          content: `throw 'should not take this one';`,
+        },
+        alpha: {
+          packageManifest: {
+            name: 'backend-dynamic-plugin-test',
+            version: '0.0.0',
+            main: '../dist/alpha.cjs.js',
+          },
+          indexFile: {
+            relativePath: ['dist', 'alpha.cjs.js'],
+            content: `const alpha = { $$type: '@backstage/BackendFeature' }; exports["default"] = alpha;`,
+          },
+        },
+        expectedLogs(location) {
+          return {
+            infos: [
+              {
+                message: `loaded dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}/alpha'`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              installer: {
+                kind: 'new',
+              },
+            },
+          ]);
+          const installer: NewBackendPluginInstaller = (
+            plugins[0] as BackendDynamicPlugin
+          ).installer as NewBackendPluginInstaller;
+          expect((installer.install() as BackendFeature).$$type).toEqual(
+            '@backstage/BackendFeature',
+          );
+        },
+      },
       {
         name: 'should successfully load a new backend plugin by the default BackendFeatureFactory',
         packageManifest: {
@@ -580,11 +641,12 @@ describe('backend-dynamic-feature-service', () => {
       const plugin: ScannedPluginPackage = {
         location: url.pathToFileURL(mockDir.resolve(randomUUID())),
         manifest: tc.packageManifest,
+        alphaManifest: tc.alpha?.packageManifest,
       };
 
       const mockedFiles = {
         [path.join(url.fileURLToPath(plugin.location), 'package.json')]:
-          JSON.stringify(plugin),
+          JSON.stringify(tc.packageManifest),
       };
       if (tc.indexFile) {
         mockedFiles[
@@ -594,6 +656,18 @@ describe('backend-dynamic-feature-service', () => {
           )
         ] = tc.indexFile.content;
       }
+      if (tc.alpha) {
+        mockedFiles[
+          path.join(url.fileURLToPath(plugin.location), 'alpha', 'package.json')
+        ] = JSON.stringify(tc.alpha.packageManifest);
+        mockedFiles[
+          path.join(
+            url.fileURLToPath(plugin.location),
+            ...tc.alpha.indexFile.relativePath,
+          )
+        ] = tc.alpha.indexFile.content;
+      }
+
       mockDir.setContent(mockedFiles);
 
       const logger = new MockedLogger();
@@ -1012,9 +1086,25 @@ describe('backend-dynamic-feature-service', () => {
       expect(fromConfigSpier).toHaveBeenCalled();
       expect(applyConfigSpier).toHaveBeenCalled();
       expect(scanRootSpier).toHaveBeenCalled();
+      const realPath = fs.realpathSync(
+        otherMockDir.resolve('a-dynamic-plugin'),
+      );
       expect(mockedModuleLoader.bootstrap).toHaveBeenCalledWith(
         findPaths(__dirname).targetRoot,
-        [fs.realpathSync(otherMockDir.resolve('a-dynamic-plugin'))],
+        [realPath],
+        new Map<string, ScannedPluginManifest>([
+          [
+            realPath,
+            {
+              name: 'test',
+              main: 'dist/index.cjs.js',
+              version: '0.0.0',
+              backstage: {
+                role: 'backend-plugin',
+              },
+            },
+          ],
+        ]),
       );
       expect(mockedModuleLoader.load).toHaveBeenCalledWith(
         mockDir.resolve(
diff --git a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
index a94a01f0f1..c64fca053c 100644
--- a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
+++ b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
@@ -36,7 +36,6 @@ import {
 } from '@backstage/backend-plugin-api';
 import { PackageRole, PackageRoles } from '@backstage/cli-node';
 import { findPaths } from '@backstage/cli-common';
-import path from 'path';
 import * as fs from 'fs';
 import {
   FeatureDiscoveryService,
@@ -71,24 +70,26 @@ export class DynamicPluginManager implements DynamicPluginProvider {
     const scannedPlugins = (await scanner.scanRoot()).packages;
     scanner.trackChanges();
     const moduleLoader =
-      options.moduleLoader || new CommonJSModuleLoader(options.logger);
+      options.moduleLoader ||
+      new CommonJSModuleLoader({ logger: options.logger });
     const manager = new DynamicPluginManager(
       options.logger,
       scannedPlugins,
       moduleLoader,
     );
 
-    const dynamicPluginsPaths = scannedPlugins.map(p =>
-      fs.realpathSync(
-        path.dirname(
-          path.dirname(
-            path.resolve(url.fileURLToPath(p.location), p.manifest.main),
-          ),
-        ),
-      ),
+    const scannedPluginManifestsPerRealPath = new Map(
+      scannedPlugins.map(p => [
+        fs.realpathSync(url.fileURLToPath(p.location)),
+        p.manifest,
+      ]),
     );
 
-    await moduleLoader.bootstrap(backstageRoot, dynamicPluginsPaths);
+    await moduleLoader.bootstrap(
+      backstageRoot,
+      [...scannedPluginManifestsPerRealPath.keys()],
+      scannedPluginManifestsPerRealPath,
+    );
 
     scanner.subscribeToRootDirectoryChange(async () => {
       manager._availablePackages = (await scanner.scanRoot()).packages;
@@ -164,8 +165,13 @@ export class DynamicPluginManager implements DynamicPluginProvider {
   private async loadBackendPlugin(
     plugin: ScannedPluginPackage,
   ): Promise<BackendDynamicPlugin> {
+    const usedPluginManifest =
+      plugin.alphaManifest?.main ?? plugin.manifest.main;
+    const usedPluginLocation = plugin.alphaManifest?.main
+      ? `${plugin.location}/alpha`
+      : plugin.location;
     const packagePath = url.fileURLToPath(
-      `${plugin.location}/${plugin.manifest.main}`,
+      `${usedPluginLocation}/${usedPluginManifest}`,
     );
     const dynamicPlugin: BackendDynamicPlugin = {
       name: plugin.manifest.name,
@@ -194,12 +200,12 @@ export class DynamicPluginManager implements DynamicPluginProvider {
       }
       if (dynamicPlugin.installer) {
         this.logger.info(
-          `loaded dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
+          `loaded dynamic backend plugin '${plugin.manifest.name}' from '${usedPluginLocation}'`,
         );
       } else {
         dynamicPlugin.failure = `the module should either export a 'BackendFeature' or 'BackendFeatureFactory' as default export, or export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field as dynamic loading entrypoint.`;
         this.logger.error(
-          `dynamic backend plugin '${plugin.manifest.name}' could not be loaded from '${plugin.location}': ${dynamicPlugin.failure}`,
+          `dynamic backend plugin '${plugin.manifest.name}' could not be loaded from '${usedPluginLocation}': ${dynamicPlugin.failure}`,
         );
       }
       return dynamicPlugin;
@@ -210,7 +216,7 @@ export class DynamicPluginManager implements DynamicPluginProvider {
           : new Error(error);
       dynamicPlugin.failure = `${typedError.name}: ${typedError.message}`;
       this.logger.error(
-        `an error occurred while loading dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
+        `an error occurred while loading dynamic backend plugin '${plugin.manifest.name}' from '${usedPluginLocation}'`,
         typedError,
       );
       return dynamicPlugin;
diff --git a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.test.ts b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.test.ts
index 3086f2c16e..89fc42359f 100644
--- a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.test.ts
+++ b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.test.ts
@@ -30,6 +30,7 @@ const mockDir = createMockDirectory();
 
 describe('plugin-scanner', () => {
   const env = process.env;
+
   beforeEach(() => {
     jest.resetModules();
   });
@@ -38,7 +39,6 @@ describe('plugin-scanner', () => {
     mockDir.clear();
     process.env = env;
   });
-
   describe('applyConfig', () => {
     type TestCase = {
       name: string;
@@ -430,16 +430,19 @@ Please add '${mockDir.resolve(
         expectedPluginPackages: [
           {
             location: url.pathToFileURL(
-              mockDir.resolve(
-                'backstageRoot/dist-dynamic/test-backend-plugin/alpha',
-              ),
+              mockDir.resolve('backstageRoot/dist-dynamic/test-backend-plugin'),
             ),
             manifest: {
               name: 'test-backend-plugin-dynamic',
               version: '0.0.0',
-              main: '../dist/alpha.cjs.js',
+              main: 'dist/index.cjs.js',
               backstage: { role: 'backend-plugin' },
             },
+            alphaManifest: {
+              name: 'test-backend-plugin-dynamic',
+              version: '0.0.0',
+              main: '../dist/alpha.cjs.js',
+            },
           },
         ],
       },
@@ -539,9 +542,11 @@ Please add '${mockDir.resolve(
         expectedLogs: {
           errors: [
             {
-              message: `failed to load dynamic plugin manifest from '${mockDir.resolve(
-                'backstageRoot/dist-dynamic/test-backend-plugin/alpha',
-              )}'`,
+              message: expect.stringContaining(
+                `failed to load dynamic plugin manifest from '${mockDir.resolve(
+                  'backstageRoot/dist-dynamic/test-backend-plugin/alpha',
+                )}'; caused by SyntaxError: Unexpected token`,
+              ),
               meta: {
                 name: 'SyntaxError',
                 message: expect.stringContaining('Unexpected token'),
diff --git a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
index 7091999e7b..5b254908b2 100644
--- a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
+++ b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
@@ -21,8 +21,8 @@ import * as chokidar from 'chokidar';
 import * as path from 'path';
 import * as url from 'url';
 import debounce from 'lodash/debounce';
-import { PackagePlatform, PackageRoles } from '@backstage/cli-node';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { ForwardedError } from '@backstage/errors';
 
 export interface DynamicPluginScannerOptions {
   config: Config;
@@ -161,52 +161,25 @@ export class PluginScanner {
       }
 
       let scannedPlugin: ScannedPluginPackage;
-      let platform: PackagePlatform;
       try {
         scannedPlugin = await this.scanDir(pluginHome);
         if (!scannedPlugin.manifest.main) {
           throw new Error("field 'main' not found in 'package.json'");
         }
-        if (scannedPlugin.manifest.backstage?.role) {
-          platform = PackageRoles.getRoleInfo(
-            scannedPlugin.manifest.backstage.role,
-          ).platform;
-        } else {
+        if (!scannedPlugin.manifest.backstage?.role) {
           throw new Error("field 'backstage.role' not found in 'package.json'");
         }
       } catch (e) {
-        this.logger.error(
-          `failed to load dynamic plugin manifest from '${pluginHome}'`,
-          e,
-        );
+        if (e instanceof ForwardedError) {
+          this.logger.error(e.message, e.cause);
+        } else {
+          this.logger.error(
+            `failed to load dynamic plugin manifest from '${pluginHome}'`,
+            e,
+          );
+        }
         continue;
       }
-
-      if (platform === 'node') {
-        if (this.preferAlpha) {
-          const pluginHomeAlpha = path.resolve(pluginHome, 'alpha');
-          if (existsSync(pluginHomeAlpha)) {
-            if ((await fs.lstat(pluginHomeAlpha)).isDirectory()) {
-              const backstage = scannedPlugin.manifest.backstage;
-              try {
-                scannedPlugin = await this.scanDir(pluginHomeAlpha);
-              } catch (e) {
-                this.logger.error(
-                  `failed to load dynamic plugin manifest from '${pluginHomeAlpha}'`,
-                  e,
-                );
-                continue;
-              }
-              scannedPlugin.manifest.backstage = backstage;
-            } else {
-              this.logger.warn(
-                `skipping '${pluginHomeAlpha}' since it is not a directory`,
-              );
-            }
-          }
-        }
-      }
-
       scannedPlugins.push(scannedPlugin);
     }
     return { packages: scannedPlugins };
@@ -216,10 +189,37 @@ export class PluginScanner {
     const manifestFile = path.resolve(pluginHome, 'package.json');
     const content = await fs.readFile(manifestFile);
     const manifest: ScannedPluginManifest = JSON.parse(content.toString());
-    return {
+    const scannedPluginPackage: ScannedPluginPackage = {
       location: url.pathToFileURL(pluginHome),
       manifest: manifest,
     };
+
+    if (this.preferAlpha) {
+      const pluginHomeAlpha = path.resolve(pluginHome, 'alpha');
+      if (existsSync(pluginHomeAlpha)) {
+        if ((await fs.lstat(pluginHomeAlpha)).isDirectory()) {
+          try {
+            const alphaContent = await fs.readFile(
+              path.resolve(pluginHomeAlpha, 'package.json'),
+            );
+            scannedPluginPackage.alphaManifest = JSON.parse(
+              alphaContent.toString(),
+            );
+          } catch (e) {
+            throw new ForwardedError(
+              `failed to load dynamic plugin manifest from '${pluginHome}/alpha'`,
+              e,
+            );
+          }
+        } else {
+          this.logger.warn(
+            `skipping '${pluginHomeAlpha}' since it is not a directory`,
+          );
+        }
+      }
+    }
+
+    return scannedPluginPackage;
   }
 
   async trackChanges(): Promise<void> {
diff --git a/packages/backend-dynamic-feature-service/src/scanner/types.ts b/packages/backend-dynamic-feature-service/src/scanner/types.ts
index 5bac92f064..bfb3e21c89 100644
--- a/packages/backend-dynamic-feature-service/src/scanner/types.ts
+++ b/packages/backend-dynamic-feature-service/src/scanner/types.ts
@@ -22,6 +22,7 @@ import { BackstagePackageJson, PackageRole } from '@backstage/cli-node';
 export interface ScannedPluginPackage {
   location: URL;
   manifest: ScannedPluginManifest;
+  alphaManifest?: BackstagePackageJson;
 }
 
 /**
diff --git a/packages/backend-dynamic-feature-service/src/schemas/schemas.ts b/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
index 52fb5eab6d..0e873e986c 100644
--- a/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
+++ b/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
@@ -161,10 +161,7 @@ async function gatherDynamicPluginsSchemas(
     let schemaLocation = schemaLocator(pluginPackage);
 
     if (!path.isAbsolute(schemaLocation)) {
-      let pluginLocation = url.fileURLToPath(pluginPackage.location);
-      if (path.basename(pluginLocation) === 'alpha') {
-        pluginLocation = path.dirname(pluginLocation);
-      }
+      const pluginLocation = url.fileURLToPath(pluginPackage.location);
       schemaLocation = path.resolve(pluginLocation, schemaLocation);
     }
 
diff --git a/packages/backend-legacy/CHANGELOG.md b/packages/backend-legacy/CHANGELOG.md
index 58c6bdc7c0..2e5fdf3d48 100644
--- a/packages/backend-legacy/CHANGELOG.md
+++ b/packages/backend-legacy/CHANGELOG.md
@@ -1,5 +1,331 @@
 # example-backend-legacy
 
+## 0.2.105-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-app-backend@0.4.3-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.2
+  - @backstage/plugin-proxy-backend@0.5.9-next.2
+  - @backstage/plugin-search-backend@1.8.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-signals-backend@0.2.4-next.2
+  - @backstage/plugin-techdocs-backend@1.11.4-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-permission-backend@0.5.52-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.2.105-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.1
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-search-backend@1.8.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.1
+  - @backstage/plugin-permission-backend@0.5.52-next.1
+  - @backstage/plugin-techdocs-backend@1.11.4-next.1
+  - @backstage/plugin-signals-backend@0.2.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.9-next.1
+  - @backstage/plugin-app-backend@0.4.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.1
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.4-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.1
+
+## 0.2.105-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.0
+  - @backstage/plugin-app-backend@0.4.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-backend@0.5.52-next.0
+  - @backstage/plugin-devtools-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.4-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-proxy-backend@0.5.9-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.3-next.0
+  - @backstage/plugin-search-backend@1.7.1-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.3-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.39-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+  - @backstage/plugin-techdocs-backend@1.11.4-next.0
+
+## 0.2.104
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-app-backend@0.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-scaffolder-backend@1.27.0
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-search-backend@1.7.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1
+  - @backstage/plugin-kubernetes-backend@0.19.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-backend@0.2.3
+  - @backstage/plugin-search-backend-module-pg@0.5.38
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-proxy-backend@0.5.8
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2
+  - @backstage/plugin-devtools-backend@0.4.2
+  - @backstage/plugin-permission-backend@0.5.51
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-backend@1.11.2
+
+## 0.2.104-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.3
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.3
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.3
+  - @backstage/plugin-search-backend@1.7.0-next.3
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.3
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.3
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-signals-backend@0.2.3-next.3
+  - @backstage/plugin-signals-node@0.1.14-next.3
+  - @backstage/plugin-techdocs-backend@1.11.2-next.3
+
+## 0.2.104-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-search-backend@1.7.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/plugin-techdocs-backend@1.11.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-signals-backend@0.2.3-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## 0.2.104-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-devtools-backend@0.4.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-backend@0.5.51-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-proxy-backend@0.5.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.1
+  - @backstage/plugin-search-backend@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-signals-backend@0.2.3-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+  - @backstage/plugin-techdocs-backend@1.11.2-next.1
+
+## 0.2.104-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.26.3-next.0
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/plugin-signals-backend@0.2.3-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-app-backend@0.3.77-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.0
+  - @backstage/plugin-devtools-backend@0.4.2-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.8-next.0
+  - @backstage/plugin-permission-backend@0.5.51-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-proxy-backend@0.5.8-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.2-next.0
+  - @backstage/plugin-search-backend@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.38-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+  - @backstage/plugin-techdocs-backend@1.11.2-next.0
+
 ## 0.2.103
 
 ### Patch Changes
diff --git a/packages/backend-legacy/package.json b/packages/backend-legacy/package.json
index 563bcb830e..f1ac32e60b 100644
--- a/packages/backend-legacy/package.json
+++ b/packages/backend-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-legacy",
-  "version": "0.2.103",
+  "version": "0.2.105-next.2",
   "backstage": {
     "role": "backend"
   },
@@ -42,7 +42,6 @@
     "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "workspace:^",
     "@backstage/plugin-catalog-backend-module-unprocessed": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
-    "@backstage/plugin-devtools-backend": "workspace:^",
     "@backstage/plugin-events-backend": "workspace:^",
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/plugin-kubernetes-backend": "workspace:^",
diff --git a/packages/backend-legacy/src/index.ts b/packages/backend-legacy/src/index.ts
index 23f71baba5..8ef969ff2b 100644
--- a/packages/backend-legacy/src/index.ts
+++ b/packages/backend-legacy/src/index.ts
@@ -48,7 +48,6 @@ import techdocs from './plugins/techdocs';
 import app from './plugins/app';
 import permission from './plugins/permission';
 import signals from './plugins/signals';
-import devtools from './plugins/devtools';
 import { PluginEnvironment } from './types';
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
@@ -138,7 +137,6 @@ async function main() {
   const appEnv = useHotMemoize(module, () => createEnv('app'));
   const permissionEnv = useHotMemoize(module, () => createEnv('permission'));
   const eventsEnv = useHotMemoize(module, () => createEnv('events'));
-  const devToolsEnv = useHotMemoize(module, () => createEnv('devtools'));
   const signalsEnv = useHotMemoize(module, () => createEnv('signals'));
 
   const apiRouter = Router();
@@ -151,7 +149,6 @@ async function main() {
   apiRouter.use('/kubernetes', await kubernetes(kubernetesEnv));
   apiRouter.use('/proxy', await proxy(proxyEnv));
   apiRouter.use('/permission', await permission(permissionEnv));
-  apiRouter.use('/devtools', await devtools(devToolsEnv));
   apiRouter.use('/signals', await signals(signalsEnv));
   apiRouter.use(notFoundHandler());
 
diff --git a/packages/backend-openapi-utils/CHANGELOG.md b/packages/backend-openapi-utils/CHANGELOG.md
index 83e7f1cfd2..35ec5cc456 100644
--- a/packages/backend-openapi-utils/CHANGELOG.md
+++ b/packages/backend-openapi-utils/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/backend-openapi-utils
 
+## 0.4.0-next.2
+
+### Minor Changes
+
+- afcebea: Fixed a Typescript error when trying to use the new OpenAPI server-side generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## 0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.0
+
+### Minor Changes
+
+- 1440232: Adds a new `createValidatedOpenApiRouterFromGeneratedEndpointMap` function that uses the new static server generation in `backstage-cli package schema openapi generate --server` to create a typed express router.
+
+### Patch Changes
+
+- f01787a: Moves msw from dependencies to devDependencies
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.3.0-next.2
+
+### Minor Changes
+
+- 1440232: Adds a new `createValidatedOpenApiRouterFromGeneratedEndpointMap` function that uses the new static server generation in `backstage-cli package schema openapi generate --server` to create a typed express router.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.2.1-next.0
+
+### Patch Changes
+
+- f01787a: Moves msw from dependencies to devDependencies
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/backend-openapi-utils/README.md b/packages/backend-openapi-utils/README.md
index 3d3f40682e..33f2200f81 100644
--- a/packages/backend-openapi-utils/README.md
+++ b/packages/backend-openapi-utils/README.md
@@ -1,4 +1,4 @@
-# @backstage/openapi-utils
+# @backstage/backend-openapi-utils
 
 ## Summary
 
diff --git a/packages/backend-openapi-utils/package.json b/packages/backend-openapi-utils/package.json
index ddb50812c2..099afe2419 100644
--- a/packages/backend-openapi-utils/package.json
+++ b/packages/backend-openapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-openapi-utils",
-  "version": "0.2.0",
+  "version": "0.4.0-next.2",
   "description": "OpenAPI typescript support.",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-openapi-utils/report.api.md b/packages/backend-openapi-utils/report.api.md
index 2f660cd0d6..22913eb321 100644
--- a/packages/backend-openapi-utils/report.api.md
+++ b/packages/backend-openapi-utils/report.api.md
@@ -102,12 +102,45 @@ export function createValidatedOpenApiRouter<T extends RequiredDoc>(
   },
 ): ApiRouter<T>;
 
+// @public
+export function createValidatedOpenApiRouterFromGeneratedEndpointMap<
+  T extends EndpointMap,
+>(
+  spec: RequiredDoc,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof middleware>['0']>;
+    middleware?: RequestHandler[];
+  },
+): TypedRouter<T>;
+
 // @public (undocumented)
 type DiscriminateUnion<T, K extends keyof T, V extends T[K]> = Extract<
   T,
   Record<K, V>
 >;
 
+// @public (undocumented)
+type DocEndpoint<Doc extends EndpointMap> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${string}|${infer Endpoint}`
+    ? Endpoint
+    : never;
+}>;
+
+// @public (undocumented)
+type DocEndpointMethod<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${infer Method}|${Endpoint}`
+    ? Method
+    : never;
+}>;
+
+// @public (undocumented)
+type DocEndpointTemplate<Doc extends EndpointMap> = PathTemplate<
+  DocEndpoint<Doc>
+>;
+
 // @public (undocumented)
 type DocOperation<
   Doc extends RequiredDoc,
@@ -239,6 +272,85 @@ interface DocRequestMatcher<
   ): T;
 }
 
+// @public (undocumented)
+type EndpointMap = Record<
+  string,
+  {
+    query?: object;
+    body?: object;
+    response?: object | void;
+    path?: object;
+  }
+>;
+
+// @public
+type EndpointMapRequestHandler<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandler<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+type EndpointMapRequestHandlerParams<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandlerParams<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+// @public
+interface EndpointMapRequestMatcher<
+  Doc extends EndpointMap,
+  T,
+  Method extends HttpMethods,
+> {
+  // (undocumented)
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandler<Doc, TemplateToDocEndpoint<Doc, TPath>, TMethod>
+    >
+  ): T;
+  // (undocumented)
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandlerParams<
+        Doc,
+        TemplateToDocEndpoint<Doc, TPath>,
+        TMethod
+      >
+    >
+  ): T;
+}
+
 // @public (undocumented)
 type Filter<T, U> = T extends U ? T : never;
 
@@ -278,6 +390,9 @@ type HeaderSchema<
   Method extends DocPathMethod<Doc, Path>,
 > = ParametersSchema<Doc, Path, Method, ImmutableHeaderObject>;
 
+// @public (undocumented)
+type HttpMethods = 'all' | 'put' | 'get' | 'post' | '_delete';
+
 // @public
 type Immutable<T> = T extends
   | Function
@@ -401,6 +516,20 @@ declare namespace internal {
     Response_3 as Response,
     ResponseSchemas,
     ResponseBodyToJsonSchema,
+    EndpointMap,
+    HttpMethods,
+    StaticPathParamsSchema,
+    StaticRequestBodySchema,
+    StaticResponseSchema,
+    StaticQueryParamsSchema,
+    EndpointMapRequestHandler,
+    EndpointMapRequestHandlerParams,
+    DocEndpoint,
+    DocEndpointMethod,
+    MethodAwareDocEndpoints,
+    DocEndpointTemplate,
+    TemplateToDocEndpoint,
+    EndpointMapRequestMatcher,
   };
 }
 export { internal };
@@ -427,6 +556,19 @@ type MapToSchema<
     : never;
 };
 
+// @public (undocumented)
+type MethodAwareDocEndpoints<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${Method}|${infer E}`
+    ? E extends DocEndpoint<Doc>
+      ? PathTemplate<E>
+      : never
+    : never;
+}>;
+
 // @public (undocumented)
 type MethodAwareDocPath<
   Doc extends PathDoc,
@@ -513,7 +655,7 @@ type PathSchema<
 > = ParametersSchema<Doc, Path, Method, ImmutablePathObject>;
 
 // @public
-type PathTemplate<Path extends string> =
+export type PathTemplate<Path extends string> =
   Path extends `${infer Prefix}{${infer PathName}}${infer Suffix}`
     ? `${Prefix}:${PathName}${PathTemplate<Suffix>}`
     : Path;
@@ -684,6 +826,60 @@ type SchemaRef<Doc extends RequiredDoc, Schema> = Schema extends {
       [Key in keyof Schema]: SchemaRef<Doc, Schema[Key]>;
     };
 
+// @public (undocumented)
+type StaticPathParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'path' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['path']
+    : never
+  : never;
+
+// @public (undocumented)
+type StaticQueryParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'query' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['query']
+    : never
+  : never;
+
+// @public (undocumented)
+type StaticRequestBodySchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'body' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['body']
+    : unknown
+  : unknown;
+
+// @public (undocumented)
+type StaticResponseSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'response' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['response']
+    : unknown
+  : unknown;
+
+// @public (undocumented)
+type TemplateToDocEndpoint<
+  Doc extends EndpointMap,
+  Path extends DocEndpointTemplate<Doc>,
+> = ValueOf<{
+  [Template in DocEndpoint<Doc>]: Path extends PathTemplate<Template>
+    ? Template
+    : never;
+}>;
+
 // @public
 type TemplateToDocPath<
   Doc extends PathDoc,
@@ -704,6 +900,19 @@ type TuplifyUnion<
   N = [T] extends [never] ? true : false,
 > = true extends N ? [] : Push<TuplifyUnion<Exclude<T, L>>, L>;
 
+// @public (undocumented)
+export interface TypedRouter<GeneratedEndpointMap extends EndpointMap>
+  extends Router {
+  // (undocumented)
+  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
+  // (undocumented)
+  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
+  // (undocumented)
+  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
+  // (undocumented)
+  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
+}
+
 // @public
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   k: infer I,
diff --git a/packages/backend-openapi-utils/src/index.ts b/packages/backend-openapi-utils/src/index.ts
index 57d9f755c2..9389fe3be6 100644
--- a/packages/backend-openapi-utils/src/index.ts
+++ b/packages/backend-openapi-utils/src/index.ts
@@ -30,6 +30,11 @@ export type {
   CookieParameters,
   PathParameters,
 } from './utility';
-export type { ApiRouter } from './router';
-export { createValidatedOpenApiRouter, getOpenApiSpecRoute } from './stub';
+export type { ApiRouter, TypedRouter } from './router';
+export type { PathTemplate } from './types/common';
 export { wrapInOpenApiTestServer, wrapServer } from './testUtils';
+export {
+  createValidatedOpenApiRouter,
+  getOpenApiSpecRoute,
+  createValidatedOpenApiRouterFromGeneratedEndpointMap,
+} from './stub';
diff --git a/packages/backend-openapi-utils/src/router.ts b/packages/backend-openapi-utils/src/router.ts
index 253fc1596e..48d89054ba 100644
--- a/packages/backend-openapi-utils/src/router.ts
+++ b/packages/backend-openapi-utils/src/router.ts
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 import { Router } from 'express';
-import { DocRequestMatcher, RequiredDoc } from './types';
+import {
+  DocRequestMatcher,
+  EndpointMap,
+  EndpointMapRequestMatcher,
+  RequiredDoc,
+} from './types';
 
 /**
  * Typed Express router based on an OpenAPI 3.1 spec.
@@ -37,3 +42,14 @@ export interface ApiRouter<Doc extends RequiredDoc> extends Router {
 
   head: DocRequestMatcher<Doc, this, 'head'>;
 }
+
+/**
+ * @public
+ */
+export interface TypedRouter<GeneratedEndpointMap extends EndpointMap>
+  extends Router {
+  get: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'get'>;
+  post: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'post'>;
+  put: EndpointMapRequestMatcher<GeneratedEndpointMap, this, 'put'>;
+  delete: EndpointMapRequestMatcher<GeneratedEndpointMap, this, '_delete'>;
+}
diff --git a/packages/backend-openapi-utils/src/stub.ts b/packages/backend-openapi-utils/src/stub.ts
index 0f62bf348c..8ab00c4df4 100644
--- a/packages/backend-openapi-utils/src/stub.ts
+++ b/packages/backend-openapi-utils/src/stub.ts
@@ -15,8 +15,8 @@
  */
 
 import PromiseRouter from 'express-promise-router';
-import { ApiRouter } from './router';
-import { RequiredDoc } from './types';
+import { ApiRouter, TypedRouter } from './router';
+import { EndpointMap, RequiredDoc } from './types';
 import {
   ErrorRequestHandler,
   RequestHandler,
@@ -24,6 +24,7 @@ import {
   Request,
   Response,
   json,
+  Router,
 } from 'express';
 import { InputError } from '@backstage/errors';
 import { middleware as OpenApiValidator } from 'express-openapi-validator';
@@ -58,19 +59,19 @@ export function getOpenApiSpecRoute(baseUrl: string) {
 }
 
 /**
- * Create a new OpenAPI router with some default middleware.
+ * Create a router with validation middleware. This is used by typing methods to create an
+ *  "OpenAPI router" with all of the expected validation + metadata.
  * @param spec - Your OpenAPI spec imported as a JSON object.
  * @param validatorOptions - `openapi-express-validator` options to override the defaults.
  * @returns A new express router with validation middleware.
- * @public
  */
-export function createValidatedOpenApiRouter<T extends RequiredDoc>(
-  spec: T,
+function createRouterWithValidation(
+  spec: RequiredDoc,
   options?: {
     validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
     middleware?: RequestHandler[];
   },
-) {
+): Router {
   const router = PromiseRouter();
   router.use(options?.middleware || getDefaultRouterMiddleware());
 
@@ -152,6 +153,41 @@ export function createValidatedOpenApiRouter<T extends RequiredDoc>(
     }
     res.json(mergeOutput.output);
   });
-
-  return router as ApiRouter<typeof spec>;
+  return router;
+}
+
+/**
+ * Create a new OpenAPI router with some default middleware.
+ * @param spec - Your OpenAPI spec imported as a JSON object.
+ * @param validatorOptions - `openapi-express-validator` options to override the defaults.
+ * @returns A new express router with validation middleware.
+ * @public
+ */
+export function createValidatedOpenApiRouter<T extends RequiredDoc>(
+  spec: T,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
+    middleware?: RequestHandler[];
+  },
+) {
+  return createRouterWithValidation(spec, options) as ApiRouter<typeof spec>;
+}
+
+/**
+ * Create a new OpenAPI router with some default middleware.
+ * @param spec - Your OpenAPI spec imported as a JSON object.
+ * @param validatorOptions - `openapi-express-validator` options to override the defaults.
+ * @returns A new express router with validation middleware.
+ * @public
+ */
+export function createValidatedOpenApiRouterFromGeneratedEndpointMap<
+  T extends EndpointMap,
+>(
+  spec: RequiredDoc,
+  options?: {
+    validatorOptions?: Partial<Parameters<typeof OpenApiValidator>['0']>;
+    middleware?: RequestHandler[];
+  },
+) {
+  return createRouterWithValidation(spec, options) as TypedRouter<T>;
 }
diff --git a/packages/backend-openapi-utils/src/types/generated.ts b/packages/backend-openapi-utils/src/types/generated.ts
new file mode 100644
index 0000000000..e4d5dada72
--- /dev/null
+++ b/packages/backend-openapi-utils/src/types/generated.ts
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type core from 'express-serve-static-core';
+import { PathTemplate, ValueOf } from './common';
+
+/**
+ * @public
+ */
+export type EndpointMap = Record<
+  string,
+  { query?: object; body?: object; response?: object | void; path?: object }
+>;
+
+// OpenAPI generator doesn't emit regular lowercase 'delete'.
+/**
+ * @public
+ */
+export type HttpMethods = 'all' | 'put' | 'get' | 'post' | '_delete';
+
+/**
+ * @public
+ */
+export type StaticPathParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'path' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['path']
+    : never
+  : never;
+/**
+ * @public
+ */
+export type StaticRequestBodySchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'body' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['body']
+    : unknown
+  : unknown;
+/**
+ * @public
+ */
+export type StaticResponseSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'response' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['response']
+    : unknown
+  : unknown;
+/**
+ * @public
+ */
+export type StaticQueryParamsSchema<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = `#${Method}|${Endpoint}` extends keyof Doc
+  ? 'query' extends keyof Doc[`#${Method}|${Endpoint}`]
+    ? Doc[`#${Method}|${Endpoint}`]['query']
+    : never
+  : never;
+
+/**
+ * Typed express request handler.
+ * @public
+ */
+export type EndpointMapRequestHandler<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandler<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * Typed express error handler / request handler union type.
+ * @public
+ */
+export type EndpointMapRequestHandlerParams<
+  Doc extends EndpointMap,
+  Path extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Path>,
+> = core.RequestHandlerParams<
+  StaticPathParamsSchema<Doc, Path, Method>,
+  StaticResponseSchema<Doc, Path, Method>,
+  StaticRequestBodySchema<Doc, Path, Method>,
+  StaticQueryParamsSchema<Doc, Path, Method>,
+  Record<string, string>
+>;
+
+/**
+ * @public
+ */
+export type DocEndpoint<Doc extends EndpointMap> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${string}|${infer Endpoint}`
+    ? Endpoint
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocEndpointMethod<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${infer Method}|${Endpoint}`
+    ? Method
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type MethodAwareDocEndpoints<
+  Doc extends EndpointMap,
+  Endpoint extends DocEndpoint<Doc>,
+  Method extends DocEndpointMethod<Doc, Endpoint>,
+> = ValueOf<{
+  [Template in keyof Doc]: Template extends `#${Method}|${infer E}`
+    ? E extends DocEndpoint<Doc>
+      ? PathTemplate<E>
+      : never
+    : never;
+}>;
+
+/**
+ * @public
+ */
+export type DocEndpointTemplate<Doc extends EndpointMap> = PathTemplate<
+  DocEndpoint<Doc>
+>;
+
+/**
+ * @public
+ */
+export type TemplateToDocEndpoint<
+  Doc extends EndpointMap,
+  Path extends DocEndpointTemplate<Doc>,
+> = ValueOf<{
+  [Template in DocEndpoint<Doc>]: Path extends PathTemplate<Template>
+    ? Template
+    : never;
+}>;
+
+/**
+ * Superset of the express router path matcher that enforces typed request and response bodies.
+ * @public
+ */
+export interface EndpointMapRequestMatcher<
+  Doc extends EndpointMap,
+  T,
+  Method extends HttpMethods,
+> {
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandler<Doc, TemplateToDocEndpoint<Doc, TPath>, TMethod>
+    >
+  ): T;
+  <
+    TPath extends MethodAwareDocEndpoints<
+      Doc,
+      DocEndpoint<Doc>,
+      Method & DocEndpointMethod<Doc, DocEndpoint<Doc>>
+    >,
+    TMethod extends Method &
+      DocEndpointMethod<Doc, TemplateToDocEndpoint<Doc, TPath>>,
+  >(
+    path: TPath,
+    ...handlers: Array<
+      EndpointMapRequestHandlerParams<
+        Doc,
+        TemplateToDocEndpoint<Doc, TPath>,
+        TMethod
+      >
+    >
+  ): T;
+}
diff --git a/packages/backend-openapi-utils/src/types/index.ts b/packages/backend-openapi-utils/src/types/index.ts
index 98e58f68ad..473d2be953 100644
--- a/packages/backend-openapi-utils/src/types/index.ts
+++ b/packages/backend-openapi-utils/src/types/index.ts
@@ -20,3 +20,4 @@ export * from './immutable';
 export * from './params';
 export * from './requests';
 export * from './responses';
+export * from './generated';
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index 8ad0e805c8..13797bc63a 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,99 @@
 # @backstage/backend-plugin-api
 
+## 1.1.0-next.2
+
+### Patch Changes
+
+- 0e9c9fa: The `RootLifecycleService` now has a new `addBeforeShutdownHook` method, and hooks added through this method will run immediately when a termination event is received.
+
+  The backend will not proceed with the shutdown and run the `Shutdown` hooks until all `BeforeShutdown` hooks have completed.
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.1.0-next.1
+
+### Minor Changes
+
+- 12eac85: **EXPERIMENTAL**: Adds a new `instanceMetadataService` to hold information about a specific backend instance.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## 1.0.3-next.0
+
+### Patch Changes
+
+- eef3ef1: Removed unused `express` dependencies.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## 1.0.2
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 1.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## 1.0.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## 1.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 1.0.1
 
 ### Patch Changes
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index 8ab0f13eb2..9bfae928c2 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-plugin-api",
-  "version": "1.0.1",
+  "version": "1.1.0-next.2",
   "description": "Core API used by Backstage backend plugins",
   "backstage": {
     "role": "node-library"
@@ -61,7 +61,6 @@
     "@backstage/types": "workspace:^",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.0.0",
-    "express": "^4.17.1",
     "knex": "^3.0.0",
     "luxon": "^3.0.0"
   },
diff --git a/packages/backend-plugin-api/report-alpha.api.md b/packages/backend-plugin-api/report-alpha.api.md
index dea357502e..8509d1196d 100644
--- a/packages/backend-plugin-api/report-alpha.api.md
+++ b/packages/backend-plugin-api/report-alpha.api.md
@@ -6,6 +6,18 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { ServiceRef } from '@backstage/backend-plugin-api';
 
+// @alpha (undocumented)
+export type BackendFeatureMeta =
+  | {
+      type: 'plugin';
+      pluginId: string;
+    }
+  | {
+      type: 'module';
+      pluginId: string;
+      moduleId: string;
+    };
+
 // @alpha (undocumented)
 export interface FeatureDiscoveryService {
   // (undocumented)
@@ -21,5 +33,18 @@ export const featureDiscoveryServiceRef: ServiceRef<
   'singleton'
 >;
 
+// @alpha (undocumented)
+export interface InstanceMetadataService {
+  // (undocumented)
+  getInstalledFeatures: () => BackendFeatureMeta[];
+}
+
+// @alpha
+export const instanceMetadataServiceRef: ServiceRef<
+  InstanceMetadataService,
+  'plugin',
+  'singleton'
+>;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-plugin-api/report.api.md b/packages/backend-plugin-api/report.api.md
index 89dfe40dd9..8416c6c200 100644
--- a/packages/backend-plugin-api/report.api.md
+++ b/packages/backend-plugin-api/report.api.md
@@ -10,7 +10,7 @@ import { AuthorizePermissionResponse } from '@backstage/plugin-permission-common
 import { Config } from '@backstage/config';
 import { Duration } from 'luxon';
 import { EvaluatorRequestOptions } from '@backstage/plugin-permission-common';
-import { Handler } from 'express';
+import type { Handler } from 'express';
 import { HumanDuration } from '@backstage/types';
 import { isChildPath } from '@backstage/cli-common';
 import { JsonObject } from '@backstage/types';
@@ -21,8 +21,8 @@ import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import { QueryPermissionRequest } from '@backstage/plugin-permission-common';
 import { QueryPermissionResponse } from '@backstage/plugin-permission-common';
 import { Readable } from 'stream';
-import { Request as Request_2 } from 'express';
-import { Response as Response_2 } from 'express';
+import type { Request as Request_2 } from 'express';
+import type { Response as Response_2 } from 'express';
 
 // @public
 export interface AuthService {
@@ -507,7 +507,10 @@ export interface RootHttpRouterService {
 }
 
 // @public
-export interface RootLifecycleService extends LifecycleService {}
+export interface RootLifecycleService extends LifecycleService {
+  // (undocumented)
+  addBeforeShutdownHook(hook: () => void | Promise<void>): void;
+}
 
 // @public
 export interface RootLoggerService extends LoggerService {}
diff --git a/packages/backend-plugin-api/src/alpha.ts b/packages/backend-plugin-api/src/alpha.ts
index 3f26c66fe9..1a39fe6c23 100644
--- a/packages/backend-plugin-api/src/alpha.ts
+++ b/packages/backend-plugin-api/src/alpha.ts
@@ -34,3 +34,19 @@ export const featureDiscoveryServiceRef =
     id: 'core.featureDiscovery',
     scope: 'root',
   });
+
+/**
+ * EXPERIMENTAL: Instance metadata service.
+ *
+ * @alpha
+ */
+export const instanceMetadataServiceRef = createServiceRef<
+  import('./services/definitions/InstanceMetadataService').InstanceMetadataService
+>({
+  id: 'core.instanceMetadata',
+});
+
+export type {
+  BackendFeatureMeta,
+  InstanceMetadataService,
+} from './services/definitions/InstanceMetadataService';
diff --git a/packages/backend-plugin-api/src/services/definitions/HttpAuthService.ts b/packages/backend-plugin-api/src/services/definitions/HttpAuthService.ts
index 718aa9b532..152bb205de 100644
--- a/packages/backend-plugin-api/src/services/definitions/HttpAuthService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/HttpAuthService.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import { BackstageCredentials, BackstagePrincipalTypes } from './AuthService';
 
 /**
diff --git a/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts b/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
index 92f7e950f9..529d7481f1 100644
--- a/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Options for {@link HttpRouterService.addAuthPolicy}.
diff --git a/packages/backend-plugin-api/src/services/definitions/InstanceMetadataService.ts b/packages/backend-plugin-api/src/services/definitions/InstanceMetadataService.ts
new file mode 100644
index 0000000000..869d361343
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/InstanceMetadataService.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @alpha */
+export type BackendFeatureMeta =
+  | {
+      type: 'plugin';
+      pluginId: string;
+    }
+  | {
+      type: 'module';
+      pluginId: string;
+      moduleId: string;
+    };
+
+/** @alpha */
+export interface InstanceMetadataService {
+  getInstalledFeatures: () => BackendFeatureMeta[];
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts b/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
index a1006b749b..8bd0cad874 100644
--- a/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * HTTP route registration for root services.
diff --git a/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts b/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts
index b962fa68ba..2fc9556938 100644
--- a/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts
@@ -23,4 +23,6 @@ import { LifecycleService } from './LifecycleService';
  *
  * @public
  */
-export interface RootLifecycleService extends LifecycleService {}
+export interface RootLifecycleService extends LifecycleService {
+  addBeforeShutdownHook(hook: () => void | Promise<void>): void;
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts b/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts
index a8b84b9084..24219228df 100644
--- a/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts
@@ -354,19 +354,6 @@ export interface SchedulerService {
   getScheduledTasks(): Promise<SchedulerServiceTaskDescriptor[]>;
 }
 
-function readDuration(config: Config, key: string): HumanDuration {
-  if (typeof config.get(key) === 'string') {
-    const value = config.getString(key);
-    const duration = Duration.fromISO(value);
-    if (!duration.isValid) {
-      throw new Error(`Invalid duration: ${value}`);
-    }
-    return duration.toObject();
-  }
-
-  return readDurationFromConfig(config, { key });
-}
-
 function readFrequency(
   config: Config,
   key: string,
@@ -382,7 +369,7 @@ function readFrequency(
     return { trigger: 'manual' };
   }
 
-  return readDuration(config, key);
+  return readDurationFromConfig(config, { key });
 }
 
 /**
@@ -396,10 +383,10 @@ export function readSchedulerServiceTaskScheduleDefinitionFromConfig(
   config: Config,
 ): SchedulerServiceTaskScheduleDefinition {
   const frequency = readFrequency(config, 'frequency');
-  const timeout = readDuration(config, 'timeout');
+  const timeout = readDurationFromConfig(config, { key: 'timeout' });
 
   const initialDelay = config.has('initialDelay')
-    ? readDuration(config, 'initialDelay')
+    ? readDurationFromConfig(config, { key: 'initialDelay' })
     : undefined;
 
   const scope = config.getOptionalString('scope');
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 70596004e1..819d39a18d 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,147 @@
 # @backstage/backend-test-utils
 
+## 1.2.0-next.2
+
+### Patch Changes
+
+- 0e9c9fa: Mock the new `RootLifecycleService.addBeforeShutdownHook` method.
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-app-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 1.2.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/backend-app-api@1.1.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 1.2.0-next.0
+
+### Minor Changes
+
+- de6f280: **BREAKING** Upgraded @keyv/redis and keyv packages to resolve a bug related to incorrect resolution of cache keys.
+
+  This is a breaking change for clients using the `redis` store for cache with `useRedisSets` option set to false since cache keys will be calculated differently (without the sets:namespace: prefix). For clients with default configuration (or useRedisSets set to false) the cache keys will stay the same, but since @keyv/redis library no longer supports redis sets they won't be utilised anymore.
+
+  If you were using `useRedisSets` option in configuration make sure to remove it from `app-config.yaml`:
+
+  ```diff
+  backend:
+    cache:
+      store: redis
+      connection: redis://user:pass@cache.example.com:6379
+  -   useRedisSets: false
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-app-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 1.1.0
+
+### Minor Changes
+
+- 5064827: Made it possible to construct `mockServices.database` with a given knex instance
+
+### Patch Changes
+
+- 7aae8e3: The `mockServices.discovery.factory()` factory now uses the mocked discovery service as its implementation, avoid the need for configuration.
+- eb82994: Removed unused `msw` dependency.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-app-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 1.1.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+
+## 1.1.0-next.2
+
+### Minor Changes
+
+- 5064827: Made it possible to construct `mockServices.database` with a given knex instance
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-app-api@1.0.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 1.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@1.0.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 1.0.3-next.0
+
+### Patch Changes
+
+- 7aae8e3: The `mockServices.discovery.factory()` factory now uses the mocked discovery service as its implementation, avoid the need for configuration.
+- eb82994: Removed unused `msw` dependency.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-app-api@1.0.2-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 1.0.1
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 75136b6169..ba23642a52 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-test-utils",
-  "version": "1.0.1",
+  "version": "1.2.0-next.2",
   "description": "Test helpers library for Backstage backends",
   "backstage": {
     "role": "node-library"
@@ -53,8 +53,8 @@
     "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@keyv/memcache": "^1.3.5",
-    "@keyv/redis": "^2.5.3",
+    "@keyv/memcache": "^2.0.1",
+    "@keyv/redis": "^4.0.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
     "@types/keyv": "^4.2.0",
@@ -63,14 +63,14 @@
     "cookie": "^0.7.0",
     "express": "^4.17.1",
     "fs-extra": "^11.0.0",
-    "keyv": "^4.5.2",
+    "keyv": "^5.2.1",
     "knex": "^3.0.0",
     "mysql2": "^3.0.0",
     "pg": "^8.11.3",
     "pg-connection-string": "^2.3.0",
     "testcontainers": "^10.0.0",
     "textextensions": "^5.16.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "yn": "^4.0.0"
   },
   "devDependencies": {
diff --git a/packages/backend-test-utils/report.api.md b/packages/backend-test-utils/report.api.md
index 263435c920..a79bd9d03c 100644
--- a/packages/backend-test-utils/report.api.md
+++ b/packages/backend-test-utils/report.api.md
@@ -175,14 +175,23 @@ export namespace mockServices {
         partialImpl?: Partial<CacheService> | undefined,
       ) => ServiceMock<CacheService>;
   }
+  export function database(options: {
+    knex: Knex;
+    migrations?: {
+      skip?: boolean;
+    };
+  }): DatabaseService;
   // (undocumented)
   export namespace database {
-    const // (undocumented)
-      factory: () => ServiceFactory<DatabaseService, 'plugin', 'singleton'>;
-    const // (undocumented)
-      mock: (
-        partialImpl?: Partial<DatabaseService> | undefined,
-      ) => ServiceMock<DatabaseService>;
+    const factory: (options?: {
+      knex: Knex;
+      migrations?: {
+        skip?: boolean;
+      };
+    }) => ServiceFactory<DatabaseService, 'plugin', 'singleton'>;
+    const mock: (
+      partialImpl?: Partial<DatabaseService> | undefined,
+    ) => ServiceMock<DatabaseService>;
   }
   // (undocumented)
   export function discovery(): DiscoveryService;
diff --git a/packages/backend-test-utils/src/next/services/mockServices.ts b/packages/backend-test-utils/src/next/services/mockServices.ts
index 789b75de9d..b9bca62767 100644
--- a/packages/backend-test-utils/src/next/services/mockServices.ts
+++ b/packages/backend-test-utils/src/next/services/mockServices.ts
@@ -16,10 +16,7 @@
 
 import { cacheServiceFactory } from '@backstage/backend-defaults/cache';
 import { databaseServiceFactory } from '@backstage/backend-defaults/database';
-import {
-  HostDiscovery,
-  discoveryServiceFactory,
-} from '@backstage/backend-defaults/discovery';
+import { HostDiscovery } from '@backstage/backend-defaults/discovery';
 import { httpRouterServiceFactory } from '@backstage/backend-defaults/httpRouter';
 import { lifecycleServiceFactory } from '@backstage/backend-defaults/lifecycle';
 import { loggerServiceFactory } from '@backstage/backend-defaults/logger';
@@ -33,6 +30,7 @@ import {
   AuthService,
   BackstageCredentials,
   BackstageUserInfo,
+  DatabaseService,
   DiscoveryService,
   HttpAuthService,
   LoggerService,
@@ -54,6 +52,7 @@ import { MockHttpAuthService } from './MockHttpAuthService';
 import { MockRootLoggerService } from './MockRootLoggerService';
 import { MockUserInfoService } from './MockUserInfoService';
 import { mockCredentials } from './mockCredentials';
+import { Knex } from 'knex';
 
 /** @internal */
 function createLoggerMock() {
@@ -273,7 +272,12 @@ export namespace mockServices {
     );
   }
   export namespace discovery {
-    export const factory = () => discoveryServiceFactory;
+    export const factory = () =>
+      createServiceFactory({
+        service: coreServices.discovery,
+        deps: {},
+        factory: () => discovery(),
+      });
     export const mock = simpleMock(coreServices.discovery, () => ({
       getBaseUrl: jest.fn(),
       getExternalBaseUrl: jest.fn(),
@@ -374,8 +378,45 @@ export namespace mockServices {
     }));
   }
 
+  /**
+   * Creates a mock implementation of the
+   * {@link @backstage/backend-plugin-api#coreServices.database}. Just returns
+   * the given `knex` instance, which is useful in combination with the
+   * {@link TestDatabases} facility.
+   */
+  export function database(options: {
+    knex: Knex;
+    migrations?: { skip?: boolean };
+  }): DatabaseService {
+    return {
+      getClient: async () => options.knex,
+      migrations: options.migrations,
+    };
+  }
   export namespace database {
-    export const factory = () => databaseServiceFactory;
+    /**
+     * Creates a mock factory for the
+     * {@link @backstage/backend-plugin-api#coreServices.database}. Just returns
+     * the given `knex` instance if you supply one, which is useful in
+     * combination with the {@link TestDatabases} facility. Otherwise, it
+     * returns the regular default database factory which reads config settings.
+     */
+    export const factory = (options?: {
+      knex: Knex;
+      migrations?: { skip?: boolean };
+    }) =>
+      options
+        ? createServiceFactory({
+            service: coreServices.database,
+            deps: {},
+            factory: () => database(options),
+          })
+        : databaseServiceFactory;
+    /**
+     * Creates a mock of the
+     * {@link @backstage/backend-plugin-api#coreServices.database}, optionally
+     * with some given method implementations.
+     */
     export const mock = simpleMock(coreServices.database, () => ({
       getClient: jest.fn(),
     }));
@@ -431,6 +472,7 @@ export namespace mockServices {
     export const factory = () => rootLifecycleServiceFactory;
     export const mock = simpleMock(coreServices.rootLifecycle, () => ({
       addShutdownHook: jest.fn(),
+      addBeforeShutdownHook: jest.fn(),
       addStartupHook: jest.fn(),
     }));
   }
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
index 96bf0f7dc1..42b46f4de7 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
@@ -251,7 +251,7 @@ export async function startTestBackend<TExtensionPoints extends any[]>(
       const app = express();
 
       const middleware = MiddlewareFactory.create({ config, logger });
-      const healthRouter = createHealthRouter({ health });
+      const healthRouter = createHealthRouter({ config, health });
 
       app.use(healthRouter);
       app.use(router.handler());
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 842fcf5c8f..27c2a067b7 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,309 @@
 # example-backend
 
+## 0.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.2
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.2
+  - @backstage/plugin-notifications-backend@0.5.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-app-backend@0.4.3-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.2
+  - @backstage/plugin-devtools-backend@0.5.0-next.2
+  - @backstage/plugin-events-backend@0.4.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.2
+  - @backstage/plugin-proxy-backend@0.5.9-next.2
+  - @backstage/plugin-search-backend@1.8.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-signals-backend@0.2.4-next.2
+  - @backstage/plugin-techdocs-backend@1.11.4-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.2
+  - @backstage/plugin-permission-backend@0.5.52-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.2
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-events-backend@0.4.0-next.1
+  - @backstage/plugin-search-backend@1.8.0-next.1
+  - @backstage/plugin-devtools-backend@0.5.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.1
+  - @backstage/plugin-notifications-backend@0.4.4-next.1
+  - @backstage/plugin-permission-backend@0.5.52-next.1
+  - @backstage/plugin-techdocs-backend@1.11.4-next.1
+  - @backstage/plugin-signals-backend@0.2.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.9-next.1
+  - @backstage/plugin-app-backend@0.4.3-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.1
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.5-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.28.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.6-next.0
+  - @backstage/plugin-app-backend@0.4.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-backend@0.5.52-next.0
+  - @backstage/plugin-devtools-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.4-next.0
+  - @backstage/plugin-events-backend@0.3.17-next.0
+  - @backstage/plugin-kubernetes-backend@0.19.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.3-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.5-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.3-next.0
+  - @backstage/plugin-notifications-backend@0.4.4-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.3-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-proxy-backend@0.5.9-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.4-next.0
+  - @backstage/plugin-search-backend@1.7.1-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-techdocs-backend@1.11.4-next.0
+
+## 0.0.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-app-backend@0.4.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-scaffolder-backend@1.27.0
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-search-backend@1.7.0
+  - @backstage/plugin-events-backend@0.3.16
+  - @backstage/plugin-kubernetes-backend@0.19.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-search-backend-module-explore@0.2.5
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-backend@0.4.3
+  - @backstage/plugin-signals-backend@0.2.3
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-proxy-backend@0.5.8
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2
+  - @backstage/plugin-devtools-backend@0.4.2
+  - @backstage/plugin-permission-backend@0.5.51
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-backend@1.11.2
+
+## 0.0.32-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-backend@0.3.16-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.3
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.3
+  - @backstage/plugin-notifications-backend@0.4.3-next.3
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.3
+  - @backstage/plugin-search-backend@1.7.0-next.3
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.3
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-signals-backend@0.2.3-next.3
+  - @backstage/plugin-techdocs-backend@1.11.2-next.3
+
+## 0.0.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-search-backend@1.7.0-next.2
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.2
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-backend@0.3.16-next.2
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-notifications-backend@0.4.3-next.2
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/plugin-techdocs-backend@1.11.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.2
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.2
+  - @backstage/plugin-devtools-backend@0.4.2-next.2
+  - @backstage/plugin-permission-backend@0.5.51-next.2
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-proxy-backend@0.5.8-next.2
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-signals-backend@0.2.3-next.2
+
+## 0.0.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.19.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.27.0-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.1
+  - @backstage/plugin-devtools-backend@0.4.2-next.1
+  - @backstage/plugin-events-backend@0.3.16-next.1
+  - @backstage/plugin-notifications-backend@0.4.3-next.1
+  - @backstage/plugin-permission-backend@0.5.51-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-proxy-backend@0.5.8-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.1
+  - @backstage/plugin-search-backend@1.6.2-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-signals-backend@0.2.3-next.1
+  - @backstage/plugin-techdocs-backend@1.11.2-next.1
+
+## 0.0.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.26.3-next.0
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-events-backend@0.3.15-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-search-backend-module-explore@0.2.5-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/plugin-notifications-backend@0.4.3-next.0
+  - @backstage/plugin-signals-backend@0.2.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-app-backend@0.3.77-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.2-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.2-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.4-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.2-next.0
+  - @backstage/plugin-devtools-backend@0.4.2-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.8-next.0
+  - @backstage/plugin-permission-backend@0.5.51-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-proxy-backend@0.5.8-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-notifications@0.1.3-next.0
+  - @backstage/plugin-search-backend@1.6.2-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-techdocs-backend@1.11.2-next.0
+
 ## 0.0.31
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c361008263..0e8cf10fed 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.0.31",
+  "version": "0.0.33-next.2",
   "backstage": {
     "role": "backend"
   },
@@ -62,9 +62,9 @@
     "@backstage/plugin-search-backend-node": "workspace:^",
     "@backstage/plugin-signals-backend": "workspace:^",
     "@backstage/plugin-techdocs-backend": "workspace:^",
-    "@opentelemetry/auto-instrumentations-node": "^0.51.0",
-    "@opentelemetry/exporter-prometheus": "^0.53.0",
-    "@opentelemetry/sdk-node": "^0.53.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.54.0",
+    "@opentelemetry/exporter-prometheus": "^0.54.0",
+    "@opentelemetry/sdk-node": "^0.54.0",
     "example-app": "link:../app"
   },
   "devDependencies": {
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index d8a4bcb98f..8ae9864a4a 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -59,5 +59,6 @@ backend.add(searchLoader);
 backend.add(import('@backstage/plugin-techdocs-backend'));
 backend.add(import('@backstage/plugin-signals-backend'));
 backend.add(import('@backstage/plugin-notifications-backend'));
+backend.add(import('./instanceMetadata'));
 
 backend.start();
diff --git a/packages/backend/src/instanceMetadata.ts b/packages/backend/src/instanceMetadata.ts
new file mode 100644
index 0000000000..dd499aa40a
--- /dev/null
+++ b/packages/backend/src/instanceMetadata.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { instanceMetadataServiceRef } from '@backstage/backend-plugin-api/alpha';
+
+// Example usage of the instance metadata service to log the installed features.
+export default createBackendPlugin({
+  pluginId: 'instance-metadata-logging',
+  register(env) {
+    env.registerInit({
+      deps: {
+        instanceMetadata: instanceMetadataServiceRef,
+        logger: coreServices.logger,
+      },
+      async init({ instanceMetadata, logger }) {
+        logger.info(
+          `Installed features on this instance: ${instanceMetadata.getInstalledFeatures()}`,
+        );
+      },
+    });
+  },
+});
diff --git a/packages/canon/.eslintrc.js b/packages/canon/.eslintrc.js
new file mode 100644
index 0000000000..f7c0e8cbd1
--- /dev/null
+++ b/packages/canon/.eslintrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+  ...require('@backstage/cli/config/eslint-factory')(__dirname),
+  extends: ['plugin:storybook/recommended'],
+  rules: {
+    'react/forbid-elements': 'off',
+  },
+};
+
diff --git a/packages/canon/.gitignore b/packages/canon/.gitignore
new file mode 100644
index 0000000000..86fa479d2f
--- /dev/null
+++ b/packages/canon/.gitignore
@@ -0,0 +1,2 @@
+# Build output
+storybook-static
diff --git a/packages/canon/.storybook/main.ts b/packages/canon/.storybook/main.ts
new file mode 100644
index 0000000000..41df32404b
--- /dev/null
+++ b/packages/canon/.storybook/main.ts
@@ -0,0 +1,40 @@
+import type { StorybookConfig } from '@storybook/react-webpack5';
+import { VanillaExtractPlugin } from '@vanilla-extract/webpack-plugin';
+import { merge } from 'webpack-merge';
+
+import { join, dirname } from 'path';
+
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value: string): any {
+  return dirname(require.resolve(join(value, 'package.json')));
+}
+const config: StorybookConfig = {
+  stories: [
+    '../docs/**/*.mdx',
+    '../src/components/**/*.mdx',
+    '../src/components/**/*.stories.@(js|jsx|mjs|ts|tsx)',
+  ],
+  staticDirs: ['../static'],
+  addons: [
+    getAbsolutePath('@storybook/addon-webpack5-compiler-swc'),
+    getAbsolutePath('@storybook/addon-essentials'),
+    getAbsolutePath('@chromatic-com/storybook'),
+    getAbsolutePath('@storybook/addon-interactions'),
+    getAbsolutePath('@storybook/addon-themes'),
+  ],
+  framework: {
+    name: getAbsolutePath('@storybook/react-webpack5'),
+    options: {
+      plugins: [new VanillaExtractPlugin()],
+    },
+  },
+  webpackFinal: config => {
+    return merge(config, {
+      plugins: [new VanillaExtractPlugin()],
+    });
+  },
+};
+export default config;
diff --git a/packages/canon/.storybook/manager.ts b/packages/canon/.storybook/manager.ts
new file mode 100644
index 0000000000..c88b10b392
--- /dev/null
+++ b/packages/canon/.storybook/manager.ts
@@ -0,0 +1,12 @@
+import { addons } from '@storybook/manager-api';
+import { create } from '@storybook/theming';
+
+const theme = create({
+  base: 'light',
+  brandTitle: 'Canon',
+  brandImage: 'logo.svg',
+});
+
+addons.setConfig({
+  theme,
+});
diff --git a/packages/canon/.storybook/preview.tsx b/packages/canon/.storybook/preview.tsx
new file mode 100644
index 0000000000..8beeb82720
--- /dev/null
+++ b/packages/canon/.storybook/preview.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import type { Preview, ReactRenderer } from '@storybook/react';
+import { withThemeByDataAttribute } from '@storybook/addon-themes';
+
+// Storybook specific styles
+import '../docs/components/styles.css';
+
+// Canon specific styles
+import '../src/theme/styles.css';
+
+// Custom themes
+import './themes/backstage.css';
+
+const preview: Preview = {
+  parameters: {
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+    backgrounds: {
+      disable: true,
+    },
+  },
+  decorators: [
+    withThemeByDataAttribute<ReactRenderer>({
+      themes: {
+        Light: 'light',
+        Dark: 'dark',
+        'Backstage Light': 'backstage-light',
+        'Backstage Dark': 'backstage-dark',
+      },
+      defaultTheme: 'Light',
+    }),
+    Story => {
+      document.body.style.backgroundColor = 'var(--canon-background)';
+
+      const docsStoryElements = document.getElementsByClassName('docs-story');
+      Array.from(docsStoryElements).forEach(element => {
+        (element as HTMLElement).style.backgroundColor =
+          'var(--canon-background)';
+      });
+
+      return <Story />;
+    },
+  ],
+};
+
+export default preview;
diff --git a/packages/canon/.storybook/themes/backstage.css b/packages/canon/.storybook/themes/backstage.css
new file mode 100644
index 0000000000..4a7821cda2
--- /dev/null
+++ b/packages/canon/.storybook/themes/backstage.css
@@ -0,0 +1,75 @@
+[data-theme='backstage-light'] {
+  /* Colors */
+  --canon-accent: #2e77d0;
+  --canon-background: #f8f8f8;
+  --canon-surface-1: #fff;
+  --canon-surface-2: #f4f4f4;
+
+  /* Text colors */
+  --canon-text-primary: #000;
+  --canon-text-primary-on-accent: #fff;
+  --canon-text-secondary: #646464;
+
+  --canon-font-regular: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
+
+  .button {
+    border-radius: 60px;
+    font-weight: 400;
+    text-transform: uppercase;
+    font-size: 0.875rem;
+    transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,
+      box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,
+      border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    line-height: 1.75;
+    border-radius: 4px;
+    background-color: #1f5493;
+    padding: 6px 16px;
+    box-shadow: none;
+  }
+
+  .button:hover {
+    box-shadow: none;
+  }
+
+  .button.primary {
+    color: #fff;
+    background-color: rgb(21, 58, 102);
+    box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  }
+
+  .button.primary:hover {
+    box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2),
+      0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12);
+  }
+
+  .button.secondary {
+    background-color: transparent;
+    border: 1px solid rgba(31, 84, 147, 0.5);
+    color: #1f5493;
+  }
+
+  .button.secondary:hover {
+    border: 1px solid #1f5493;
+    background-color: rgba(31, 84, 147, 0.04);
+  }
+
+  .button.tertiary {
+    background-color: transparent;
+    border: none;
+    color: #1f5493;
+  }
+}
+
+[data-theme='backstage-dark'] {
+  /* Colors */
+  --canon-accent: #2e77d0;
+  --canon-background: #000;
+  --canon-surface-1: #121212;
+  --canon-surface-2: #1a1a1a;
+
+  /* Text colors */
+  --canon-text-primary: #fff;
+  --canon-text-primary-on-accent: #000;
+  --canon-text-secondary: #b3b3b3;
+}
diff --git a/packages/canon/README.md b/packages/canon/README.md
new file mode 100644
index 0000000000..a8bf36d7be
--- /dev/null
+++ b/packages/canon/README.md
@@ -0,0 +1,12 @@
+# @backstage/canon
+
+_This package was created through the Backstage CLI_.
+
+## Installation
+
+Install the package via Yarn:
+
+```sh
+cd <package-dir> # if within a monorepo
+yarn add @backstage/canon
+```
diff --git a/packages/canon/catalog-info.yaml b/packages/canon/catalog-info.yaml
new file mode 100644
index 0000000000..37aa7b1caf
--- /dev/null
+++ b/packages/canon/catalog-info.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-canon
+  title: '@backstage/canon'
+spec:
+  lifecycle: experimental
+  type: backstage-web-library
+  owner: maintainers
diff --git a/packages/canon/docs/Home.mdx b/packages/canon/docs/Home.mdx
new file mode 100644
index 0000000000..5b85ab15ad
--- /dev/null
+++ b/packages/canon/docs/Home.mdx
@@ -0,0 +1,91 @@
+import { Unstyled } from '@storybook/blocks';
+import {
+  Columns,
+  Text,
+  ComponentStatus,
+  Banner,
+  Title,
+  Roadmap,
+} from './components';
+import { list } from './components/Roadmap/list';
+
+<Unstyled>
+
+<img src="header.png" style={{ width: '100%', marginTop: '-16px' }} />
+
+<Text style={{ marginTop: '64px', marginBottom: '24px' }}>
+  Welcome to the Canon, the new design library for Backstage plugins. This
+  project is still under active development but we will make sure to document
+  the API as we go. We are aiming to improve the general UI of Backstage and
+  plugins across Backstage. This new library will take time to build but we are
+  building it incrementally with not conflict with the existing theming system.
+</Text>
+
+<Banner variant="warning">
+  This library is still under heavy construction. Please be aware that the API
+  will change until we reach a stable release.
+</Banner>
+
+<Title style={{ marginTop: '48px' }} type="h2">
+  Component Status
+</Title>
+<Text>
+  We are still in the process of documenting the API and building the
+  components. You can use the statuses below to see what is ready and what is
+  coming soon. If there is a component missing that you need, please let us know
+  by opening an issue on GitHub.
+</Text>
+
+<Columns style={{ marginTop: '32px' }}>
+  <ComponentStatus
+    name="Box"
+    status="alpha"
+    link="/?path=/docs/components-box--docs"
+  />
+  <ComponentStatus
+    name="Button"
+    status="inProgress"
+    link="/?path=/docs/components-button--docs"
+  />
+  <ComponentStatus name="Checkbox" status="notStarted" />
+  <ComponentStatus
+    name="Container"
+    status="alpha"
+    link="/?path=/docs/components-container--docs"
+  />
+  <ComponentStatus
+    name="Grid"
+    status="alpha"
+    link="/?path=/story/components-grid--docs"
+  />
+  <ComponentStatus name="Header" status="notStarted" />
+  <ComponentStatus
+    name="Icon"
+    status="alpha"
+    link="/?path=/docs/components-icon--docs"
+  />
+  <ComponentStatus
+    name="Inline"
+    status="alpha"
+    link="/?path=/story/components-inline--default"
+  />
+  <ComponentStatus name="Input" status="notStarted" />
+  <ComponentStatus name="Radio" status="notStarted" />
+  <ComponentStatus name="Select" status="notStarted" />
+  <ComponentStatus
+    name="Stack"
+    status="alpha"
+    link="/?path=/docs/components-stack--default"
+  />
+  <ComponentStatus name="Switch" status="notStarted" />
+  <ComponentStatus name="Tabs" status="notStarted" />
+  <ComponentStatus name="Tooltip" status="notStarted" />
+</Columns>
+
+<Title style={{ marginTop: '48px' }} type="h2">
+  Roadmap
+</Title>
+
+<Roadmap list={list} />
+
+</Unstyled>
diff --git a/packages/canon/docs/Iconography.mdx b/packages/canon/docs/Iconography.mdx
new file mode 100644
index 0000000000..48cbd2e431
--- /dev/null
+++ b/packages/canon/docs/Iconography.mdx
@@ -0,0 +1,20 @@
+import { Unstyled, Source } from '@storybook/blocks';
+import { Title, Text, IconLibrary } from './components';
+
+<Unstyled>
+
+<Title type="h1">Iconography</Title>
+
+<Text>
+  All our default icons are provided by [Remix Icon](https://remixicon.com/). We
+  don't import all icons to reduce the bundle size but we cherry pick a nice
+  selection for you to use in your application. The list of names is set down
+  below. To use an icon, you can use the `Icon` component and pass the name of
+  the icon you want to use.
+</Text>
+
+<Source code={`<Icon name="heart" />`} language="tsx" dark />
+
+<IconLibrary />
+
+</Unstyled>
diff --git a/packages/canon/docs/Layout.mdx b/packages/canon/docs/Layout.mdx
new file mode 100644
index 0000000000..72344672b6
--- /dev/null
+++ b/packages/canon/docs/Layout.mdx
@@ -0,0 +1,52 @@
+import { Unstyled, Source } from '@storybook/blocks';
+import { Title, Text, LayoutComponents } from './components';
+import * as Table from './components/Table';
+
+<Unstyled>
+
+<Title type="h1">Layout</Title>
+<Text>
+  Canon is made for extensibility. We built this library to make it easy for any
+  Backstage plugin creator to be able to build their ideas at speed ensuring
+  consistency across the rest of your ecosystem. Each component is designed to
+  be editable to match your need but sometimes you want to have more control
+  over the layout of your page. To help you with that, we created a set of
+  layout components that you can use to build your own layouts. All of these
+  components are built to extend on our theming system, making it easy for you
+  to build your own layouts. Sometimes these components are not enough so we
+  created a set of helpers to be used with any CSS-in-JS library.
+</Text>
+
+<Title type="h2">Layout Components</Title>
+
+<Text>
+  We built a couple of layout components to help you build responsive elements
+  that will be consistent with the rest of your Backstage instance. These
+  components are opinionated and use TypeScript to ensure that the props you
+  provide are the ones coming from the theme.
+</Text>
+
+<Source
+  code={`<Stack direction="column" gap="md">
+  <Box>Hello World</Box>
+  <Inline gap="sm">
+    <Box>Project 1</Box>
+    <Box>Project 2</Box>
+  </Inline>
+</Stack>`}
+  language="tsx"
+  dark
+/>
+
+<LayoutComponents />
+
+<Title type="h2">Layout Helpers</Title>
+
+<Text>
+  Sometimes you want to use global tokens dynamically outside of React
+  components. To help you with that we would like to provide a set of helpers
+  that you can use in your code. These helpers are not available just yet but we
+  are working on it.
+</Text>
+
+</Unstyled>
diff --git a/packages/canon/docs/Theme.mdx b/packages/canon/docs/Theme.mdx
new file mode 100644
index 0000000000..3d76b4e998
--- /dev/null
+++ b/packages/canon/docs/Theme.mdx
@@ -0,0 +1,229 @@
+import { Unstyled, Source } from '@storybook/blocks';
+import { Title, Text, Chip } from './components';
+import * as Table from './components/Table';
+
+<Unstyled>
+
+<Title type="h1">Theming</Title>
+<Text>
+  Backstage ships with a default theme with a light and dark mode variant. The
+  themes are provided as a part of the `@backstage/canon` package, which also
+  includes utilities for customizing the default theme, or creating completely
+  new themes.
+</Text>
+
+<Title type="h2">Light & Dark modes</Title>
+<Text>
+  By default we are supporting both light and dark modes. Each user can opt to
+  choose what theme they want to use or to use their system decide what theme to
+  use. If you want to create your own theme, you will have to set both light and
+  dark themes following the instructions below. If you only set one of them, the
+  other mode will fallback to the default theme.
+</Text>
+
+<Title type="h2">How to create your own theme</Title>
+<Text>
+  To create your own theme, you will have to define the variables below. To do
+  that, create a theme.css file and import it in your application. Here's an
+  example below on how to set your light and dark mode.
+</Text>
+<Source
+  code={`/** Light theme **/
+[data-theme='light'] {
+  --canon-accent: #1ed760;
+  --canon-bg: #fff;
+  --canon-surface-1: #f5f5f5;
+  --canon-surface-2: #000;
+  --canon-outline: #666;
+  --canon-outline-focus: #ccc;
+  --canon-text-primary: #f0f0f0;
+  --canon-text-secondary: #666;
+  --canon-font-regular: 'Geist', serif;
+  --canon-font-mono: 'Monospace', monospace;
+  /* ... other values */
+}
+  
+/** Dark theme **/
+[data-theme='dark'] {
+  --canon-accent: #1ed760;
+  --canon-bg: #000;
+  --canon-surface-1: #f5f5f5;
+  --canon-surface-2: #000;
+  --canon-outline: #666;
+  --canon-outline-focus: #ccc;
+  --canon-text-primary: #fff;
+  --canon-text-secondary: #666;
+  --canon-font-regular: 'Geist', serif;
+  --canon-font-mono: 'Monospace', monospace;
+  /* ... other values */
+}
+`}
+  language="css"
+  dark
+/>
+
+<Title type="h2">Colors</Title>
+<Text>
+  We provide a set of generic colours tokens that we use across Canon. By
+  changing these colours you can easily change the look and feel of your
+  application to match your brand.
+</Text>
+<Table.Root>
+  <Table.Header>
+    <Table.HeaderRow>
+      <Table.HeaderCell>Prop</Table.HeaderCell>
+      <Table.HeaderCell>Description</Table.HeaderCell>
+    </Table.HeaderRow>
+  </Table.Header>
+  <Table.Body>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-accent</Chip>
+      </Table.Cell>
+      <Table.Cell>The accent color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-bg</Chip>
+      </Table.Cell>
+      <Table.Cell>The background color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-surface-1</Chip>
+      </Table.Cell>
+      <Table.Cell>The first surface color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-surface-2</Chip>
+      </Table.Cell>
+      <Table.Cell>The second surface color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-outline</Chip>
+      </Table.Cell>
+      <Table.Cell>The outline color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-outline-focus</Chip>
+      </Table.Cell>
+      <Table.Cell>The outline focus color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-text-primary</Chip>
+      </Table.Cell>
+      <Table.Cell>The primary text color for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-text-secondary</Chip>
+      </Table.Cell>
+      <Table.Cell>The secondary text color for the theme.</Table.Cell>
+    </Table.Row>
+  </Table.Body>
+</Table.Root>
+
+<Title type="h2">Typography</Title>
+<Text>
+  We have two fonts that we use across Canon. The first one is the sans-serif
+  font that we use for the body of the application. The second one is the
+  monospace font that we use for code blocks and tables.
+</Text>
+
+<Table.Root>
+  <Table.Header>
+    <Table.HeaderRow>
+      <Table.HeaderCell>Prop</Table.HeaderCell>
+      <Table.HeaderCell>Description</Table.HeaderCell>
+    </Table.HeaderRow>
+  </Table.Header>
+  <Table.Body>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-font-regular</Chip>
+      </Table.Cell>
+      <Table.Cell>The sans-serif font for the theme.</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-font-mono</Chip>
+      </Table.Cell>
+      <Table.Cell>The monospace font for the theme.</Table.Cell>
+    </Table.Row>
+  </Table.Body>
+</Table.Root>
+
+<Title type="h2">Spacing</Title>
+<Text>
+  Our default spacing system is made to work in most scenarios. We have 7 scale
+  values from `xxs` to `xxl`. We use the values on padding and margin in our
+  layout components mostly. If you prefer to use a different spacing system, you
+  can do that by changing the values below.
+</Text>
+
+<Table.Root>
+  <Table.Header>
+    <Table.HeaderRow>
+      <Table.HeaderCell>Prop</Table.HeaderCell>
+      <Table.HeaderCell>Description</Table.HeaderCell>
+    </Table.HeaderRow>
+  </Table.Header>
+  <Table.Body>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-unit</Chip>
+      </Table.Cell>
+      <Table.Cell>
+        The base unit for the spacing system. Default value is `1em`
+      </Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-xxs</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `0.25 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-xs</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `0.5 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-sm</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `0.75 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-md</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `1.25 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-lg</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `2 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-xl</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `3.25 x space unit`</Table.Cell>
+    </Table.Row>
+    <Table.Row>
+      <Table.Cell>
+        <Chip head>--canon-space-xxl</Chip>
+      </Table.Cell>
+      <Table.Cell>Default value is `5.25 x space unit`</Table.Cell>
+    </Table.Row>
+  </Table.Body>
+</Table.Root>
+
+</Unstyled>
diff --git a/packages/canon/docs/components/Banner/Banner.tsx b/packages/canon/docs/components/Banner/Banner.tsx
new file mode 100644
index 0000000000..3199e65bc0
--- /dev/null
+++ b/packages/canon/docs/components/Banner/Banner.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const Banner = ({
+  children,
+  variant = 'info',
+}: {
+  children: React.ReactNode;
+  variant?: 'info' | 'warning';
+}) => {
+  return (
+    <div className={`banner ${variant}`}>
+      <div className="icon">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 24 24"
+          width="18"
+          height="18"
+          fill="currentColor"
+        >
+          <path d="M4.00001 20V14C4.00001 9.58172 7.58173 6 12 6C16.4183 6 20 9.58172 20 14V20H21V22H3.00001V20H4.00001ZM6.00001 20H18V14C18 10.6863 15.3137 8 12 8C8.6863 8 6.00001 10.6863 6.00001 14V20ZM11 2H13V5H11V2ZM19.7782 4.80761L21.1924 6.22183L19.0711 8.34315L17.6569 6.92893L19.7782 4.80761ZM2.80762 6.22183L4.22183 4.80761L6.34315 6.92893L4.92894 8.34315L2.80762 6.22183ZM7.00001 14C7.00001 11.2386 9.23858 9 12 9V11C10.3432 11 9.00001 12.3431 9.00001 14H7.00001Z"></path>
+        </svg>
+      </div>
+      {children}
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/Banner/index.ts b/packages/canon/docs/components/Banner/index.ts
new file mode 100644
index 0000000000..31f4aa88b0
--- /dev/null
+++ b/packages/canon/docs/components/Banner/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Banner } from './Banner';
diff --git a/packages/canon/docs/components/Banner/styles.css b/packages/canon/docs/components/Banner/styles.css
new file mode 100644
index 0000000000..6fec3345ae
--- /dev/null
+++ b/packages/canon/docs/components/Banner/styles.css
@@ -0,0 +1,38 @@
+.banner {
+  display: flex;
+  align-items: center;
+  font-family: 'Geist', sans-serif;
+  font-size: 16px;
+  line-height: 28px;
+  padding: 16px;
+  border-radius: 6px;
+  margin-bottom: 16px;
+  border: 1px solid #e0e0e0;
+
+  & > p {
+    margin: 0;
+  }
+
+  &.info {
+    background-color: #f2f2f2;
+    border-color: #cdcdcd;
+    color: #888888;
+  }
+
+  &.warning {
+    background-color: #fff2b9;
+    border-color: #ffd000;
+    color: #d79927;
+  }
+
+  & .icon {
+    width: 32px;
+    height: 32px;
+    background-color: rgba(215, 153, 39, 0.2);
+    border-radius: 6px;
+    margin-right: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
diff --git a/packages/canon/docs/components/Chip/Chip.tsx b/packages/canon/docs/components/Chip/Chip.tsx
new file mode 100644
index 0000000000..e6e1d1b1c4
--- /dev/null
+++ b/packages/canon/docs/components/Chip/Chip.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const Chip = ({
+  children,
+  head = false,
+}: {
+  children: React.ReactNode;
+  head?: boolean;
+}) => {
+  return <span className={`chip ${head ? 'head' : ''}`}>{children}</span>;
+};
diff --git a/packages/canon/docs/components/Chip/index.ts b/packages/canon/docs/components/Chip/index.ts
new file mode 100644
index 0000000000..ff9e4794c5
--- /dev/null
+++ b/packages/canon/docs/components/Chip/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Chip } from './Chip';
diff --git a/packages/canon/docs/components/Chip/styles.css b/packages/canon/docs/components/Chip/styles.css
new file mode 100644
index 0000000000..ebbaf6645f
--- /dev/null
+++ b/packages/canon/docs/components/Chip/styles.css
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.chip {
+  display: inline-flex;
+  align-items: center;
+  font-family: 'Geist Mono', monospace;
+  font-size: 13px;
+  border-radius: 6px;
+  padding: 0px 8px;
+  height: 24px;
+  margin-right: 4px;
+  background-color: #f0f0f0;
+  color: #5d5d5d;
+
+  &.head {
+    background-color: #eaf2fd;
+    color: #2563eb;
+  }
+}
diff --git a/packages/canon/docs/components/Columns/Columns.tsx b/packages/canon/docs/components/Columns/Columns.tsx
new file mode 100644
index 0000000000..115ec50010
--- /dev/null
+++ b/packages/canon/docs/components/Columns/Columns.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const Columns = ({
+  children,
+  style,
+}: {
+  children: React.ReactNode;
+  style?: React.CSSProperties;
+}) => {
+  return (
+    <div className="columns" style={style}>
+      {children}
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/Columns/index.ts b/packages/canon/docs/components/Columns/index.ts
new file mode 100644
index 0000000000..05de0850be
--- /dev/null
+++ b/packages/canon/docs/components/Columns/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Columns } from './Columns';
diff --git a/packages/canon/docs/components/Columns/styles.css b/packages/canon/docs/components/Columns/styles.css
new file mode 100644
index 0000000000..c34acfc406
--- /dev/null
+++ b/packages/canon/docs/components/Columns/styles.css
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.columns {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  row-gap: 20px;
+  column-gap: 80px;
+}
diff --git a/packages/canon/docs/components/ComponentStatus/ComponentStatus.tsx b/packages/canon/docs/components/ComponentStatus/ComponentStatus.tsx
new file mode 100644
index 0000000000..0159e27b32
--- /dev/null
+++ b/packages/canon/docs/components/ComponentStatus/ComponentStatus.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const ComponentStatus = ({
+  name,
+  status = 'notStarted',
+  style,
+  link,
+}: {
+  name: string;
+  status: 'notStarted' | 'inProgress' | 'alpha' | 'beta' | 'stable';
+  style?: React.CSSProperties;
+  link?: string;
+}) => {
+  return (
+    <div className="component-status" style={style}>
+      {link ? (
+        <a href={link} className="title">
+          {name}
+        </a>
+      ) : (
+        <span className="title">{name}</span>
+      )}
+      <span className={`pill ${status}`}>
+        {status === 'notStarted' && 'Not Started'}
+        {status === 'inProgress' && 'In Progress'}
+        {status === 'alpha' && 'Alpha'}
+        {status === 'beta' && 'Beta'}
+        {status === 'stable' && 'Stable'}
+      </span>
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/ComponentStatus/index.ts b/packages/canon/docs/components/ComponentStatus/index.ts
new file mode 100644
index 0000000000..238c001289
--- /dev/null
+++ b/packages/canon/docs/components/ComponentStatus/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { ComponentStatus } from './ComponentStatus';
diff --git a/packages/canon/docs/components/ComponentStatus/styles.css b/packages/canon/docs/components/ComponentStatus/styles.css
new file mode 100644
index 0000000000..f800e659e0
--- /dev/null
+++ b/packages/canon/docs/components/ComponentStatus/styles.css
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.component-status {
+  display: flex;
+  justify-content: space-between;
+
+  & .title {
+    color: #3b59ff;
+    font-family: 'Geist', sans-serif;
+    font-size: 16px;
+    font-weight: 400;
+    text-decoration: none;
+  }
+
+  & .pill {
+    font-family: 'Geist', sans-serif;
+    display: inline-flex;
+    align-items: center;
+    color: #000;
+    border-radius: 40px;
+    padding: 0px 8px;
+    height: 24px;
+    font-size: 12px;
+    font-weight: 600;
+    border-style: solid;
+    border-width: 1px;
+    margin-left: 8px;
+
+    &.notStarted {
+      background-color: #f2f2f2;
+      border-color: #cdcdcd;
+      color: #888888;
+    }
+
+    &.inProgress {
+      background-color: #fff2b9;
+      border-color: #ffd000;
+      color: #d79927;
+    }
+
+    &.alpha {
+      background-color: #d7f9d7;
+      border-color: #4ed14a;
+      color: #3a9837;
+    }
+
+    &.beta {
+      background-color: #d7f9d7;
+      border-color: #4ed14a;
+      color: #3a9837;
+    }
+
+    &.stable {
+      background-color: #d7f9d7;
+      border-color: #4ed14a;
+      color: #3a9837;
+    }
+  }
+}
diff --git a/packages/canon/docs/components/IconLibrary/IconLibrary.tsx b/packages/canon/docs/components/IconLibrary/IconLibrary.tsx
new file mode 100644
index 0000000000..e32f4c08a4
--- /dev/null
+++ b/packages/canon/docs/components/IconLibrary/IconLibrary.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { Icon } from '@backstage/canon';
+import type { IconNames } from '@backstage/canon';
+import { defaultIcons } from '../../../src/components/Icon/icons';
+import { Text } from '../Text/Text';
+
+export const IconLibrary = () => {
+  const icons = Object.keys(defaultIcons);
+
+  return (
+    <div className="icon-library">
+      {icons.map(icon => (
+        <div key={icon} className="icon-library-item">
+          <div className="icon-library-item-icon">
+            <Icon name={icon as IconNames} />
+          </div>
+          <Text>{icon}</Text>
+        </div>
+      ))}
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/IconLibrary/index.ts b/packages/canon/docs/components/IconLibrary/index.ts
new file mode 100644
index 0000000000..071c80db85
--- /dev/null
+++ b/packages/canon/docs/components/IconLibrary/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { IconLibrary } from './IconLibrary';
diff --git a/packages/canon/docs/components/IconLibrary/styles.css b/packages/canon/docs/components/IconLibrary/styles.css
new file mode 100644
index 0000000000..1a6f63ca79
--- /dev/null
+++ b/packages/canon/docs/components/IconLibrary/styles.css
@@ -0,0 +1,22 @@
+.icon-library {
+  display: grid;
+  grid-template-columns: repeat(6, 1fr);
+  gap: 1rem;
+}
+
+.icon-library-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+}
+
+.icon-library-item-icon {
+  display: flex;
+  width: 100%;
+  justify-content: center;
+  align-items: center;
+  height: 80px;
+  border: 1px solid #d3d3d3;
+  border-radius: 0.5rem;
+}
diff --git a/packages/canon/docs/components/LayoutComponents/LayoutComponents.tsx b/packages/canon/docs/components/LayoutComponents/LayoutComponents.tsx
new file mode 100644
index 0000000000..56f389a389
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/LayoutComponents.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { BoxSvg } from './svgs/box';
+import { StackSvg } from './svgs/stack';
+import { GridSvg } from './svgs/grid';
+import { InlineSvg } from './svgs/inline';
+import { ContainerSvg } from './svgs/container';
+
+export const LayoutComponents = () => {
+  return (
+    <div className="layout-components">
+      <div className="box">
+        <a className="content" href="/?path=/docs/components-box--docs">
+          <BoxSvg />
+        </a>
+        <div className="title">Box</div>
+        <div className="description">The most basic layout component</div>
+      </div>
+      <div className="box">
+        <a className="content" href="/?path=/docs/components-stack--docs">
+          <StackSvg />
+        </a>
+        <div className="title">Stack</div>
+        <div className="description">Arrange your components vertically</div>
+      </div>
+      <div className="box">
+        <a className="content" href="/?path=/docs/components-grid--docs">
+          <GridSvg />
+        </a>
+        <div className="title">Grid</div>
+        <div className="description">Arrange your components in a grid</div>
+      </div>
+      <div className="box">
+        <a className="content" href="/?path=/docs/components-inline--docs">
+          <InlineSvg />
+        </a>
+        <div className="title">Inline</div>
+        <div className="description">Arrange your components in a row</div>
+      </div>
+      <div className="box">
+        <a className="content" href="/?path=/docs/components-container--docs">
+          <ContainerSvg />
+        </a>
+        <div className="title">Container</div>
+        <div className="description">A container for your components</div>
+      </div>
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/LayoutComponents/index.ts b/packages/canon/docs/components/LayoutComponents/index.ts
new file mode 100644
index 0000000000..55cc9f25ef
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { LayoutComponents } from './LayoutComponents';
diff --git a/packages/canon/docs/components/LayoutComponents/styles.css b/packages/canon/docs/components/LayoutComponents/styles.css
new file mode 100644
index 0000000000..c2a819cf6b
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/styles.css
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.layout-components {
+  display: flex;
+  justify-content: flex-start;
+  gap: 1rem;
+  flex-wrap: wrap;
+
+  & .box {
+    display: flex;
+    flex-direction: column;
+    width: calc(33.33% - 0.67rem);
+    margin-bottom: 1rem;
+    align-items: flex-start;
+  }
+
+  & .content {
+    flex: none;
+    background: linear-gradient(180deg, #f3f3f3 0%, #fff 100%);
+    border-radius: 4px;
+    width: 100%;
+    height: 180px;
+    transition: all 0.2s ease-in-out;
+    margin-bottom: 0.75rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &:hover {
+      transform: translateY(-4px);
+    }
+  }
+
+  & .title {
+    font-size: 16px;
+    font-family: 'Geist', sans-serif;
+    transition: color 0.2s ease-in-out;
+    margin-bottom: 0.25rem;
+  }
+
+  & .description {
+    font-size: 16px;
+    font-family: 'Geist', sans-serif;
+    color: #9e9e9e;
+  }
+}
diff --git a/packages/canon/docs/components/LayoutComponents/svgs/box.tsx b/packages/canon/docs/components/LayoutComponents/svgs/box.tsx
new file mode 100644
index 0000000000..1749b38c6f
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/svgs/box.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const BoxSvg = () => {
+  return (
+    <svg
+      width="100"
+      height="60"
+      viewBox="0 0 100 60"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect width="100" height="60" rx="4" fill="black" fill-opacity="0.06" />
+      <path
+        d="M94.5 0.5H96C97.933 0.5 99.5 2.067 99.5 4V5.5"
+        stroke="#4765FF"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M99.5 54.5L99.5 56C99.5 57.933 97.933 59.5 96 59.5L94.5 59.5"
+        stroke="#4765FF"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M5.5 59.5L4 59.5C2.067 59.5 0.5 57.933 0.5 56L0.5 54.5"
+        stroke="#4765FF"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M0.5 5.5L0.5 4C0.5 2.067 2.067 0.5 4 0.5L5.5 0.500001"
+        stroke="#4765FF"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </svg>
+  );
+};
diff --git a/packages/canon/docs/components/LayoutComponents/svgs/container.tsx b/packages/canon/docs/components/LayoutComponents/svgs/container.tsx
new file mode 100644
index 0000000000..62fe4ce266
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/svgs/container.tsx
@@ -0,0 +1,373 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const ContainerSvg = () => {
+  return (
+    <svg
+      width="126"
+      height="111"
+      viewBox="0 0 126 111"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <mask
+        id="mask0_1922_1559"
+        // style="mask-type:alpha"
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="13"
+        height="111"
+      >
+        <rect width="13" height="111" fill="url(#paint0_linear_1922_1559)" />
+      </mask>
+      <g mask="url(#mask0_1922_1559)">
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 44.7563L13.0259 51.6995L12.5259 52.5655L0.5 45.6224L1 44.7563Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 50.5655L13.0259 57.5087L12.5259 58.3747L0.5 51.4316L1 50.5655Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 56.3747L13.0259 63.3179L12.5259 64.1839L0.5 57.2408L1 56.3747Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 62.1839L13.0259 69.1271L12.5259 69.9931L0.5 63.05L1 62.1839Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 67.9931L13.0259 74.9363L12.5259 75.8023L0.5 68.8592L1 67.9931Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 73.8023L13.0259 80.7455L12.5259 81.6116L0.5 74.6684L1 73.8023Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 79.6115L13.0259 86.5547L12.5259 87.4208L0.5 80.4776L1 79.6115Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 85.4208L13.0259 92.3639L12.5259 93.23L0.5 86.2868L1 85.4208Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 91.23L13.0259 98.1731L12.5259 99.0392L0.5 92.096L1 91.23Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 97.0392L13.0259 103.982L12.5259 104.848L0.5 97.9052L1 97.0392Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 102.848L13.0259 109.792L12.5259 110.658L0.5 103.714L1 102.848Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 108.658L13.0259 115.601L12.5259 116.467L0.5 109.524L1 108.658Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 38.9471L13.0259 45.8903L12.5259 46.7563L0.5 39.8131L1 38.9471Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 33.1379L13.0259 40.0811L12.5259 40.9471L0.5 34.0039L1 33.1379Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 27.3287L13.0259 34.2719L12.5259 35.1379L0.5 28.1947L1 27.3287Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 21.5195L13.0259 28.4627L12.5259 29.3287L0.5 22.3855L1 21.5195Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 15.7103L13.0259 22.6535L12.5259 23.5195L0.5 16.5763L1 15.7103Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 9.90109L13.0259 16.8443L12.5259 17.7103L0.5 10.7671L1 9.90109Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 4.09188L13.0259 11.0351L12.5259 11.9011L0.5 4.95791L1 4.09188Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 -1.71732L13.0259 5.22586L12.5259 6.09188L0.5 -0.851298L1 -1.71732Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M1 -7.52653L13.0259 -0.583351L12.5259 0.282675L0.5 -6.66051L1 -7.52653Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M0 131L0 -17H1L1 131H0Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M12 131L12 -17H13L13 131H12Z"
+          fill="#4765FF"
+        />
+      </g>
+      <rect
+        x="13"
+        y="25.5"
+        width="100"
+        height="60"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <mask
+        id="mask1_1922_1559"
+        // style="mask-type:alpha"
+        maskUnits="userSpaceOnUse"
+        x="113"
+        y="0"
+        width="13"
+        height="111"
+      >
+        <rect
+          x="113"
+          width="13"
+          height="111"
+          fill="url(#paint1_linear_1922_1559)"
+        />
+      </mask>
+      <g mask="url(#mask1_1922_1559)">
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 44.7563L126.026 51.6995L125.526 52.5655L113.5 45.6224L114 44.7563Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 50.5655L126.026 57.5087L125.526 58.3747L113.5 51.4316L114 50.5655Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 56.3747L126.026 63.3179L125.526 64.1839L113.5 57.2408L114 56.3747Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 62.1839L126.026 69.1271L125.526 69.9931L113.5 63.05L114 62.1839Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 67.9931L126.026 74.9363L125.526 75.8023L113.5 68.8592L114 67.9931Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 73.8023L126.026 80.7455L125.526 81.6116L113.5 74.6684L114 73.8023Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 79.6115L126.026 86.5547L125.526 87.4208L113.5 80.4776L114 79.6115Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 85.4208L126.026 92.3639L125.526 93.23L113.5 86.2868L114 85.4208Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 91.23L126.026 98.1731L125.526 99.0392L113.5 92.096L114 91.23Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 97.0392L126.026 103.982L125.526 104.848L113.5 97.9052L114 97.0392Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 102.848L126.026 109.792L125.526 110.658L113.5 103.714L114 102.848Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 108.658L126.026 115.601L125.526 116.467L113.5 109.524L114 108.658Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 38.9471L126.026 45.8903L125.526 46.7563L113.5 39.8131L114 38.9471Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 33.1379L126.026 40.0811L125.526 40.9471L113.5 34.0039L114 33.1379Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 27.3287L126.026 34.2719L125.526 35.1379L113.5 28.1947L114 27.3287Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 21.5195L126.026 28.4627L125.526 29.3287L113.5 22.3855L114 21.5195Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 15.7103L126.026 22.6535L125.526 23.5195L113.5 16.5763L114 15.7103Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 9.90109L126.026 16.8443L125.526 17.7103L113.5 10.7671L114 9.90109Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 4.09188L126.026 11.0351L125.526 11.9011L113.5 4.95791L114 4.09188Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 -1.71732L126.026 5.22586L125.526 6.09188L113.5 -0.851298L114 -1.71732Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M114 -7.52653L126.026 -0.583351L125.526 0.282675L113.5 -6.66051L114 -7.52653Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M113 131L113 -17H114L114 131H113Z"
+          fill="#4765FF"
+        />
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M125 131L125 -17H126L126 131H125Z"
+          fill="#4765FF"
+        />
+      </g>
+      <defs>
+        <linearGradient
+          id="paint0_linear_1922_1559"
+          x1="6.5"
+          y1="0"
+          x2="6.5"
+          y2="111"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop offset="0.05" stop-color="white" stop-opacity="0" />
+          <stop offset="0.2" stop-color="white" />
+          <stop offset="0.8" stop-color="white" />
+          <stop offset="1" stop-color="white" stop-opacity="0" />
+        </linearGradient>
+        <linearGradient
+          id="paint1_linear_1922_1559"
+          x1="119.5"
+          y1="0"
+          x2="119.5"
+          y2="111"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop offset="0.05" stop-color="white" stop-opacity="0" />
+          <stop offset="0.2" stop-color="white" />
+          <stop offset="0.8" stop-color="white" />
+          <stop offset="1" stop-color="white" stop-opacity="0" />
+        </linearGradient>
+      </defs>
+    </svg>
+  );
+};
diff --git a/packages/canon/docs/components/LayoutComponents/svgs/grid.tsx b/packages/canon/docs/components/LayoutComponents/svgs/grid.tsx
new file mode 100644
index 0000000000..5527d1f3e2
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/svgs/grid.tsx
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const GridSvg = () => {
+  return (
+    <svg
+      width="166"
+      height="61"
+      viewBox="0 0 166 61"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect
+        x="0.5"
+        width="52"
+        height="61"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M53.5 30L64.5 30V31L53.5 31L53.5 30Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M64.5 24.5C64.5 24.2239 64.7239 24 65 24C65.2761 24 65.5 24.2239 65.5 24.5L65.5 36.5C65.5 36.7761 65.2761 37 65 37C64.7239 37 64.5 36.7761 64.5 36.5L64.5 24.5Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M52.5 24.5C52.5 24.2239 52.7239 24 53 24C53.2761 24 53.5 24.2239 53.5 24.5L53.5 36.5C53.5 36.7761 53.2761 37 53 37C52.7239 37 52.5 36.7761 52.5 36.5L52.5 24.5Z"
+        fill="#4765FF"
+      />
+      <rect
+        x="65.5"
+        y="0.5"
+        width="100"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M115 36.5L115 25.5L116 25.5L116 36.5L115 36.5Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M109.5 25.5C109.224 25.5 109 25.2761 109 25V25C109 24.7239 109.224 24.5 109.5 24.5L121.5 24.5C121.776 24.5 122 24.7239 122 25V25C122 25.2761 121.776 25.5 121.5 25.5L109.5 25.5Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M109.5 36.5C109.224 36.5 109 36.2761 109 36V36C109 35.7239 109.224 35.5 109.5 35.5L121.5 35.5C121.776 35.5 122 35.7239 122 36V36C122 36.2761 121.776 36.5 121.5 36.5L109.5 36.5Z"
+        fill="#4765FF"
+      />
+      <rect
+        x="65.5"
+        y="36.5"
+        width="100"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+    </svg>
+  );
+};
diff --git a/packages/canon/docs/components/LayoutComponents/svgs/inline.tsx b/packages/canon/docs/components/LayoutComponents/svgs/inline.tsx
new file mode 100644
index 0000000000..fadb9bfc1b
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/svgs/inline.tsx
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const InlineSvg = () => {
+  return (
+    <svg
+      width="159"
+      height="56"
+      viewBox="0 0 159 56"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect width="24" height="24" rx="4" fill="black" fill-opacity="0.06" />
+      <rect
+        x="32"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        x="64"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        x="96"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        x="128"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        y="32"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        x="32"
+        y="32"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <rect
+        x="64"
+        y="32"
+        width="24"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <path
+        d="M12 12H138.811C141.238 12 141.569 15.5106 139.185 15.9647L12.8145 40.0353C10.4306 40.4894 10.762 44 13.1888 44H77"
+        stroke="#4765FF"
+      />
+    </svg>
+  );
+};
diff --git a/packages/canon/docs/components/LayoutComponents/svgs/stack.tsx b/packages/canon/docs/components/LayoutComponents/svgs/stack.tsx
new file mode 100644
index 0000000000..aeda998d2e
--- /dev/null
+++ b/packages/canon/docs/components/LayoutComponents/svgs/stack.tsx
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+export const StackSvg = () => {
+  return (
+    <svg
+      width="100"
+      height="96"
+      viewBox="0 0 100 96"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect width="100" height="24" rx="4" fill="black" fill-opacity="0.06" />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M49.5 36L49.5 25L50.5 25L50.5 36L49.5 36Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M44 25C43.7239 25 43.5 24.7761 43.5 24.5V24.5C43.5 24.2239 43.7239 24 44 24L56 24C56.2761 24 56.5 24.2239 56.5 24.5V24.5C56.5 24.7761 56.2761 25 56 25L44 25Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M44 36C43.7239 36 43.5 35.7761 43.5 35.5V35.5C43.5 35.2239 43.7239 35 44 35L56 35C56.2761 35 56.5 35.2239 56.5 35.5V35.5C56.5 35.7761 56.2761 36 56 36L44 36Z"
+        fill="#4765FF"
+      />
+      <rect
+        y="36"
+        width="100"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M49.5 72L49.5 61L50.5 61L50.5 72L49.5 72Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M44 61C43.7239 61 43.5 60.7761 43.5 60.5V60.5C43.5 60.2239 43.7239 60 44 60L56 60C56.2761 60 56.5 60.2239 56.5 60.5V60.5C56.5 60.7761 56.2761 61 56 61L44 61Z"
+        fill="#4765FF"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M44 72C43.7239 72 43.5 71.7761 43.5 71.5V71.5C43.5 71.2239 43.7239 71 44 71L56 71C56.2761 71 56.5 71.2239 56.5 71.5V71.5C56.5 71.7761 56.2761 72 56 72L44 72Z"
+        fill="#4765FF"
+      />
+      <rect
+        y="72"
+        width="100"
+        height="24"
+        rx="4"
+        fill="black"
+        fill-opacity="0.06"
+      />
+    </svg>
+  );
+};
diff --git a/packages/canon/docs/components/PropsTable/PropsTable.tsx b/packages/canon/docs/components/PropsTable/PropsTable.tsx
new file mode 100644
index 0000000000..a3dc9e271c
--- /dev/null
+++ b/packages/canon/docs/components/PropsTable/PropsTable.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import * as Table from '..';
+import { Chip } from '..';
+
+// Modify the PropsTable component to accept a generic type
+export const PropsTable = <T extends Record<string, any>>({
+  data,
+}: {
+  data: T;
+}) => {
+  return (
+    <Table.Root>
+      <Table.Header>
+        <Table.HeaderRow>
+          <Table.HeaderCell>Prop</Table.HeaderCell>
+          <Table.HeaderCell>Type</Table.HeaderCell>
+          <Table.HeaderCell>Responsive</Table.HeaderCell>
+        </Table.HeaderRow>
+      </Table.Header>
+      <Table.Body>
+        {Object.keys(data).map(n => (
+          <Table.Row key={n}>
+            <Table.Cell>
+              <Chip head>{n}</Chip>
+            </Table.Cell>
+            <Table.Cell>
+              {Array.isArray(data[n].type) ? (
+                data[n].type.map((t: any) => <Chip key={t}>{t}</Chip>)
+              ) : (
+                <Chip>{data[n].type}</Chip>
+              )}
+            </Table.Cell>
+            <Table.Cell>
+              <Chip>{data[n].responsive ? 'Yes' : 'No'}</Chip>
+            </Table.Cell>
+          </Table.Row>
+        ))}
+      </Table.Body>
+    </Table.Root>
+  );
+};
diff --git a/packages/canon/docs/components/PropsTable/getProps.ts b/packages/canon/docs/components/PropsTable/getProps.ts
new file mode 100644
index 0000000000..5773eaeb27
--- /dev/null
+++ b/packages/canon/docs/components/PropsTable/getProps.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export function getProps(styles: Record<string, any>) {
+  return Object.keys(styles).reduce(
+    (acc: Record<string, { type: any[]; responsive: boolean }>, n) => {
+      const style = styles[n];
+
+      let values: string[] = [];
+
+      if (style.values) {
+        // If values exist, use them
+        values = Object.keys(style.values);
+      } else if (style.mappings && style.mappings.length > 0) {
+        // If mappings exist, use the first mapping's values
+        const firstMapping = style.mappings[0];
+        values = Object.keys(styles[firstMapping].values);
+      } else {
+        // Default to an empty array if neither values nor mappings exist
+        values = [];
+      }
+
+      acc[n] = {
+        type: values,
+        responsive: true,
+      };
+      return acc;
+    },
+    {} as Record<string, { type: string[]; responsive: boolean }>,
+  );
+}
diff --git a/packages/canon/docs/components/PropsTable/index.ts b/packages/canon/docs/components/PropsTable/index.ts
new file mode 100644
index 0000000000..181933f0f8
--- /dev/null
+++ b/packages/canon/docs/components/PropsTable/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { PropsTable } from './PropsTable';
+export { getProps } from './getProps';
diff --git a/packages/canon/docs/components/Roadmap/Roadmap.tsx b/packages/canon/docs/components/Roadmap/Roadmap.tsx
new file mode 100644
index 0000000000..2177ea558f
--- /dev/null
+++ b/packages/canon/docs/components/Roadmap/Roadmap.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { RoadmapItem } from './list';
+
+export const Roadmap = ({ list }: { list: RoadmapItem[] }) => {
+  const orderList = ['inProgress', 'notStarted', 'completed'];
+  return (
+    <div className="roadmap">
+      {list
+        .sort(
+          (a, b) => orderList.indexOf(a.status) - orderList.indexOf(b.status),
+        )
+        .map(Item)}
+    </div>
+  );
+};
+
+const Item = ({
+  title,
+  status = 'notStarted',
+}: {
+  title: string;
+  status: 'notStarted' | 'inProgress' | 'inReview' | 'completed';
+}) => {
+  return (
+    <div className={['roadmap-item', status].join(' ')}>
+      <div className="left">
+        <div className="dot" />
+        <div className="title">{title}</div>
+      </div>
+      <span className="pill">
+        {status === 'notStarted' && 'Not Started'}
+        {status === 'inProgress' && 'In Progress'}
+        {status === 'inReview' && 'Ready for Review'}
+        {status === 'completed' && 'Completed'}
+      </span>
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/Roadmap/index.ts b/packages/canon/docs/components/Roadmap/index.ts
new file mode 100644
index 0000000000..ac51dfa1ed
--- /dev/null
+++ b/packages/canon/docs/components/Roadmap/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Roadmap } from './Roadmap';
diff --git a/packages/canon/docs/components/Roadmap/list.ts b/packages/canon/docs/components/Roadmap/list.ts
new file mode 100644
index 0000000000..d5f436281a
--- /dev/null
+++ b/packages/canon/docs/components/Roadmap/list.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export type RoadmapItem = {
+  title: string;
+  status: 'notStarted' | 'inProgress' | 'inReview' | 'completed';
+};
+
+export const list: RoadmapItem[] = [
+  {
+    title: 'Remove Vanilla Extract and use pure CSS instead',
+    status: 'inProgress',
+  },
+  {
+    title: 'Add collapsing across breakpoints for the Inline component',
+    status: 'notStarted',
+  },
+  {
+    title: 'Add reversing the order for the Inline component',
+    status: 'notStarted',
+  },
+  {
+    title: 'Set up Storybook',
+    status: 'completed',
+  },
+  {
+    title: 'Set up iconography',
+    status: 'completed',
+  },
+  {
+    title: 'Set up global tokens',
+    status: 'inProgress',
+  },
+  {
+    title: 'Set up theming system',
+    status: 'inProgress',
+  },
+  {
+    title: 'Create first pass at box component',
+    status: 'completed',
+  },
+  {
+    title: 'Create first pass at stack component',
+    status: 'completed',
+  },
+  {
+    title: 'Create first pass at inline component',
+    status: 'completed',
+  },
+];
diff --git a/packages/canon/docs/components/Roadmap/styles.css b/packages/canon/docs/components/Roadmap/styles.css
new file mode 100644
index 0000000000..e47aecf7fa
--- /dev/null
+++ b/packages/canon/docs/components/Roadmap/styles.css
@@ -0,0 +1,102 @@
+.roadmap {
+  display: flex;
+  flex-direction: column;
+}
+
+.roadmap .roadmap-item {
+  font-family: 'Geist', sans-serif;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #e0e0e0;
+  padding: 8px 0px;
+}
+
+.roadmap .roadmap-item .left {
+  display: flex;
+  align-items: center;
+  padding-left: 12px;
+  gap: 12px;
+}
+
+.roadmap .roadmap-item .dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #e0e0e0;
+}
+
+.roadmap .roadmap-item.notStarted {
+  color: #000;
+}
+
+.roadmap .roadmap-item.inProgress {
+  color: #000;
+}
+
+.roadmap .roadmap-item.inReview {
+  color: #000;
+}
+
+.roadmap .roadmap-item.completed .title {
+  color: #a2a2a2;
+  text-decoration: line-through;
+}
+
+.roadmap .roadmap-item.notStarted .dot {
+  background-color: #d1d1d1;
+}
+
+.roadmap .roadmap-item.inProgress .dot {
+  background-color: #ffd000;
+}
+
+.roadmap .roadmap-item.inReview .dot {
+  background-color: #4ed14a;
+}
+
+.roadmap .roadmap-item.completed .dot {
+  background-color: #4ed14a;
+}
+
+.roadmap .roadmap-item .title {
+  font-weight: 300;
+  font-size: 16px;
+}
+
+.roadmap .roadmap-item .pill {
+  display: inline-flex;
+  align-items: center;
+  height: 24px;
+  padding: 0px 8px;
+  border-radius: 40px;
+  font-size: 12px;
+  font-weight: 600;
+  margin-left: 8px;
+  border-style: solid;
+  border-width: 1px;
+}
+
+.roadmap .roadmap-item.notStarted .pill {
+  background-color: #f2f2f2;
+  border-color: #cdcdcd;
+  color: #888888;
+}
+
+.roadmap .roadmap-item.inProgress .pill {
+  background-color: #fff2b9;
+  border-color: #ffd000;
+  color: #d79927;
+}
+
+.roadmap .roadmap-item.inReview .pill {
+  background-color: #d7f9d7;
+  border-color: #4ed14a;
+  color: #3a9837;
+}
+
+.roadmap .roadmap-item.completed .pill {
+  background-color: #d7f9d7;
+  border-color: #4ed14a;
+  color: #3a9837;
+}
diff --git a/packages/canon/docs/components/Table/Table.tsx b/packages/canon/docs/components/Table/Table.tsx
new file mode 100644
index 0000000000..4983038724
--- /dev/null
+++ b/packages/canon/docs/components/Table/Table.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const Root = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <div className="table-wrapper">
+      <table className="table">{children}</table>
+    </div>
+  );
+};
+
+export const Header = ({ children }: { children: React.ReactNode }) => {
+  return <thead>{children}</thead>;
+};
+
+export const Body = ({ children }: { children: React.ReactNode }) => {
+  return <tbody>{children}</tbody>;
+};
+
+export const HeaderRow = ({ children }: { children: React.ReactNode }) => {
+  return <tr>{children}</tr>;
+};
+
+export const HeaderCell = ({ children }: { children: React.ReactNode }) => {
+  return <th className="table-cell table-header-cell">{children}</th>;
+};
+
+export const Row = ({ children }: { children: React.ReactNode }) => {
+  return <tr className="table-row">{children}</tr>;
+};
+
+export const Cell = ({ children }: { children: React.ReactNode }) => {
+  return <td className="table-cell">{children}</td>;
+};
diff --git a/packages/canon/docs/components/Table/index.ts b/packages/canon/docs/components/Table/index.ts
new file mode 100644
index 0000000000..7419aa83a8
--- /dev/null
+++ b/packages/canon/docs/components/Table/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Root, Header, Body, Row, Cell, HeaderRow, HeaderCell } from './Table';
diff --git a/packages/canon/docs/components/Table/styles.css b/packages/canon/docs/components/Table/styles.css
new file mode 100644
index 0000000000..a8c35d3978
--- /dev/null
+++ b/packages/canon/docs/components/Table/styles.css
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.table-wrapper {
+  border: 1px solid #e7e7e7;
+  border-radius: 4px;
+  overflow: hidden;
+
+  & .table {
+    width: 100%;
+    margin: 0 !important;
+    padding: 0 !important;
+    border-spacing: 0px;
+    border-collapse: collapse;
+  }
+
+  & .table-cell {
+    padding: 12px 16px !important;
+    border: none !important;
+    text-align: left;
+    background-color: white !important;
+    font-family: 'Geist', sans-serif;
+    font-size: 16px;
+    font-weight: 300;
+
+    & p {
+      margin: 0;
+    }
+  }
+
+  & .table-header-cell {
+    background-color: #f5f5f5 !important;
+    border-bottom: 1px solid #e7e7e7 !important;
+    font-weight: 500;
+    font-size: 14px;
+  }
+
+  & .table-row {
+    border: none;
+    border-bottom: 1px solid #e7e7e7;
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  & .table-chip {
+    display: inline-block;
+    font-size: 14px !important;
+    border: 1px solid #e7e7e7;
+    border-radius: 6px;
+    padding: 0px 6px;
+    height: 24px;
+  }
+
+  & .table-type {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    gap: 8px;
+  }
+}
diff --git a/packages/canon/docs/components/Text/Text.tsx b/packages/canon/docs/components/Text/Text.tsx
new file mode 100644
index 0000000000..9f3dd6ce90
--- /dev/null
+++ b/packages/canon/docs/components/Text/Text.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const Text = ({
+  children,
+  style,
+}: {
+  children: React.ReactNode;
+  style?: React.CSSProperties;
+}) => {
+  return (
+    <div className="text" style={style}>
+      {children}
+    </div>
+  );
+};
diff --git a/packages/canon/docs/components/Text/index.ts b/packages/canon/docs/components/Text/index.ts
new file mode 100644
index 0000000000..873fca2c76
--- /dev/null
+++ b/packages/canon/docs/components/Text/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Text } from './Text';
diff --git a/packages/canon/docs/components/Text/styles.css b/packages/canon/docs/components/Text/styles.css
new file mode 100644
index 0000000000..cbb2b88edb
--- /dev/null
+++ b/packages/canon/docs/components/Text/styles.css
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.text {
+  font-family: 'Geist', sans-serif;
+  font-size: 16px;
+  line-height: 28px;
+  margin: 0;
+  font-weight: 300;
+  margin-bottom: 16px;
+
+  & p {
+    font-family: 'Geist', sans-serif;
+    font-size: 16px;
+    line-height: 28px;
+    margin: 0;
+    font-weight: 300;
+  }
+}
diff --git a/packages/canon/docs/components/Title/Title.tsx b/packages/canon/docs/components/Title/Title.tsx
new file mode 100644
index 0000000000..056ccfc14d
--- /dev/null
+++ b/packages/canon/docs/components/Title/Title.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+
+export const Title = ({
+  children,
+  style,
+  type = 'h1',
+}: {
+  children: React.ReactNode;
+  style?: React.CSSProperties;
+  type?: 'h1' | 'h2' | 'h3';
+}) => {
+  let Component = 'h1';
+  if (type === 'h1') Component = 'h1';
+  if (type === 'h2') Component = 'h2';
+  if (type === 'h3') Component = 'h3';
+
+  return React.createElement(Component, {
+    className: `title ${type}`,
+    style,
+    children,
+  });
+};
diff --git a/packages/canon/docs/components/Title/index.ts b/packages/canon/docs/components/Title/index.ts
new file mode 100644
index 0000000000..998dc81882
--- /dev/null
+++ b/packages/canon/docs/components/Title/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Title } from './Title';
diff --git a/packages/canon/docs/components/Title/styles.css b/packages/canon/docs/components/Title/styles.css
new file mode 100644
index 0000000000..a8d00e2af5
--- /dev/null
+++ b/packages/canon/docs/components/Title/styles.css
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.title {
+  font-family: 'Geist', sans-serif;
+  margin: 0;
+  font-weight: 500;
+  border: none;
+
+  &.h1 {
+    font-size: 36px;
+    line-height: 44px;
+    margin-bottom: 8px;
+    margin-top: 0px;
+  }
+
+  &.h2 {
+    font-size: 24px;
+    line-height: 32px;
+    margin-bottom: 12px;
+    margin-top: 52px;
+  }
+
+  &.h3 {
+    font-size: 20px;
+    line-height: 28px;
+    margin-bottom: 12px;
+    margin-top: 40px;
+  }
+}
diff --git a/packages/canon/docs/components/index.ts b/packages/canon/docs/components/index.ts
new file mode 100644
index 0000000000..0e5ff2e325
--- /dev/null
+++ b/packages/canon/docs/components/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './Banner';
+export * from './Chip';
+export * from './Columns';
+export * from './ComponentStatus';
+export * from './IconLibrary';
+export * from './LayoutComponents';
+export * from './PropsTable';
+export * from './Roadmap';
+export * from './Table';
+export * from './Text';
+export * from './Title';
diff --git a/packages/canon/docs/components/styles.css b/packages/canon/docs/components/styles.css
new file mode 100644
index 0000000000..670b0c3046
--- /dev/null
+++ b/packages/canon/docs/components/styles.css
@@ -0,0 +1,10 @@
+@import './Banner/styles.css';
+@import './Chip/styles.css';
+@import './Columns/styles.css';
+@import './ComponentStatus/styles.css';
+@import './IconLibrary/styles.css';
+@import './LayoutComponents/styles.css';
+@import './Roadmap/styles.css';
+@import './Table/styles.css';
+@import './Text/styles.css';
+@import './Title/styles.css';
diff --git a/packages/canon/docs/utils/argTypes.ts b/packages/canon/docs/utils/argTypes.ts
new file mode 100644
index 0000000000..e6a68008f8
--- /dev/null
+++ b/packages/canon/docs/utils/argTypes.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { boxProperties } from '../../src/components/Box/sprinkles.css';
+import {
+  colorProperties,
+  spacingProperties,
+} from '../../src/layout/sprinkles.css';
+
+export const listResponsiveValues = (
+  value: keyof typeof boxProperties.styles,
+) => {
+  const values = boxProperties.styles[value];
+
+  if (!values) {
+    console.warn(`Value "${value}" not found in boxProperties.styles`);
+    return [];
+  }
+
+  if ('values' in values) {
+    return Object.keys(values.values);
+  }
+
+  return [];
+};
+
+export const listColorValues = (value: keyof typeof colorProperties.styles) => {
+  const values = colorProperties.styles[value];
+
+  if ('values' in values) {
+    return Object.keys(values.values);
+  }
+
+  return [];
+};
+
+export const argTypesSpacing = Object.keys(spacingProperties.styles).reduce<
+  Record<string, any>
+>((acc, n) => {
+  acc[n] = {
+    control: 'inline-radio',
+    options: ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'],
+  };
+  return acc;
+}, {});
+
+export const argTypesColor = Object.keys(colorProperties.styles).reduce<
+  Record<string, any>
+>((acc, n) => {
+  acc[n as keyof typeof colorProperties.styles] = {
+    control: 'select',
+    options: Object.keys(
+      colorProperties.styles[n as keyof typeof colorProperties.styles].values,
+    ),
+  };
+  return acc;
+}, {});
diff --git a/packages/canon/header.png b/packages/canon/header.png
new file mode 100644
index 0000000000..507bd05ca7
Binary files /dev/null and b/packages/canon/header.png differ
diff --git a/packages/canon/package.json b/packages/canon/package.json
new file mode 100644
index 0000000000..7bfc717b74
--- /dev/null
+++ b/packages/canon/package.json
@@ -0,0 +1,81 @@
+{
+  "name": "@backstage/canon",
+  "version": "0.0.0",
+  "backstage": {
+    "role": "web-library"
+  },
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "private": true,
+  "keywords": [
+    "backstage"
+  ],
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "packages/canon"
+  },
+  "license": "Apache-2.0",
+  "sideEffects": false,
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "backstage-cli package build",
+    "build-storybook": "storybook build",
+    "clean": "backstage-cli package clean",
+    "lint": "backstage-cli package lint",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "start": "storybook dev -p 6006",
+    "test": "backstage-cli package test"
+  },
+  "dependencies": {
+    "@base_ui/react": "^1.0.0-alpha.3",
+    "@remixicon/react": "^4.5.0",
+    "@vanilla-extract/sprinkles": "^1.6.3"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "@chromatic-com/storybook": "^3.2.2",
+    "@storybook/addon-essentials": "^8.4.6",
+    "@storybook/addon-interactions": "^8.4.6",
+    "@storybook/addon-styling-webpack": "^1.0.1",
+    "@storybook/addon-themes": "^8.4.6",
+    "@storybook/addon-webpack5-compiler-swc": "^1.0.5",
+    "@storybook/blocks": "^8.4.6",
+    "@storybook/react": "^8.4.6",
+    "@storybook/react-webpack5": "^8.4.6",
+    "@storybook/test": "^8.4.6",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@vanilla-extract/rollup-plugin": "^1.3.10",
+    "@vanilla-extract/webpack-plugin": "^2.3.14",
+    "eslint-plugin-storybook": "^0.11.1",
+    "globals": "^15.11.0",
+    "mini-css-extract-plugin": "^2.9.2",
+    "react": "^18.0.2",
+    "react-dom": "^18.0.2",
+    "react-router-dom": "^6.3.0",
+    "storybook": "^8.4.6",
+    "webpack-merge": "^6.0.1"
+  },
+  "peerDependencies": {
+    "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  },
+  "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    }
+  }
+}
diff --git a/packages/canon/report.api.md b/packages/canon/report.api.md
new file mode 100644
index 0000000000..b314020d81
--- /dev/null
+++ b/packages/canon/report.api.md
@@ -0,0 +1,472 @@
+## API Report File for "@backstage/canon"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { ForwardRefExoticComponent } from 'react';
+import { default as React_2 } from 'react';
+import { RefAttributes } from 'react';
+
+// @public (undocumented)
+export type AlignItemsProps =
+  | 'stretch'
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | Partial<
+      Record<Breakpoint, 'stretch' | 'flex-start' | 'center' | 'flex-end'>
+    >;
+
+// @public (undocumented)
+export type AsProps =
+  | 'div'
+  | 'span'
+  | 'p'
+  | 'article'
+  | 'section'
+  | 'main'
+  | 'nav'
+  | 'aside'
+  | 'ul'
+  | 'ol'
+  | 'li'
+  | 'details'
+  | 'summary'
+  | 'dd'
+  | 'dl'
+  | 'dt';
+
+// @public (undocumented)
+export type Background =
+  | 'background'
+  | 'elevation1'
+  | 'elevation2'
+  | 'transparent'
+  | Partial<
+      Record<Theme, 'background' | 'elevation1' | 'elevation2' | 'transparent'>
+    >;
+
+// @public (undocumented)
+export type BorderRadiusProps =
+  | 'none'
+  | 'small'
+  | 'medium'
+  | 'full'
+  | Partial<Record<Breakpoint, 'none' | 'small' | 'medium' | 'full'>>;
+
+// @public (undocumented)
+export const Box: ForwardRefExoticComponent<
+  BoxProps & RefAttributes<HTMLDivElement>
+>;
+
+// @public (undocumented)
+export interface BoxProps extends SpaceProps, ColorProps {
+  // (undocumented)
+  alignItems?: AlignItemsProps;
+  // (undocumented)
+  as?: keyof JSX.IntrinsicElements;
+  // (undocumented)
+  borderRadius?: BorderRadiusProps;
+  // (undocumented)
+  children?: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  display?: DisplayProps;
+  // (undocumented)
+  flexDirection?: FlexDirectionProps;
+  // (undocumented)
+  flexWrap?: FlexWrapProps;
+  // (undocumented)
+  justifyContent?: JustifyContentProps;
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export type Breakpoint = keyof typeof breakpoints;
+
+// @public (undocumented)
+export const breakpoints: {
+  xs: {};
+  sm: {
+    '@media': string;
+  };
+  md: {
+    '@media': string;
+  };
+  lg: {
+    '@media': string;
+  };
+  xl: {
+    '@media': string;
+  };
+  '2xl': {
+    '@media': string;
+  };
+};
+
+// @public (undocumented)
+export const Button: React_2.ForwardRefExoticComponent<
+  ButtonProps & React_2.RefAttributes<HTMLButtonElement>
+>;
+
+// @public
+export interface ButtonProps {
+  // (undocumented)
+  children: React_2.ReactNode;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  iconEnd?: IconNames;
+  // (undocumented)
+  iconStart?: IconNames;
+  // (undocumented)
+  size?: 'small' | 'medium';
+  // (undocumented)
+  variant?: 'primary' | 'secondary' | 'tertiary';
+}
+
+// @public (undocumented)
+export const Checkbox: React_2.ForwardRefExoticComponent<
+  CheckboxProps & React_2.RefAttributes<HTMLButtonElement>
+>;
+
+// @public (undocumented)
+export interface CheckboxProps {
+  // (undocumented)
+  checked?: boolean;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  defaultChecked?: boolean;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  label?: string;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  onChange?: (checked: boolean) => void;
+  // (undocumented)
+  required?: boolean;
+  // (undocumented)
+  style?: React.CSSProperties;
+  // (undocumented)
+  value?: string;
+}
+
+// @public (undocumented)
+export type Color =
+  | 'primary'
+  | 'secondary'
+  | 'error'
+  | Partial<Record<Theme, 'primary' | 'secondary' | 'error'>>;
+
+// @public (undocumented)
+export interface ColorProps {
+  // (undocumented)
+  background?: Background;
+  // (undocumented)
+  color?: Color;
+}
+
+// @public (undocumented)
+export type Columns = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+
+// @public (undocumented)
+export const Container: React_2.ForwardRefExoticComponent<
+  ContainerProps & React_2.RefAttributes<HTMLDivElement>
+>;
+
+// @public (undocumented)
+export interface ContainerProps
+  extends Omit<
+    SpaceProps,
+    | 'padding'
+    | 'paddingLeft'
+    | 'paddingRight'
+    | 'paddingX'
+    | 'margin'
+    | 'marginLeft'
+    | 'marginRight'
+    | 'marginX'
+    | 'gap'
+  > {
+  // (undocumented)
+  children?: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export type DisplayProps =
+  | 'flex'
+  | 'none'
+  | 'inline'
+  | 'block'
+  | Partial<Record<Breakpoint, 'flex' | 'none' | 'inline' | 'block'>>;
+
+// @public (undocumented)
+export type FlexDirectionProps =
+  | 'row'
+  | 'column'
+  | Partial<Record<Breakpoint, 'row' | 'column'>>;
+
+// @public (undocumented)
+export type FlexWrapProps =
+  | 'wrap'
+  | 'nowrap'
+  | Partial<Record<Breakpoint, 'wrap' | 'nowrap'>>;
+
+// @public (undocumented)
+export type Gap = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export const Grid: ForwardRefExoticComponent<
+  GridProps & RefAttributes<HTMLDivElement>
+> & {
+  Item: ForwardRefExoticComponent<
+    GridItemProps & RefAttributes<HTMLDivElement>
+  >;
+};
+
+// @public (undocumented)
+export interface GridItemProps {
+  // (undocumented)
+  children: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  colSpan?: Columns | 'full';
+  // (undocumented)
+  end?: Columns | 'auto';
+  // (undocumented)
+  rowSpan?: Columns | 'full';
+  // (undocumented)
+  start?: Columns | 'auto';
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export interface GridProps extends SpaceProps, ColorProps {
+  // (undocumented)
+  children?: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  columns?: Columns | Partial<Record<Breakpoint, Columns>>;
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export const Icon: (props: {
+  name: IconNames;
+  size?: number;
+}) => React_2.JSX.Element;
+
+// @public (undocumented)
+export type IconMap = Partial<Record<IconNames, React.ComponentType>>;
+
+// @public (undocumented)
+export type IconNames =
+  | 'arrowDown'
+  | 'arrowLeft'
+  | 'arrowRight'
+  | 'arrowUp'
+  | 'arrowDownCircle'
+  | 'arrowLeftCircle'
+  | 'arrowRightCircle'
+  | 'arrowUpCircle'
+  | 'check'
+  | 'chevronDown'
+  | 'chevronLeft'
+  | 'chevronRight'
+  | 'chevronUp'
+  | 'cloud'
+  | 'heart'
+  | 'plus'
+  | 'trash';
+
+// @public (undocumented)
+export const Inline: ForwardRefExoticComponent<
+  InlineProps & RefAttributes<HTMLElement>
+>;
+
+// @public (undocumented)
+export interface InlineProps extends SpaceProps, ColorProps {
+  // (undocumented)
+  align?:
+    | 'left'
+    | 'center'
+    | 'right'
+    | Partial<Record<Breakpoint, 'left' | 'center' | 'right'>>;
+  // (undocumented)
+  alignY?:
+    | 'top'
+    | 'center'
+    | 'bottom'
+    | Partial<Record<Breakpoint, 'top' | 'center' | 'bottom'>>;
+  // (undocumented)
+  as?: AsProps;
+  // (undocumented)
+  children: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export type JustifyContentProps =
+  | 'stretch'
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'space-around'
+  | 'space-between'
+  | Partial<
+      Record<
+        Breakpoint,
+        | 'stretch'
+        | 'flex-start'
+        | 'center'
+        | 'flex-end'
+        | 'space-around'
+        | 'space-between'
+      >
+    >;
+
+// @public (undocumented)
+export type Margin = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginBottom = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginLeft = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginRight = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginTop = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginX = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type MarginY = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type Padding = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingBottom = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingLeft = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingRight = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingTop = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingX = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type PaddingY = Space | Partial<Record<Breakpoint, Space>>;
+
+// @public (undocumented)
+export type Space = keyof typeof space;
+
+// @public (undocumented)
+export const space: {
+  none: number;
+  '2xs': string;
+  xs: string;
+  sm: string;
+  md: string;
+  lg: string;
+  xl: string;
+  '2xl': string;
+};
+
+// @public (undocumented)
+export interface SpaceProps {
+  // (undocumented)
+  gap?: Gap;
+  // (undocumented)
+  margin?: Margin;
+  // (undocumented)
+  marginBottom?: MarginBottom;
+  // (undocumented)
+  marginLeft?: MarginLeft;
+  // (undocumented)
+  marginRight?: MarginRight;
+  // (undocumented)
+  marginTop?: MarginTop;
+  // (undocumented)
+  marginX?: MarginX;
+  // (undocumented)
+  marginY?: MarginY;
+  // (undocumented)
+  padding?: Padding;
+  // (undocumented)
+  paddingBottom?: PaddingBottom;
+  // (undocumented)
+  paddingLeft?: PaddingLeft;
+  // (undocumented)
+  paddingRight?: PaddingRight;
+  // (undocumented)
+  paddingTop?: PaddingTop;
+  // (undocumented)
+  paddingX?: PaddingX;
+  // (undocumented)
+  paddingY?: PaddingY;
+}
+
+// @public (undocumented)
+export const Stack: ForwardRefExoticComponent<
+  StackProps & RefAttributes<HTMLDivElement>
+>;
+
+// @public (undocumented)
+export interface StackProps extends SpaceProps, ColorProps {
+  // (undocumented)
+  align?:
+    | 'left'
+    | 'center'
+    | 'right'
+    | Partial<Record<Breakpoint, 'left' | 'center' | 'right'>>;
+  // (undocumented)
+  as?: AsProps;
+  // (undocumented)
+  children: React.ReactNode;
+  // (undocumented)
+  className?: string;
+  // (undocumented)
+  style?: React.CSSProperties;
+}
+
+// @public (undocumented)
+export type Theme = keyof typeof themes;
+
+// @public (undocumented)
+export const themes: {
+  light: {
+    selector: string;
+  };
+  dark: {
+    selector: string;
+  };
+};
+```
diff --git a/packages/canon/src/components/Box/Box.stories.tsx b/packages/canon/src/components/Box/Box.stories.tsx
new file mode 100644
index 0000000000..6f15d984e1
--- /dev/null
+++ b/packages/canon/src/components/Box/Box.stories.tsx
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Box } from './Box';
+import {
+  listResponsiveValues,
+  argTypesSpacing,
+  argTypesColor,
+} from '../../../docs/utils/argTypes';
+import { boxProperties } from './sprinkles.css';
+
+const argTypesBox = Object.keys(boxProperties.styles).reduce<
+  Record<string, any>
+>((acc, n) => {
+  acc[n] = {
+    control: 'select',
+    options: listResponsiveValues(n as keyof typeof boxProperties.styles),
+  };
+  return acc;
+}, {});
+
+const meta = {
+  title: 'Components/Box',
+  component: Box,
+  parameters: {
+    layout: 'centered',
+  },
+  argTypes: {
+    ...argTypesSpacing,
+    ...argTypesColor,
+    ...argTypesBox,
+    as: {
+      control: { type: 'select' },
+      options: ['div', 'span', 'article', 'section'],
+    },
+    children: {
+      control: false,
+    },
+  },
+  args: {
+    as: 'div',
+    background: 'elevation1',
+    borderRadius: 'small',
+    children: 'Basic Box',
+    display: 'block',
+    padding: 'sm',
+  },
+} satisfies Meta<typeof Box>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Basic: Story = {
+  args: {},
+};
+
+export const Responsive: Story = {
+  render: () => (
+    <Box
+      display={{ xs: 'block', sm: 'flex' }}
+      padding={{ xs: 'xs', sm: 'md', lg: 'lg' }}
+      background="background"
+    >
+      Responsive Box
+    </Box>
+  ),
+};
+
+export const FlexContainer: Story = {
+  render: () => (
+    <Box
+      display="flex"
+      flexDirection="column"
+      padding="lg"
+      background="background"
+    >
+      <Box padding="md" background="background" color="primary">
+        Item 1
+      </Box>
+      <Box padding="md" background="background" color="primary">
+        Item 2
+      </Box>
+      <Box padding="md" background="background" color="primary">
+        Item 3
+      </Box>
+    </Box>
+  ),
+};
+
+export const Nested: Story = {
+  render: () => (
+    <Box padding="lg" background="background">
+      <Box padding="md" background="background">
+        Header
+      </Box>
+      <Box
+        display="flex"
+        padding="md"
+        background="background"
+        justifyContent="space-between"
+      >
+        <Box padding="xs" background="background">
+          Sidebar
+        </Box>
+        <Box padding="xs" background="background">
+          Main Content
+        </Box>
+      </Box>
+      <Box padding="md" background="background">
+        Footer
+      </Box>
+    </Box>
+  ),
+};
+
+export const Alignment: Story = {
+  render: () => (
+    <Box
+      display="flex"
+      padding="lg"
+      background="background"
+      justifyContent="center"
+      alignItems="center"
+      style={{ height: '200px' }}
+    >
+      <Box padding="md" background="background">
+        Centered Content
+      </Box>
+    </Box>
+  ),
+};
+
+// Example showing different spacing combinations
+export const Spacing: Story = {
+  render: () => (
+    <Box display="flex" flexDirection="column" gap="md">
+      <Box padding="xs" background="background">
+        Small Padding
+      </Box>
+      <Box padding="md" background="background">
+        Medium Padding
+      </Box>
+      <Box padding="lg" background="background">
+        Large Padding
+      </Box>
+      <Box paddingX="lg" paddingY="xs" background="background">
+        Mixed Padding
+      </Box>
+    </Box>
+  ),
+};
+
+// Example showing different display values
+export const DisplayVariants: Story = {
+  render: () => (
+    <Box display="flex" flexDirection="column" gap="md">
+      <Box padding="md" background="background" display="block">
+        Display Block
+      </Box>
+      <Box padding="md" background="background" display="flex">
+        Display Flex
+      </Box>
+      <Box padding="md" background="background" display="inline">
+        Display Inline
+      </Box>
+    </Box>
+  ),
+};
diff --git a/packages/canon/src/components/Box/Box.tsx b/packages/canon/src/components/Box/Box.tsx
new file mode 100644
index 0000000000..ecf138f1ce
--- /dev/null
+++ b/packages/canon/src/components/Box/Box.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createElement, forwardRef } from 'react';
+import { boxSprinkles } from './sprinkles.css';
+import { BoxProps } from './types';
+
+/** @public */
+export const Box = forwardRef<HTMLDivElement, BoxProps>((props, ref) => {
+  const { as = 'div', className, style, children, ...restProps } = props;
+
+  // Generate the list of class names
+  const sprinklesClassName = boxSprinkles(restProps);
+
+  // Combine the base class name, the sprinkles class name, and any additional class names
+  const classNames = ['box', sprinklesClassName, className]
+    .filter(Boolean)
+    .join(' ');
+
+  return createElement(as, {
+    ref,
+    className: classNames,
+    style,
+    children,
+  });
+});
diff --git a/packages/canon/src/components/Box/Docs.mdx b/packages/canon/src/components/Box/Docs.mdx
new file mode 100644
index 0000000000..a03c6d43d3
--- /dev/null
+++ b/packages/canon/src/components/Box/Docs.mdx
@@ -0,0 +1,80 @@
+import { Meta, Unstyled, Source } from '@storybook/blocks';
+import * as BoxStories from './Box.stories';
+import { Title, Text } from '../../../docs/components';
+import { Padding } from './docs/padding';
+import { PropsTable, getProps } from '../../../docs/components';
+import { boxProperties } from './sprinkles.css';
+import { spacingProperties } from '../../layout/sprinkles.css';
+
+<Meta of={BoxStories} />
+
+<Unstyled>
+
+<Title type="h1">Box</Title>
+<Text>
+  Box is the lowest-level component in Canon. We use it internally to build all
+  of our components. It provides a consistent API for styling and layout.
+</Text>
+
+<Title type="h2">Installation</Title>
+<Source code={`import { Box } from "@backstage/canon";`} language="tsx" dark />
+
+<Title type="h2">API reference</Title>
+
+<Title type="h3">Box</Title>
+<Text>
+  This is the Box component, our lowest-level component. Here are all the
+  available properties.
+</Text>
+
+<PropsTable
+  data={{
+    ...getProps(boxProperties.styles),
+    children: {
+      type: 'ReactNode',
+      required: false,
+    },
+    className: {
+      type: 'string',
+      required: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      required: false,
+    },
+  }}
+/>
+
+<Text style={{ marginTop: '16px' }}>
+  Padding and margin are used to create space around your component using our
+  predefined spacing tokens. We would recommend to use padding over margin to
+  avoid collapsing margins but both are available.
+</Text>
+
+<Padding />
+
+<PropsTable data={getProps(spacingProperties.styles)} />
+
+<Title type="h2">Examples</Title>
+<Text>Here are some examples of how you can use the Box component.</Text>
+
+<Title type="h3">Simple example</Title>
+<Text>A simple example of how to use the Box component.</Text>
+<Source
+  code={`<Box padding="md" borderRadius="md">Hello World</Box>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Responsive</Title>
+<Text>
+  Most of the values can be defined per breakpoint, making it easy to create
+  responsive designs.
+</Text>
+<Source
+  code={`<Box padding={{ xs: 'sm', md: 'md' }} borderRadius={{ xs: 'sm', md: 'md' }}>Hello World</Box>`}
+  language="tsx"
+  dark
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Box/docs/padding.tsx b/packages/canon/src/components/Box/docs/padding.tsx
new file mode 100644
index 0000000000..86a7c801a2
--- /dev/null
+++ b/packages/canon/src/components/Box/docs/padding.tsx
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Inline } from '../../Inline';
+import { Box } from '../Box';
+
+const FakeBox = ({ children }: { children: string }) => (
+  <Box
+    paddingX="md"
+    paddingY="sm"
+    borderRadius="small"
+    style={{ background: '#1f47ff', color: 'white' }}
+  >
+    {children}
+  </Box>
+);
+
+export const Padding = () => {
+  return (
+    <Box
+      display="flex"
+      justifyContent="center"
+      flexDirection="column"
+      alignItems="center"
+      borderRadius="small"
+      marginBottom="md"
+      gap="xl"
+      paddingY="xl"
+      style={{ border: '1px solid #e7e7e7' }}
+    >
+      <Inline align="center" alignY="center" gap="xl">
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          padding="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>padding</FakeBox>
+        </Box>
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingX="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingX</FakeBox>
+        </Box>
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingY="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingY</FakeBox>
+        </Box>
+      </Inline>
+      <Inline align="center" alignY="center" gap="xl">
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingTop="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingTop</FakeBox>
+        </Box>
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingBottom="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingBottom</FakeBox>
+        </Box>
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingLeft="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingLeft</FakeBox>
+        </Box>
+        <Box
+          alignItems="center"
+          borderRadius="small"
+          paddingRight="md"
+          style={{ background: '#c4cafb', color: 'white' }}
+        >
+          <FakeBox>paddingRight</FakeBox>
+        </Box>
+      </Inline>
+    </Box>
+  );
+};
diff --git a/packages/canon/src/components/Box/index.tsx b/packages/canon/src/components/Box/index.tsx
new file mode 100644
index 0000000000..e4f1867edc
--- /dev/null
+++ b/packages/canon/src/components/Box/index.tsx
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Box } from './Box';
+export type * from './types';
+export { breakpoints, space, themes } from '../../layout/properties';
diff --git a/packages/canon/src/components/Box/sprinkles.css.ts b/packages/canon/src/components/Box/sprinkles.css.ts
new file mode 100644
index 0000000000..df5664029b
--- /dev/null
+++ b/packages/canon/src/components/Box/sprinkles.css.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { defineProperties, createSprinkles } from '@vanilla-extract/sprinkles';
+import { breakpoints } from '../../layout/properties';
+import { colorProperties, spacingProperties } from '../../layout/sprinkles.css';
+
+export const boxProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  responsiveArray: ['xs', 'sm', 'md', 'lg', 'xl', '2xl'],
+  properties: {
+    flexDirection: ['row', 'column'],
+    justifyContent: [
+      'stretch',
+      'flex-start',
+      'center',
+      'flex-end',
+      'space-around',
+      'space-between',
+    ],
+    alignItems: ['stretch', 'flex-start', 'center', 'flex-end'],
+    borderRadius: {
+      none: 0,
+      small: '4px',
+      medium: '8px',
+      full: '9999px',
+    },
+    boxShadow: {
+      small: 'var(--canon-box-shadow-small)',
+      medium: 'var(--canon-box-shadow-medium)',
+      large: 'var(--canon-box-shadow-large)',
+    },
+    border: {
+      none: 'none',
+      thin: '1px solid var(--canon-outline)',
+      error: '1px solid var(--canon-error)',
+    },
+    display: ['none', 'flex', 'block', 'inline'],
+    flexWrap: ['wrap', 'nowrap'],
+  },
+});
+
+export const boxSprinkles = createSprinkles(
+  spacingProperties,
+  boxProperties,
+  colorProperties,
+);
diff --git a/packages/canon/src/components/Box/styles.css b/packages/canon/src/components/Box/styles.css
new file mode 100644
index 0000000000..75fd0dd493
--- /dev/null
+++ b/packages/canon/src/components/Box/styles.css
@@ -0,0 +1,4 @@
+.box {
+  font-family: 'var(--canon-font-regular)';
+  color: 'var(--canon-text-primary)';
+}
diff --git a/packages/canon/src/components/Box/types.ts b/packages/canon/src/components/Box/types.ts
new file mode 100644
index 0000000000..2ba5929fdd
--- /dev/null
+++ b/packages/canon/src/components/Box/types.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Breakpoint, SpaceProps, ColorProps } from '../../layout/types';
+
+/** @public */
+export type DisplayProps =
+  | 'flex'
+  | 'none'
+  | 'inline'
+  | 'block'
+  | Partial<Record<Breakpoint, 'flex' | 'none' | 'inline' | 'block'>>;
+
+/** @public */
+export type FlexDirectionProps =
+  | 'row'
+  | 'column'
+  | Partial<Record<Breakpoint, 'row' | 'column'>>;
+
+/** @public */
+export type FlexWrapProps =
+  | 'wrap'
+  | 'nowrap'
+  | Partial<Record<Breakpoint, 'wrap' | 'nowrap'>>;
+
+/** @public */
+export type JustifyContentProps =
+  | 'stretch'
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | 'space-around'
+  | 'space-between'
+  | Partial<
+      Record<
+        Breakpoint,
+        | 'stretch'
+        | 'flex-start'
+        | 'center'
+        | 'flex-end'
+        | 'space-around'
+        | 'space-between'
+      >
+    >;
+
+/** @public */
+export type AlignItemsProps =
+  | 'stretch'
+  | 'flex-start'
+  | 'center'
+  | 'flex-end'
+  | Partial<
+      Record<Breakpoint, 'stretch' | 'flex-start' | 'center' | 'flex-end'>
+    >;
+
+/** @public */
+export type BorderRadiusProps =
+  | 'none'
+  | 'small'
+  | 'medium'
+  | 'full'
+  | Partial<Record<Breakpoint, 'none' | 'small' | 'medium' | 'full'>>;
+
+/** @public */
+export interface BoxProps extends SpaceProps, ColorProps {
+  as?: keyof JSX.IntrinsicElements;
+  children?: React.ReactNode;
+  display?: DisplayProps;
+  flexDirection?: FlexDirectionProps;
+  flexWrap?: FlexWrapProps;
+  justifyContent?: JustifyContentProps;
+  alignItems?: AlignItemsProps;
+  borderRadius?: BorderRadiusProps;
+  className?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/components/Button/Button.stories.tsx b/packages/canon/src/components/Button/Button.stories.tsx
new file mode 100644
index 0000000000..6cab1cd1ba
--- /dev/null
+++ b/packages/canon/src/components/Button/Button.stories.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Button } from './Button';
+import { Inline } from '../Inline';
+import { Stack } from '../Stack';
+
+const meta = {
+  title: 'Components/Button',
+  component: Button,
+  parameters: {
+    layout: 'centered',
+  },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['small', 'medium'],
+    },
+  },
+  args: {
+    size: 'medium',
+  },
+} satisfies Meta<typeof Button>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Primary: Story = {
+  args: {
+    children: 'Primary button',
+  },
+};
+
+export const Secondary: Story = {
+  args: {
+    children: 'Secondary button',
+    variant: 'secondary',
+  },
+};
+
+export const Tertiary: Story = {
+  args: {
+    children: 'Tertiary button',
+    variant: 'tertiary',
+  },
+};
+
+export const Sizes: Story = {
+  args: {
+    children: 'Button',
+  },
+  render: args => (
+    <Inline alignY="center">
+      <Button {...args} size="medium" />
+      <Button {...args} size="small" />
+    </Inline>
+  ),
+};
+
+export const WithIcons: Story = {
+  args: {
+    children: 'Button',
+  },
+  render: args => (
+    <Inline alignY="center">
+      <Button {...args} iconStart="cloud" />
+      <Button {...args} iconEnd="chevronRight" />
+      <Button {...args} iconStart="cloud" iconEnd="chevronRight" />
+    </Inline>
+  ),
+};
+
+export const FullWidth: Story = {
+  args: {
+    children: 'Button',
+  },
+  render: args => (
+    <Stack style={{ width: '300px' }}>
+      <Button {...args} iconStart="cloud" />
+      <Button {...args} iconEnd="chevronRight" />
+      <Button {...args} iconStart="cloud" iconEnd="chevronRight" />
+    </Stack>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    children: 'Button',
+    disabled: true,
+  },
+};
diff --git a/packages/canon/src/components/Button/Button.tsx b/packages/canon/src/components/Button/Button.tsx
new file mode 100644
index 0000000000..b168705952
--- /dev/null
+++ b/packages/canon/src/components/Button/Button.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { forwardRef } from 'react';
+import { Icon } from '../Icon';
+import type { IconNames } from '../Icon/types';
+
+/**
+ * Properties for {@link Button}
+ *
+ * @public
+ */
+export interface ButtonProps {
+  size?: 'small' | 'medium';
+  variant?: 'primary' | 'secondary' | 'tertiary';
+  children: React.ReactNode;
+  disabled?: boolean;
+  iconStart?: IconNames;
+  iconEnd?: IconNames;
+}
+
+/** @public */
+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
+  (props: ButtonProps, ref) => {
+    const {
+      size = 'medium',
+      variant = 'primary',
+      disabled,
+      iconStart,
+      iconEnd,
+      children,
+    } = props;
+
+    return (
+      <button
+        {...props}
+        ref={ref}
+        disabled={disabled}
+        className={`button ${variant} ${size}`}
+      >
+        <span
+          className={['button-content', iconStart && iconEnd ? 'icon-both' : '']
+            .filter(Boolean)
+            .join(' ')}
+        >
+          {iconStart && <Icon name={iconStart} />}
+          {children}
+        </span>
+        {iconEnd && <Icon name={iconEnd} />}
+      </button>
+    );
+  },
+);
+
+export default Button;
diff --git a/packages/canon/src/components/Button/Docs.mdx b/packages/canon/src/components/Button/Docs.mdx
new file mode 100644
index 0000000000..4ddce0c982
--- /dev/null
+++ b/packages/canon/src/components/Button/Docs.mdx
@@ -0,0 +1,50 @@
+import { Canvas, Meta, Unstyled, Source } from '@storybook/blocks';
+import * as ButtonStories from './Button.stories';
+import { Title, Text } from '../../../docs/components';
+import { PropsTable } from '../../../docs/components/PropsTable/PropsTable';
+
+<Meta of={ButtonStories} />
+
+<Unstyled>
+
+<Title type="h1">Button</Title>
+<Text>A button component that can be used to trigger actions.</Text>
+
+<Canvas of={ButtonStories.Primary} />
+
+<Source of={ButtonStories.Primary} dark />
+
+<Title type="h2" style={{ marginBottom: '16px' }}>
+  API reference
+</Title>
+
+<PropsTable
+  data={{
+    size: {
+      type: ['small', 'medium'],
+      responsive: false,
+    },
+    variant: {
+      type: ['primary', 'secondary', 'tertiary'],
+      responsive: false,
+    },
+    disabled: {
+      type: 'boolean',
+      responsive: false,
+    },
+    children: {
+      type: 'ReactNode',
+      responsive: false,
+    },
+    className: {
+      type: 'string',
+      responsive: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      responsive: false,
+    },
+  }}
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Button/index.tsx b/packages/canon/src/components/Button/index.tsx
new file mode 100644
index 0000000000..bc6714754d
--- /dev/null
+++ b/packages/canon/src/components/Button/index.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Button } from './Button';
+export type { ButtonProps } from './Button';
diff --git a/packages/canon/src/components/Button/styles.css b/packages/canon/src/components/Button/styles.css
new file mode 100644
index 0000000000..aaf1cae8bf
--- /dev/null
+++ b/packages/canon/src/components/Button/styles.css
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.button {
+  all: unset;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  user-select: none;
+  font-family: var(--canon-font-regular);
+  font-weight: var(--canon-font-bold);
+  font-size: var(--canon-font-sizes-md);
+  padding: 0;
+  transition: all 150ms ease;
+  cursor: pointer;
+  border-radius: 8px;
+}
+
+.button.primary {
+  background-color: var(--canon-accent);
+  color: var(--canon-text-primary-on-accent);
+}
+
+.button.primary:hover {
+  background-color: transparent;
+  box-shadow: 0 0 0 1px var(--canon-outline-focus);
+  color: var(--canon-text-primary);
+}
+
+.button.secondary {
+  background-color: transparent;
+  box-shadow: 0 0 0 1px var(--canon-outline);
+  color: var(--canon-text-primary);
+}
+
+.button.secondary:hover {
+  box-shadow: 0 0 0 1px var(--canon-outline-hover);
+}
+
+.button.tertiary {
+  background-color: transparent;
+  color: var(--canon-text-primary);
+}
+
+.button.tertiary:hover {
+  color: var(--canon-text-secondary);
+}
+
+.button.small {
+  padding-left: 6px;
+  padding-right: 6px;
+  height: 32px;
+}
+
+.button.medium {
+  padding-left: 8px;
+  padding-right: 8px;
+  height: 40px;
+}
+
+.button-content {
+  display: flex;
+  align-items: center;
+  gap: var(--canon-spacing-xs);
+}
+
+.button-content.icon-both {
+  flex: 1;
+}
diff --git a/packages/canon/src/components/Checkbox/Checkbox.stories.tsx b/packages/canon/src/components/Checkbox/Checkbox.stories.tsx
new file mode 100644
index 0000000000..ffd874ffe7
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/Checkbox.stories.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Meta, StoryObj } from '@storybook/react';
+import { Checkbox } from './Checkbox';
+
+const meta = {
+  title: 'Components/Checkbox',
+  component: Checkbox,
+  parameters: {
+    layout: 'centered',
+  },
+} satisfies Meta<typeof Checkbox>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Primary: Story = {
+  args: {
+    label: 'Accept terms and conditions',
+  },
+};
diff --git a/packages/canon/src/components/Checkbox/Checkbox.tsx b/packages/canon/src/components/Checkbox/Checkbox.tsx
new file mode 100644
index 0000000000..3021032421
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/Checkbox.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+import { CheckboxRoot, CheckboxIndicator } from '@base_ui/react';
+import { Icon } from '@backstage/canon';
+import type { CheckboxProps } from './types';
+
+/** @public */
+export const Checkbox = React.forwardRef<HTMLButtonElement, CheckboxProps>(
+  (props, ref) => {
+    const {
+      label,
+      checked,
+      onChange,
+      disabled,
+      required,
+      className,
+      name,
+      value,
+      style,
+    } = props;
+
+    const checkboxElement = (
+      <CheckboxRoot
+        ref={ref}
+        className={`checkbox ${className}`}
+        checked={checked}
+        onCheckedChange={onChange}
+        disabled={disabled}
+        required={required}
+        name={name}
+        value={value}
+        style={style}
+      >
+        <CheckboxIndicator className="checkbox-indicator">
+          <Icon name="check" size={12} />
+        </CheckboxIndicator>
+      </CheckboxRoot>
+    );
+
+    return label ? (
+      <label className="checkbox-label">
+        {checkboxElement}
+        {label}
+      </label>
+    ) : (
+      checkboxElement
+    );
+  },
+);
diff --git a/packages/canon/src/components/Checkbox/Docs.mdx b/packages/canon/src/components/Checkbox/Docs.mdx
new file mode 100644
index 0000000000..9d9b4e4915
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/Docs.mdx
@@ -0,0 +1,66 @@
+import { Canvas, Meta, Unstyled, Source } from '@storybook/blocks';
+import * as CheckboxStories from './Checkbox.stories';
+import { Title, Text } from '../../../docs/components';
+import { PropsTable } from '../../../docs/components/PropsTable';
+
+<Meta of={CheckboxStories} />
+
+<Unstyled>
+
+<Title type="h1">Checkbox</Title>
+<Text>A checkbox component that can be used to trigger actions.</Text>
+
+<Canvas of={CheckboxStories.Primary} />
+
+<Source of={CheckboxStories.Primary} dark />
+
+<Title type="h2" style={{ marginBottom: '16px' }}>
+  API reference
+</Title>
+
+<PropsTable
+  data={{
+    label: {
+      type: 'string',
+      responsive: false,
+    },
+    defaultChecked: {
+      type: ['boolean', "'indeterminate'"],
+      responsive: false,
+    },
+    checked: {
+      type: ['boolean', "'indeterminate'"],
+      responsive: false,
+    },
+    onChange: {
+      type: "(checked: boolean | 'indeterminate') => void",
+      responsive: false,
+    },
+    disabled: {
+      type: 'boolean',
+      responsive: false,
+    },
+    required: {
+      type: 'boolean',
+      responsive: false,
+    },
+    name: {
+      type: 'string',
+      responsive: false,
+    },
+    value: {
+      type: 'string',
+      responsive: false,
+    },
+    className: {
+      type: 'string',
+      responsive: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      responsive: false,
+    },
+  }}
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Checkbox/index.ts b/packages/canon/src/components/Checkbox/index.ts
new file mode 100644
index 0000000000..f6dfbf6beb
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Checkbox } from './Checkbox';
+export type { CheckboxProps } from './types';
diff --git a/packages/canon/src/components/Checkbox/styles.css b/packages/canon/src/components/Checkbox/styles.css
new file mode 100644
index 0000000000..fb7e0d0ab7
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/styles.css
@@ -0,0 +1,39 @@
+.checkbox-label {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  gap: var(--canon-spacing-xs);
+  font-size: var(--canon-font-sizes-xs);
+  font-family: var(--canon-font-regular);
+  color: var(--canon-text-primary);
+
+  & .checkbox {
+    all: unset;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+    box-shadow: inset 0 0 0 1px var(--canon-outline);
+    cursor: pointer;
+    border-radius: 2px;
+
+    &[data-state='unchecked'] {
+      & .checkbox-indicator {
+        display: none;
+      }
+    }
+
+    &[data-state='checked'] {
+      background: var(--canon-accent);
+    }
+  }
+
+  & .checkbox-indicator {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: var(--canon-text-primary-on-accent);
+  }
+}
diff --git a/packages/canon/src/components/Checkbox/types.ts b/packages/canon/src/components/Checkbox/types.ts
new file mode 100644
index 0000000000..0240954afa
--- /dev/null
+++ b/packages/canon/src/components/Checkbox/types.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @public */
+export interface CheckboxProps {
+  label?: string;
+  defaultChecked?: boolean;
+  checked?: boolean;
+  onChange?: (checked: boolean) => void;
+  disabled?: boolean;
+  required?: boolean;
+  className?: string;
+  name?: string;
+  value?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/components/Container/Container.stories.tsx b/packages/canon/src/components/Container/Container.stories.tsx
new file mode 100644
index 0000000000..bedf96ec9e
--- /dev/null
+++ b/packages/canon/src/components/Container/Container.stories.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Box } from '../Box/Box';
+import { argTypesSpacing } from '../../../docs/utils/argTypes';
+import { Container } from './Container';
+
+const argTypesSpacingWithoutLeftAndRight = { ...argTypesSpacing };
+delete argTypesSpacingWithoutLeftAndRight.padding;
+delete argTypesSpacingWithoutLeftAndRight.paddingLeft;
+delete argTypesSpacingWithoutLeftAndRight.paddingRight;
+delete argTypesSpacingWithoutLeftAndRight.paddingX;
+delete argTypesSpacingWithoutLeftAndRight.margin;
+delete argTypesSpacingWithoutLeftAndRight.marginLeft;
+delete argTypesSpacingWithoutLeftAndRight.marginRight;
+delete argTypesSpacingWithoutLeftAndRight.marginX;
+delete argTypesSpacingWithoutLeftAndRight.gap;
+
+const meta = {
+  title: 'Components/Container',
+  component: Container,
+  argTypes: {
+    ...argTypesSpacingWithoutLeftAndRight,
+    children: {
+      control: false,
+    },
+    className: {
+      control: 'text',
+    },
+  },
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof Container>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const FakeBox = () => (
+  <Box
+    borderRadius="small"
+    style={{ background: '#1f47ff', color: 'white', height: '400px' }}
+  />
+);
+
+export const Default: Story = {
+  args: {},
+  render: args => (
+    <Container {...args}>
+      <FakeBox />
+    </Container>
+  ),
+};
diff --git a/packages/canon/src/components/Container/Container.tsx b/packages/canon/src/components/Container/Container.tsx
new file mode 100644
index 0000000000..b27775e116
--- /dev/null
+++ b/packages/canon/src/components/Container/Container.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { forwardRef } from 'react';
+import { containerSprinkles } from './sprinkles.css';
+import { ContainerProps } from './types';
+
+/** @public */
+export const Container = forwardRef<HTMLDivElement, ContainerProps>(
+  (props, ref) => {
+    const { children, className, style, ...restProps } = props;
+
+    const containerClassName = containerSprinkles(restProps);
+
+    return (
+      <div
+        ref={ref}
+        className={['container', containerClassName].filter(Boolean).join(' ')}
+        style={style}
+      >
+        {children}
+      </div>
+    );
+  },
+);
diff --git a/packages/canon/src/components/Container/Docs.mdx b/packages/canon/src/components/Container/Docs.mdx
new file mode 100644
index 0000000000..d4dcf694da
--- /dev/null
+++ b/packages/canon/src/components/Container/Docs.mdx
@@ -0,0 +1,77 @@
+import { Meta, Unstyled, Source } from '@storybook/blocks';
+import * as ContainerStories from './Container.stories';
+import { Title, Text, PropsTable, getProps } from '../../../docs/components';
+import { spacingProperties } from '../../layout/sprinkles.css';
+import { containerProperties } from './sprinkles.css';
+
+<Meta of={ContainerStories} />
+
+<Unstyled>
+
+<Title type="h1">Container</Title>
+
+<Text>
+  The container component let you use our default max-width and center the
+  content on the page.
+</Text>
+
+<Title type="h2">Installation</Title>
+<Source
+  code={`import { Container } from "@backstage/canon";`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h2" style={{ marginBottom: '16px' }}>
+  API reference
+</Title>
+
+<PropsTable
+  data={{
+    ...getProps(containerProperties.styles),
+    children: {
+      type: 'ReactNode',
+      required: false,
+    },
+    className: {
+      type: 'string',
+      required: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      required: false,
+    },
+  }}
+/>
+
+<Title type="h2">Examples</Title>
+
+<Title type="h3">Simple</Title>
+<Text>A simple example of how to use the Container component.</Text>
+
+<Source
+  code={`<Container>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Container>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Responsive padding & margin</Title>
+<Text>
+  The Container component also supports responsive values, making it easy to
+  create responsive designs.
+</Text>
+<Source
+  code={`<Container paddingY={{ xs: 'sm', md: 'md' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Container>`}
+  language="tsx"
+  dark
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Container/index.tsx b/packages/canon/src/components/Container/index.tsx
new file mode 100644
index 0000000000..81614c352d
--- /dev/null
+++ b/packages/canon/src/components/Container/index.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Container } from './Container';
+export type { ContainerProps } from './types';
diff --git a/packages/canon/src/components/Container/sprinkles.css.ts b/packages/canon/src/components/Container/sprinkles.css.ts
new file mode 100644
index 0000000000..989e369433
--- /dev/null
+++ b/packages/canon/src/components/Container/sprinkles.css.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { defineProperties, createSprinkles } from '@vanilla-extract/sprinkles';
+import { breakpoints, space } from '../../layout/properties';
+import { colorProperties, spacingProperties } from '../../layout/sprinkles.css';
+
+export const containerProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  properties: {
+    paddingTop: space,
+    paddingBottom: space,
+    marginTop: space,
+    marginBottom: space,
+  },
+  shorthands: {
+    paddingY: ['paddingTop', 'paddingBottom'],
+    marginY: ['marginTop', 'marginBottom'],
+  },
+});
+
+export const containerSprinkles = createSprinkles(
+  spacingProperties,
+  colorProperties,
+  containerProperties,
+);
diff --git a/packages/canon/src/components/Container/styles.css b/packages/canon/src/components/Container/styles.css
new file mode 100644
index 0000000000..4da813623f
--- /dev/null
+++ b/packages/canon/src/components/Container/styles.css
@@ -0,0 +1,5 @@
+.container {
+  max-width: var(--canon-container-max-width);
+  margin: 0 auto;
+  padding: 0 var(--canon-container-padding);
+}
diff --git a/packages/canon/src/components/Container/types.ts b/packages/canon/src/components/Container/types.ts
new file mode 100644
index 0000000000..b1f414cf30
--- /dev/null
+++ b/packages/canon/src/components/Container/types.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { SpaceProps } from '../../layout/types';
+
+/** @public */
+export interface ContainerProps
+  extends Omit<
+    SpaceProps,
+    | 'padding'
+    | 'paddingLeft'
+    | 'paddingRight'
+    | 'paddingX'
+    | 'margin'
+    | 'marginLeft'
+    | 'marginRight'
+    | 'marginX'
+    | 'gap'
+  > {
+  children?: React.ReactNode;
+  className?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/components/Grid/Docs.mdx b/packages/canon/src/components/Grid/Docs.mdx
new file mode 100644
index 0000000000..7a4ef4de2f
--- /dev/null
+++ b/packages/canon/src/components/Grid/Docs.mdx
@@ -0,0 +1,210 @@
+import { Canvas, Meta, Unstyled, Source } from '@storybook/blocks';
+import * as GridStories from './Grid.stories';
+import { Title, Text, PropsTable, getProps } from '../../../docs/components';
+import { spacingProperties } from '../../layout/sprinkles.css';
+
+<Meta of={GridStories} />
+
+<Unstyled>
+
+<Title type="h1">Grid</Title>
+<Text>
+  A layout component that helps to create simple column-based layouts as well as
+  more complex ones.
+</Text>
+
+<Title type="h2">Installation</Title>
+<Source code={`import { Grid } from "@backstage/canon";`} language="tsx" dark />
+
+<Title type="h2">Anatomy</Title>
+<Text>
+  The grid component is made of two parts: the grid container and the grid item. Import all parts and piece them together.
+</Text>
+<Source
+  code={`import { Grid } from "@backstage/canon/grid";
+
+export default () => (
+  <Grid>
+    <Grid.Item />
+  </Grid>
+);`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h2">API reference</Title>
+
+<Title type="h3">Grid</Title>
+<Text>
+  This is the grid container component. It will help to define the number of
+  columns that will be used in the grid. You can also define the gap between the
+  columns. All values are responsive.
+</Text>
+
+<PropsTable
+  data={{
+    columns: {
+      type: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 'auto'],
+      responsive: true,
+    },
+    gap: {
+      type: ['xs', 'sm', 'md', 'lg', 'xl'],
+      responsive: true,
+    },
+    children: {
+      type: 'ReactNode',
+      required: false,
+    },
+    className: {
+      type: 'string',
+      required: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      required: false,
+    },
+  }}
+/>
+
+<Text style={{ marginTop: '16px' }}>
+  The grid component also accepts all the spacing props from the Box component.
+</Text>
+
+<PropsTable data={getProps(spacingProperties.styles)} />
+
+<Title type="h3">Grid Item</Title>
+<Text>
+  If you need more control over the columns, you can use the grid item
+  component. This will give you access to `rowSpan`, `colSpan`, `start` and
+  `end`. All values are responsive. This component is optional, you can use any
+  elements directly if you prefer.
+</Text>
+
+<PropsTable
+  data={{
+    colSpan: {
+      type: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 'full'],
+      responsive: true,
+    },
+    rowSpan: {
+      type: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 'full'],
+      responsive: true,
+    },
+    start: {
+      type: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 'auto'],
+      responsive: true,
+    },
+    end: {
+      type: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 'auto'],
+      responsive: true,
+    },
+    children: {
+      type: 'ReactNode',
+      required: false,
+    },
+    className: {
+      type: 'string',
+      required: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      required: false,
+    },
+  }}
+/>
+
+<Title type="h2">Examples</Title>
+
+<Title type="h3">Simple grid</Title>
+<Text>This is a simple grid with 3 columns and a gap of md.</Text>
+<Source
+  code={`<Grid columns={3} gap="md">
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Complex grid</Title>
+<Text>
+  You can also use the grid item to create more complex layouts. In this example
+  the first column will span 1 column and the second column will span 2 columns.
+</Text>
+
+<Source
+  code={`<Grid columns={3} gap="md">
+  <Grid.Item colSpan={1}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+  <Grid.Item colSpan={2}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Mixing rows and columns</Title>
+<Text>
+  The grid item component also supports the `rowSpan` prop, which allows you to
+  span multiple rows within the grid layout. In this example, the first item
+  will span 2 rows to achieve a dynamic and flexible grid structure.
+</Text>
+
+<Source
+  code={`<Grid columns={3} gap="md">
+  <Grid.Item colSpan={1} rowSpan={2}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+  <Grid.Item colSpan={2}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+  <Grid.Item colSpan={2}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Responsive</Title>
+<Text>
+  The grid component also supports responsive values. In this example the grid
+  will have 1 column on small screens and 3 on large screens, with a gap of xs
+  on small screens and md on large screens.
+</Text>
+<Source
+  code={`<Grid columns={{ xs: 1, md: 3 }} gap={{ xs: 'xs', md: 'md' }}>
+  <Grid.Item colSpan={{ xs: 1, md: 2 }}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+  <Grid.Item colSpan={{ xs: 1, md: 1 }}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Start and End</Title>
+<Text>
+  The start and end props can be used to position the item in the grid.
+</Text>
+<Source
+  code={`<Grid columns={3} gap="md">
+  <Grid.Item start={2} end={4}>
+    <Box>Hello World</Box>
+  </Grid.Item>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Grid/Grid.stories.tsx b/packages/canon/src/components/Grid/Grid.stories.tsx
new file mode 100644
index 0000000000..bf1bcecfd7
--- /dev/null
+++ b/packages/canon/src/components/Grid/Grid.stories.tsx
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Grid } from './Grid';
+import type { GridItemProps } from './types';
+import { Box } from '../Box/Box';
+import { argTypesSpacing, argTypesColor } from '../../../docs/utils/argTypes';
+import { Stack } from '../Stack';
+
+const meta = {
+  title: 'Components/Grid',
+  component: Grid,
+  argTypes: {
+    ...argTypesSpacing,
+    ...argTypesColor,
+    children: {
+      control: false,
+    },
+    className: {
+      control: 'text',
+    },
+  },
+  args: {
+    gap: 'xs',
+  },
+} satisfies Meta<typeof Grid>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const FakeBox = () => (
+  <Box
+    borderRadius="small"
+    style={{ background: '#1f47ff', color: 'white', height: '64px' }}
+  />
+);
+
+export const Default: Story = {
+  args: {},
+  render: args => (
+    <Grid {...args}>
+      <FakeBox />
+      <FakeBox />
+      <FakeBox />
+    </Grid>
+  ),
+};
+
+export const LargeGap: Story = {
+  args: {
+    gap: 'lg',
+  },
+  render: args => (
+    <Grid {...args}>
+      <FakeBox />
+      <FakeBox />
+      <FakeBox />
+    </Grid>
+  ),
+};
+
+export const ColumnSizes: Story = {
+  args: {
+    columns: 12,
+    gap: 'md',
+  },
+  render: args => (
+    <Stack gap="md">
+      {Array.from({ length: 11 }, (_, i) => (
+        <Grid {...args} key={i}>
+          <Grid.Item colSpan={(i + 1) as GridItemProps['colSpan']}>
+            <FakeBox />
+          </Grid.Item>
+          <Grid.Item colSpan={(11 - i) as GridItemProps['colSpan']}>
+            <FakeBox />
+          </Grid.Item>
+        </Grid>
+      ))}
+    </Stack>
+  ),
+};
+
+export const RowAndColumns: Story = {
+  args: {
+    columns: 12,
+    gap: 'md',
+  },
+  render: args => (
+    <Stack gap="md">
+      <Grid {...args} columns={3}>
+        <Grid.Item colSpan={1} rowSpan={2}>
+          <Box
+            borderRadius="small"
+            style={{ background: '#1f47ff', color: 'white', height: '100%' }}
+          />
+        </Grid.Item>
+        <Grid.Item colSpan={2}>
+          <FakeBox />
+        </Grid.Item>
+        <Grid.Item colSpan={2}>
+          <FakeBox />
+        </Grid.Item>
+      </Grid>
+    </Stack>
+  ),
+};
diff --git a/packages/canon/src/components/Grid/Grid.tsx b/packages/canon/src/components/Grid/Grid.tsx
new file mode 100644
index 0000000000..2b61d1d3d4
--- /dev/null
+++ b/packages/canon/src/components/Grid/Grid.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createElement, forwardRef } from 'react';
+import { GridItemProps, GridProps } from './types';
+import { gridItemSprinkles, gridSprinkles } from './sprinkles.css';
+
+const GridBase = forwardRef<HTMLDivElement, GridProps>((props, ref) => {
+  const {
+    children,
+    columns,
+    gap = 'xs',
+    className,
+    style,
+    ...restProps
+  } = props;
+
+  const sprinklesClassName = gridSprinkles({
+    ...restProps,
+    gap,
+    gridTemplateColumns: columns ? columns : 'auto',
+  });
+
+  const classNames = ['grid', sprinklesClassName, className]
+    .filter(Boolean)
+    .join(' ');
+
+  return createElement(
+    'div',
+    {
+      ref,
+      className: classNames,
+      style,
+    },
+    children,
+  );
+});
+
+const GridItem = forwardRef<HTMLDivElement, GridItemProps>((props, ref) => {
+  const { children, rowSpan, colSpan, start, end, className, style } = props;
+
+  const sprinklesClassName = gridItemSprinkles({
+    rowSpan,
+    colSpan,
+    start,
+    end,
+  });
+
+  const classNames = ['grid-item', sprinklesClassName, className]
+    .filter(Boolean)
+    .join(' ');
+
+  return createElement(
+    'div',
+    {
+      ref,
+      className: classNames,
+      style,
+    },
+    children,
+  );
+});
+
+/** @public */
+export const Grid = Object.assign(GridBase, { Item: GridItem });
diff --git a/packages/canon/src/components/Grid/index.ts b/packages/canon/src/components/Grid/index.ts
new file mode 100644
index 0000000000..b07249241c
--- /dev/null
+++ b/packages/canon/src/components/Grid/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Grid } from './Grid';
+export type { GridProps, GridItemProps, Columns } from './types';
diff --git a/packages/canon/src/components/Grid/sprinkles.css.ts b/packages/canon/src/components/Grid/sprinkles.css.ts
new file mode 100644
index 0000000000..aff5a340ed
--- /dev/null
+++ b/packages/canon/src/components/Grid/sprinkles.css.ts
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { defineProperties, createSprinkles } from '@vanilla-extract/sprinkles';
+import { breakpoints } from '../../layout/properties';
+import { colorProperties, spacingProperties } from '../../layout/sprinkles.css';
+
+const gridProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  properties: {
+    gridTemplateColumns: {
+      1: 'repeat(1, minmax(0, 1fr))',
+      2: 'repeat(2, minmax(0, 1fr))',
+      3: 'repeat(3, minmax(0, 1fr))',
+      4: 'repeat(4, minmax(0, 1fr))',
+      5: 'repeat(5, minmax(0, 1fr))',
+      6: 'repeat(6, minmax(0, 1fr))',
+      7: 'repeat(7, minmax(0, 1fr))',
+      8: 'repeat(8, minmax(0, 1fr))',
+      9: 'repeat(9, minmax(0, 1fr))',
+      10: 'repeat(10, minmax(0, 1fr))',
+      11: 'repeat(11, minmax(0, 1fr))',
+      12: 'repeat(12, minmax(0, 1fr))',
+      auto: 'repeat(auto-fit, minmax(0, 1fr))',
+    },
+  },
+  shorthands: {
+    columns: ['gridTemplateColumns'],
+  },
+});
+
+export const gridSprinkles = createSprinkles(
+  spacingProperties,
+  colorProperties,
+  gridProperties,
+);
+
+const gridItemProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  properties: {
+    gridColumn: {
+      1: 'span 1 / span 1',
+      2: 'span 2 / span 2',
+      3: 'span 3 / span 3',
+      4: 'span 4 / span 4',
+      5: 'span 5 / span 5',
+      6: 'span 6 / span 6',
+      7: 'span 7 / span 7',
+      8: 'span 8 / span 8',
+      9: 'span 9 / span 9',
+      10: 'span 10 / span 10',
+      11: 'span 11 / span 11',
+      12: 'span 12 / span 12',
+      full: '1 / -1',
+    },
+    gridRow: {
+      1: 'span 1 / span 1',
+      2: 'span 2 / span 2',
+      3: 'span 3 / span 3',
+      4: 'span 4 / span 4',
+      5: 'span 5 / span 5',
+      6: 'span 6 / span 6',
+      7: 'span 7 / span 7',
+      8: 'span 8 / span 8',
+      9: 'span 9 / span 9',
+      10: 'span 10 / span 10',
+      11: 'span 11 / span 11',
+      12: 'span 12 / span 12',
+      full: '1 / -1',
+    },
+    gridColumnStart: {
+      1: '1',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5',
+      6: '6',
+      7: '7',
+      8: '8',
+      9: '9',
+      10: '10',
+      11: '11',
+      12: '12',
+      13: '13',
+      auto: 'auto',
+    },
+    gridColumnEnd: {
+      1: '1',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5',
+      6: '6',
+      7: '7',
+      8: '8',
+      9: '9',
+      10: '10',
+      11: '11',
+      12: '12',
+      13: '13',
+      auto: 'auto',
+    },
+  },
+  shorthands: {
+    colSpan: ['gridColumn'],
+    rowSpan: ['gridRow'],
+    start: ['gridColumnStart'],
+    end: ['gridColumnEnd'],
+  },
+});
+
+export const gridItemSprinkles = createSprinkles(
+  colorProperties,
+  gridItemProperties,
+);
diff --git a/packages/canon/src/components/Grid/styles.css b/packages/canon/src/components/Grid/styles.css
new file mode 100644
index 0000000000..81f8d5471d
--- /dev/null
+++ b/packages/canon/src/components/Grid/styles.css
@@ -0,0 +1,3 @@
+.grid {
+  display: grid;
+}
diff --git a/packages/canon/src/components/Grid/types.ts b/packages/canon/src/components/Grid/types.ts
new file mode 100644
index 0000000000..87edbd75bf
--- /dev/null
+++ b/packages/canon/src/components/Grid/types.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Breakpoint, ColorProps } from '../../layout/types';
+import { SpaceProps } from '../../layout/types';
+
+/** @public */
+export type Columns = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+
+/** @public */
+export interface GridProps extends SpaceProps, ColorProps {
+  children?: React.ReactNode;
+  columns?: Columns | Partial<Record<Breakpoint, Columns>>;
+  className?: string;
+  style?: React.CSSProperties;
+}
+
+/** @public */
+export interface GridItemProps {
+  children: React.ReactNode;
+  rowSpan?: Columns | 'full';
+  colSpan?: Columns | 'full';
+  start?: Columns | 'auto';
+  end?: Columns | 'auto';
+  className?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/components/Icon/Icon.stories.tsx b/packages/canon/src/components/Icon/Icon.stories.tsx
new file mode 100644
index 0000000000..61e837c5ed
--- /dev/null
+++ b/packages/canon/src/components/Icon/Icon.stories.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { Icon } from './Icon';
+import { ThemeProvider } from '../../theme/context';
+import { defaultIcons } from './icons';
+
+const meta = {
+  title: 'Components/Icon',
+  component: Icon,
+  parameters: {
+    layout: 'centered',
+  },
+  argTypes: {
+    name: {
+      control: 'select',
+      options: Object.keys(defaultIcons),
+    },
+  },
+  args: {
+    name: 'heart',
+  },
+} satisfies Meta<typeof Icon>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Primary: Story = {
+  args: {
+    name: 'heart',
+  },
+};
+
+export const WithCustomIcon: Story = {
+  args: {
+    name: 'arrowDown',
+  },
+  decorators: [
+    Story => (
+      <ThemeProvider overrides={{ arrowDown: () => <div>Custom Icon</div> }}>
+        <Story />
+      </ThemeProvider>
+    ),
+  ],
+};
diff --git a/packages/canon/src/components/Icon/Icon.tsx b/packages/canon/src/components/Icon/Icon.tsx
new file mode 100644
index 0000000000..587e3c0a23
--- /dev/null
+++ b/packages/canon/src/components/Icon/Icon.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { useTheme } from '../../theme/context';
+import type { IconNames } from './types';
+
+/** @public */
+export const Icon = (props: { name: IconNames; size?: number }) => {
+  const { name, size = 16 } = props;
+  const { icons } = useTheme();
+
+  const RemixIcon = icons[name] as React.ComponentType<{ className?: string }>;
+
+  if (!RemixIcon) {
+    console.error(`Icon "${name}" not found or is not a valid component.`);
+    return <svg />; // Return a default icon or handle the error appropriately
+  }
+
+  return <RemixIcon className={`icon-${size}`} />;
+};
diff --git a/packages/canon/src/components/Icon/icons.ts b/packages/canon/src/components/Icon/icons.ts
new file mode 100644
index 0000000000..ff5cd9a507
--- /dev/null
+++ b/packages/canon/src/components/Icon/icons.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// We can add custom icons to the list outside of Remix
+
+import type { IconMap } from './types';
+import {
+  RiHeartFill,
+  RiArrowDownFill,
+  RiCloudFill,
+  RiArrowLeftFill,
+  RiArrowRightFill,
+  RiArrowUpFill,
+  RiDeleteBin6Line,
+  RiAddLine,
+  RiArrowDownSLine,
+  RiArrowUpSLine,
+  RiArrowLeftSLine,
+  RiArrowRightSLine,
+  RiArrowDownCircleLine,
+  RiArrowLeftCircleLine,
+  RiArrowRightCircleLine,
+  RiArrowUpCircleLine,
+  RiCheckLine,
+} from '@remixicon/react';
+
+// List of default icons
+export const defaultIcons: IconMap = {
+  arrowDown: RiArrowDownFill,
+  arrowLeft: RiArrowLeftFill,
+  arrowRight: RiArrowRightFill,
+  arrowUp: RiArrowUpFill,
+  arrowDownCircle: RiArrowDownCircleLine,
+  arrowLeftCircle: RiArrowLeftCircleLine,
+  arrowRightCircle: RiArrowRightCircleLine,
+  arrowUpCircle: RiArrowUpCircleLine,
+  check: RiCheckLine,
+  chevronDown: RiArrowDownSLine,
+  chevronUp: RiArrowUpSLine,
+  chevronLeft: RiArrowLeftSLine,
+  chevronRight: RiArrowRightSLine,
+  cloud: RiCloudFill,
+  heart: RiHeartFill,
+  plus: RiAddLine,
+  trash: RiDeleteBin6Line,
+};
diff --git a/packages/canon/src/components/Icon/index.tsx b/packages/canon/src/components/Icon/index.tsx
new file mode 100644
index 0000000000..3e7564c77e
--- /dev/null
+++ b/packages/canon/src/components/Icon/index.tsx
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './Icon';
+export type * from './types';
diff --git a/packages/cli-node/src/paths.ts b/packages/canon/src/components/Icon/styles.css
similarity index 75%
rename from packages/cli-node/src/paths.ts
rename to packages/canon/src/components/Icon/styles.css
index 2c658c27b3..234105ed4e 100644
--- a/packages/cli-node/src/paths.ts
+++ b/packages/canon/src/components/Icon/styles.css
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,17 @@
  * limitations under the License.
  */
 
-import { findPaths } from '@backstage/cli-common';
+.icon-12 {
+  width: 12px;
+  height: 12px;
+}
 
-/* eslint-disable-next-line no-restricted-syntax */
-export const paths = findPaths(__dirname);
+.icon-16 {
+  width: 16px;
+  height: 16px;
+}
+
+.icon-24 {
+  width: 24px;
+  height: 24px;
+}
diff --git a/packages/canon/src/components/Icon/types.ts b/packages/canon/src/components/Icon/types.ts
new file mode 100644
index 0000000000..bac853257b
--- /dev/null
+++ b/packages/canon/src/components/Icon/types.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @public */
+export type IconNames =
+  | 'arrowDown'
+  | 'arrowLeft'
+  | 'arrowRight'
+  | 'arrowUp'
+  | 'arrowDownCircle'
+  | 'arrowLeftCircle'
+  | 'arrowRightCircle'
+  | 'arrowUpCircle'
+  | 'check'
+  | 'chevronDown'
+  | 'chevronLeft'
+  | 'chevronRight'
+  | 'chevronUp'
+  | 'cloud'
+  | 'heart'
+  | 'plus'
+  | 'trash';
+
+/** @public */
+export type IconMap = Partial<Record<IconNames, React.ComponentType>>;
diff --git a/packages/canon/src/components/Inline/Docs.mdx b/packages/canon/src/components/Inline/Docs.mdx
new file mode 100644
index 0000000000..9850dedf7a
--- /dev/null
+++ b/packages/canon/src/components/Inline/Docs.mdx
@@ -0,0 +1,121 @@
+import { Meta, Unstyled, Source } from '@storybook/blocks';
+import * as InlineStories from './Inline.stories';
+import { Title, Text, PropsTable, getProps } from '../../../docs/components';
+import { spacingProperties } from '../../layout/sprinkles.css';
+import { inlineProperties } from './sprinkles.css';
+
+<Meta of={InlineStories} />
+
+<Unstyled>
+
+<Title type="h1">Inline</Title>
+
+<Text>
+  The Inline component is used to create a horizontal layout of elements. By
+  default it uses flex and flexWrap to make sure that your content always flows
+  responsively.
+</Text>
+
+<Title type="h2">Installation</Title>
+<Source
+  code={`import { Inline } from "@backstage/canon";`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h2" style={{ marginBottom: '16px' }}>
+  API reference
+</Title>
+
+<PropsTable
+  data={{
+    align: {
+      type: 'left | center | right',
+      responsive: true,
+    },
+    alignY: {
+      type: 'top | center | bottom',
+      responsive: true,
+    },
+    children: {
+      type: 'ReactNode',
+      responsive: false,
+    },
+    className: {
+      type: 'string',
+      responsive: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      responsive: false,
+    },
+  }}
+/>
+
+<Text style={{ marginTop: '16px' }}>
+  The grid component also accepts all the spacing props from the Box component.
+</Text>
+
+<PropsTable data={getProps(spacingProperties.styles)} />
+
+<Title type="h2">Examples</Title>
+
+<Title type="h3">Simple</Title>
+<Text>A simple example of how to use the Inline component.</Text>
+
+<Source
+  code={`<Inline>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Inline>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Responsive</Title>
+<Text>
+  The Inline component also supports responsive values, making it easy to create
+  responsive designs.
+</Text>
+<Source
+  code={`<Inline gap={{ xs: 'sm', md: 'md' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Inline>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Align</Title>
+<Text>
+  The Inline component also supports responsive alignment, making it easy to
+  create responsive designs.
+</Text>
+<Source
+  code={`<Inline align={{ xs: 'left', md: 'center' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Inline>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Align vertically</Title>
+<Text>
+  The Inline component also supports responsive vertical alignment, making it
+  easy to create responsive designs.
+</Text>
+<Source
+  code={`<Inline alignY={{ xs: 'top', md: 'center' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Inline>`}
+  language="tsx"
+  dark
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Inline/Inline.stories.tsx b/packages/canon/src/components/Inline/Inline.stories.tsx
new file mode 100644
index 0000000000..613fd68c68
--- /dev/null
+++ b/packages/canon/src/components/Inline/Inline.stories.tsx
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Inline } from './Inline';
+import { Box } from '../Box/Box';
+import { argTypesSpacing, argTypesColor } from '../../../docs/utils/argTypes';
+
+const meta = {
+  title: 'Components/Inline',
+  component: Inline,
+  argTypes: {
+    ...argTypesSpacing,
+    ...argTypesColor,
+    align: {
+      control: 'inline-radio',
+      options: ['left', 'center', 'right'],
+    },
+    alignY: {
+      control: 'inline-radio',
+      options: ['top', 'center', 'bottom'],
+    },
+    children: {
+      control: false,
+    },
+    as: {
+      control: false,
+    },
+    className: {
+      control: 'text',
+    },
+  },
+} satisfies Meta<typeof Inline>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const FakeBox = ({
+  width = 120,
+  height = 80,
+}: {
+  width?: number;
+  height?: number;
+}) => (
+  <Box
+    borderRadius="small"
+    style={{ background: '#1f47ff', color: 'white', width, height }}
+  />
+);
+
+export const Default: Story = {
+  args: {
+    children: (
+      <>
+        {Array.from({ length: 32 }).map((_, index) => (
+          <FakeBox
+            key={index}
+            width={Math.floor(Math.random() * (160 - 40 + 1)) + 40}
+            height={Math.floor(Math.random() * (80 - 40 + 1)) + 40}
+          />
+        ))}
+      </>
+    ),
+  },
+};
+
+export const AlignLeft: Story = {
+  args: {
+    ...Default.args,
+    align: 'left',
+  },
+};
+
+export const AlignCenter: Story = {
+  args: {
+    ...Default.args,
+    align: 'center',
+  },
+};
+
+export const AlignRight: Story = {
+  args: {
+    ...Default.args,
+    align: 'right',
+  },
+};
+
+export const VerticalAlignTop: Story = {
+  args: {
+    ...Default.args,
+    alignY: 'top',
+  },
+};
+
+export const VerticalAlignCenter: Story = {
+  args: {
+    ...Default.args,
+    alignY: 'center',
+  },
+};
+
+export const VerticalAlignBottom: Story = {
+  args: {
+    ...Default.args,
+    alignY: 'bottom',
+  },
+};
+
+export const LargeGap: Story = {
+  args: {
+    ...Default.args,
+    gap: 'xl',
+  },
+};
diff --git a/packages/canon/src/components/Inline/Inline.tsx b/packages/canon/src/components/Inline/Inline.tsx
new file mode 100644
index 0000000000..b583b2ae08
--- /dev/null
+++ b/packages/canon/src/components/Inline/Inline.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createElement, forwardRef } from 'react';
+import { inlineSprinkles } from './sprinkles.css';
+import type { InlineProps } from './types';
+
+const alignYToFlexAlign = (alignY: InlineProps['alignY']) => {
+  if (alignY === 'top') return 'flex-start';
+  if (alignY === 'center') return 'center';
+  if (alignY === 'bottom') return 'flex-end';
+  return undefined;
+};
+
+const alignToFlexAlignY = (align: InlineProps['align']) => {
+  if (align === 'left') return 'flex-start';
+  if (align === 'center') return 'center';
+  if (align === 'right') return 'flex-end';
+  return undefined;
+};
+
+/** @public */
+export const Inline = forwardRef<HTMLElement, InlineProps>((props, ref) => {
+  const {
+    as = 'div',
+    children,
+    align = 'left',
+    alignY = 'top',
+    gap = 'xs',
+    className,
+    style,
+    ...restProps
+  } = props;
+
+  // Generate the list of class names
+  const sprinklesClassName = inlineSprinkles({
+    ...restProps,
+    gap,
+    alignItems: alignYToFlexAlign(alignY),
+    justifyContent: alignToFlexAlignY(align),
+  });
+
+  // Combine the base class name, the sprinkles class name, and any additional class names
+  const classNames = ['inline', sprinklesClassName, className]
+    .filter(Boolean)
+    .join(' ');
+
+  return createElement(as, {
+    ref,
+    className: classNames,
+    style,
+    children,
+  });
+});
diff --git a/packages/canon/src/components/Inline/index.ts b/packages/canon/src/components/Inline/index.ts
new file mode 100644
index 0000000000..2cc100c02a
--- /dev/null
+++ b/packages/canon/src/components/Inline/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Inline } from './Inline';
+export type { InlineProps } from './types';
diff --git a/packages/canon/src/components/Inline/sprinkles.css.ts b/packages/canon/src/components/Inline/sprinkles.css.ts
new file mode 100644
index 0000000000..ccd4126608
--- /dev/null
+++ b/packages/canon/src/components/Inline/sprinkles.css.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { defineProperties, createSprinkles } from '@vanilla-extract/sprinkles';
+import { breakpoints } from '../../layout/properties';
+import { colorProperties, spacingProperties } from '../../layout/sprinkles.css';
+
+export const inlineProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  properties: {
+    alignItems: ['flex-start', 'center', 'flex-end'],
+    justifyContent: ['flex-start', 'center', 'flex-end'],
+  },
+});
+
+export const inlineSprinkles = createSprinkles(
+  spacingProperties,
+  colorProperties,
+  inlineProperties,
+);
diff --git a/packages/canon/src/components/Inline/styles.css b/packages/canon/src/components/Inline/styles.css
new file mode 100644
index 0000000000..fb9b1c3825
--- /dev/null
+++ b/packages/canon/src/components/Inline/styles.css
@@ -0,0 +1,4 @@
+.inline {
+  display: flex;
+  flex-wrap: wrap;
+}
diff --git a/packages/canon/src/components/Inline/types.ts b/packages/canon/src/components/Inline/types.ts
new file mode 100644
index 0000000000..3d981d0d31
--- /dev/null
+++ b/packages/canon/src/components/Inline/types.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { AsProps, Breakpoint, ColorProps } from '../../layout/types';
+import { SpaceProps } from '../../layout/types';
+
+/** @public */
+export interface InlineProps extends SpaceProps, ColorProps {
+  children: React.ReactNode;
+  as?: AsProps;
+  align?:
+    | 'left'
+    | 'center'
+    | 'right'
+    | Partial<Record<Breakpoint, 'left' | 'center' | 'right'>>;
+  alignY?:
+    | 'top'
+    | 'center'
+    | 'bottom'
+    | Partial<Record<Breakpoint, 'top' | 'center' | 'bottom'>>;
+  className?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/components/Stack/Docs.mdx b/packages/canon/src/components/Stack/Docs.mdx
new file mode 100644
index 0000000000..d5bdb0fc82
--- /dev/null
+++ b/packages/canon/src/components/Stack/Docs.mdx
@@ -0,0 +1,122 @@
+import { Meta, Unstyled, Source } from '@storybook/blocks';
+import * as StackStories from './Stack.stories';
+import { Title, Text, PropsTable, getProps } from '../../../docs/components';
+import { spacingProperties } from '../../layout/sprinkles.css';
+
+<Meta of={StackStories} />
+
+<Unstyled>
+
+<Title type="h1">Stack</Title>
+
+<Text>
+  This is the stack container component. It will help to define the number of
+  columns that will be used in the grid. You can also define the gap between the
+  columns. All values are responsive.
+</Text>
+
+<Title type="h2">Installation</Title>
+<Source
+  code={`import { Stack } from "@backstage/canon";`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h2" style={{ marginBottom: '16px' }}>
+  API reference
+</Title>
+
+<PropsTable
+  data={{
+    align: {
+      type: ['left', 'center', 'right'],
+      responsive: true,
+    },
+    children: {
+      type: 'ReactNode',
+      required: false,
+    },
+    className: {
+      type: 'string',
+      required: false,
+    },
+    style: {
+      type: 'CSSProperties',
+      required: false,
+    },
+  }}
+/>
+
+<Text style={{ marginTop: '16px' }}>
+  The grid component also accepts all the spacing props from the Box component.
+</Text>
+
+<PropsTable data={getProps(spacingProperties.styles)} />
+
+<Title type="h2">Common questions</Title>
+
+<Title type="h3">Can I stack horizontally?</Title>
+<Text>
+  The Stack component only allows for stacking elements vertically. If you want
+  to create a column layout, please use the Grid component.
+</Text>
+
+<Source
+  code={`<Grid columns={3} gap="md">
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Grid>
+`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h2">Examples</Title>
+
+<Title type="h3">Simple</Title>
+<Text>
+  A simple example of how to use the Stack component with a medium gap.
+</Text>
+
+<Source
+  code={`<Stack gap="md">
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Stack>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Responsive</Title>
+<Text>
+  The Stack component also supports responsive values, making it easy to create
+  responsive designs.
+</Text>
+<Source
+  code={`<Stack gap={{ xs: 'sm', md: 'md' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Stack>`}
+  language="tsx"
+  dark
+/>
+
+<Title type="h3">Align</Title>
+<Text>
+  The Stack component also supports responsive alignment, making it easy to
+  create responsive designs.
+</Text>
+<Source
+  code={`<Stack align={{ xs: 'left', md: 'center' }}>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+  <Box>Hello World</Box>
+</Stack>`}
+  language="tsx"
+  dark
+/>
+
+</Unstyled>
diff --git a/packages/canon/src/components/Stack/Stack.stories.tsx b/packages/canon/src/components/Stack/Stack.stories.tsx
new file mode 100644
index 0000000000..331c2ee1e1
--- /dev/null
+++ b/packages/canon/src/components/Stack/Stack.stories.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { Stack } from './Stack';
+import { Box } from '../Box/Box';
+import { argTypesSpacing, argTypesColor } from '../../../docs/utils/argTypes';
+
+const meta = {
+  title: 'Components/Stack',
+  component: Stack,
+  argTypes: {
+    ...argTypesSpacing,
+    ...argTypesColor,
+    align: {
+      control: 'inline-radio',
+      options: ['left', 'center', 'right'],
+    },
+    children: {
+      control: false,
+    },
+    as: {
+      control: false,
+    },
+    className: {
+      control: 'text',
+    },
+  },
+  args: {
+    align: 'left',
+    gap: 'xs',
+  },
+} satisfies Meta<typeof Stack>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+const FakeBox = () => (
+  <Box
+    paddingX="xl"
+    paddingY="md"
+    borderRadius="small"
+    style={{ background: '#1f47ff', color: 'white' }}
+  >
+    Fake Box
+  </Box>
+);
+
+export const Default: Story = {
+  args: {
+    children: (
+      <>
+        <FakeBox />
+        <FakeBox />
+        <FakeBox />
+      </>
+    ),
+  },
+};
+
+export const AlignLeft: Story = {
+  args: {
+    ...Default.args,
+    align: 'left',
+  },
+};
+
+export const AlignCenter: Story = {
+  args: {
+    ...Default.args,
+    align: 'center',
+  },
+};
+
+export const AlignRight: Story = {
+  args: {
+    ...Default.args,
+    align: 'right',
+  },
+};
+
+export const ResponsiveAlign: Story = {
+  args: {
+    ...Default.args,
+    align: {
+      xs: 'left',
+      md: 'center',
+      lg: 'right',
+    },
+  },
+};
+
+export const ResponsiveGap: Story = {
+  args: {
+    ...Default.args,
+    gap: {
+      xs: 'xs',
+      md: 'md',
+      lg: '2xl',
+    },
+  },
+};
+
+export const LargeGap: Story = {
+  args: {
+    ...Default.args,
+    gap: 'xl',
+  },
+};
diff --git a/packages/canon/src/components/Stack/Stack.tsx b/packages/canon/src/components/Stack/Stack.tsx
new file mode 100644
index 0000000000..e0c36f2043
--- /dev/null
+++ b/packages/canon/src/components/Stack/Stack.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createElement, forwardRef } from 'react';
+import { StackProps } from './types';
+import { stackSprinkles } from './sprinkles.css';
+
+const alignToFlexAlign = (align: StackProps['align']) => {
+  if (align === 'left') return 'stretch';
+  if (align === 'center') return 'center';
+  if (align === 'right') return 'flex-end';
+  return undefined;
+};
+
+/** @public */
+export const Stack = forwardRef<HTMLDivElement, StackProps>((props, ref) => {
+  const {
+    as = 'div',
+    children,
+    align = 'left',
+    gap = 'xs',
+    className,
+    style,
+    ...restProps
+  } = props;
+
+  // Transform the align prop
+  const flexAlign = alignToFlexAlign(align);
+
+  // Generate the list of class names
+  const sprinklesClassName = stackSprinkles({
+    ...restProps,
+    gap,
+    alignItems: flexAlign,
+  });
+
+  // Combine the base class name, the sprinkles class name, and any additional class names
+  const classNames = ['stack', sprinklesClassName, className]
+    .filter(Boolean)
+    .join(' ');
+
+  return createElement(as, {
+    ref,
+    className: classNames,
+    style,
+    children,
+  });
+});
diff --git a/packages/canon/src/components/Stack/index.ts b/packages/canon/src/components/Stack/index.ts
new file mode 100644
index 0000000000..7abbc3f439
--- /dev/null
+++ b/packages/canon/src/components/Stack/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { Stack } from './Stack';
+export type { StackProps } from './types';
diff --git a/packages/canon/src/components/Stack/sprinkles.css.ts b/packages/canon/src/components/Stack/sprinkles.css.ts
new file mode 100644
index 0000000000..85c8f83a71
--- /dev/null
+++ b/packages/canon/src/components/Stack/sprinkles.css.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { defineProperties, createSprinkles } from '@vanilla-extract/sprinkles';
+import { breakpoints } from '../../layout/properties';
+import { colorProperties, spacingProperties } from '../../layout/sprinkles.css';
+
+const stackProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  properties: {
+    alignItems: ['stretch', 'flex-start', 'center', 'flex-end'],
+  },
+});
+
+export const stackSprinkles = createSprinkles(
+  spacingProperties,
+  colorProperties,
+  stackProperties,
+);
diff --git a/packages/canon/src/components/Stack/styles.css b/packages/canon/src/components/Stack/styles.css
new file mode 100644
index 0000000000..784fd3b1ab
--- /dev/null
+++ b/packages/canon/src/components/Stack/styles.css
@@ -0,0 +1,4 @@
+.stack {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/packages/canon/src/components/Stack/types.ts b/packages/canon/src/components/Stack/types.ts
new file mode 100644
index 0000000000..529e92d1bd
--- /dev/null
+++ b/packages/canon/src/components/Stack/types.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AsProps, Breakpoint, ColorProps } from '../../layout/types';
+import { SpaceProps } from '../../layout/types';
+
+/** @public */
+export interface StackProps extends SpaceProps, ColorProps {
+  children: React.ReactNode;
+  as?: AsProps;
+  align?:
+    | 'left'
+    | 'center'
+    | 'right'
+    | Partial<Record<Breakpoint, 'left' | 'center' | 'right'>>;
+  className?: string;
+  style?: React.CSSProperties;
+}
diff --git a/packages/canon/src/index.ts b/packages/canon/src/index.ts
new file mode 100644
index 0000000000..5d0ebb5a2e
--- /dev/null
+++ b/packages/canon/src/index.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Components used by Backstage plugins and apps
+ *
+ * @packageDocumentation
+ */
+
+// Layout types
+export * from './layout/types';
+
+// Layout components
+export * from './components/Box';
+export * from './components/Grid';
+export * from './components/Stack';
+export * from './components/Inline';
+export * from './components/Container';
+
+// UI components
+export * from './components/Button';
+export * from './components/Icon';
+export * from './components/Checkbox';
diff --git a/packages/canon/src/layout/properties.ts b/packages/canon/src/layout/properties.ts
new file mode 100644
index 0000000000..d41bbddbeb
--- /dev/null
+++ b/packages/canon/src/layout/properties.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @public */
+export const breakpoints = {
+  xs: {},
+  sm: { '@media': 'screen and (min-width: 640px)' },
+  md: { '@media': 'screen and (min-width: 768px)' },
+  lg: { '@media': 'screen and (min-width: 1024px)' },
+  xl: { '@media': 'screen and (min-width: 1280px)' },
+  '2xl': { '@media': 'screen and (min-width: 1536px)' },
+};
+
+/** @public */
+export const themes = {
+  light: { selector: '[data-theme="light"] &' },
+  dark: { selector: '[data-theme="dark"] &' },
+};
+
+/** @public */
+export const space = {
+  none: 0,
+  '2xs': 'var(--canon-spacing-2xs)',
+  xs: 'var(--canon-spacing-xs)',
+  sm: 'var(--canon-spacing-sm)',
+  md: 'var(--canon-spacing-md)',
+  lg: 'var(--canon-spacing-lg)',
+  xl: 'var(--canon-spacing-xl)',
+  '2xl': 'var(--canon-spacing-2xl)',
+};
diff --git a/packages/canon/src/layout/sprinkles.css.ts b/packages/canon/src/layout/sprinkles.css.ts
new file mode 100644
index 0000000000..7e85487fe3
--- /dev/null
+++ b/packages/canon/src/layout/sprinkles.css.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { defineProperties } from '@vanilla-extract/sprinkles';
+import { breakpoints, space } from './properties';
+
+export const spacingProperties = defineProperties({
+  conditions: breakpoints,
+  defaultCondition: 'xs',
+  responsiveArray: ['xs', 'sm', 'md', 'lg', 'xl', '2xl'],
+  properties: {
+    paddingTop: space,
+    paddingBottom: space,
+    paddingLeft: space,
+    paddingRight: space,
+    marginTop: space,
+    marginBottom: space,
+    marginLeft: space,
+    marginRight: space,
+    gap: space,
+  },
+  shorthands: {
+    padding: ['paddingTop', 'paddingBottom', 'paddingLeft', 'paddingRight'],
+    paddingX: ['paddingLeft', 'paddingRight'],
+    paddingY: ['paddingTop', 'paddingBottom'],
+    margin: ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'],
+    marginX: ['marginLeft', 'marginRight'],
+    marginY: ['marginTop', 'marginBottom'],
+  },
+});
+
+export const colorProperties = defineProperties({
+  conditions: {
+    light: { selector: '[data-theme="light"] &' },
+    dark: { selector: '[data-theme="dark"] &' },
+  },
+  defaultCondition: ['light', 'dark'],
+  properties: {
+    color: {
+      primary: 'var(--canon-text-primary)',
+      secondary: 'var(--canon-text-secondary)',
+      error: 'var(--canon-error)',
+    },
+    background: {
+      background: 'var(--canon-background)',
+      elevation1: 'var(--canon-surface-1)',
+      elevation2: 'var(--canon-surface-2)',
+      transparent: 'transparent',
+    },
+  },
+});
diff --git a/packages/canon/src/layout/types.ts b/packages/canon/src/layout/types.ts
new file mode 100644
index 0000000000..c051dacb44
--- /dev/null
+++ b/packages/canon/src/layout/types.ts
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { breakpoints, space, themes } from './properties';
+
+/** @public */
+export type Breakpoint = keyof typeof breakpoints;
+
+/** @public */
+export type Space = keyof typeof space;
+
+/** @public */
+export type Theme = keyof typeof themes;
+
+/** @public */
+export type Gap = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingLeft = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingRight = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingTop = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingBottom = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type Padding = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingX = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type PaddingY = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginLeft = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginRight = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginTop = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginBottom = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type Margin = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginX = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export type MarginY = Space | Partial<Record<Breakpoint, Space>>;
+
+/** @public */
+export interface SpaceProps {
+  gap?: Gap;
+  padding?: Padding;
+  paddingLeft?: PaddingLeft;
+  paddingRight?: PaddingRight;
+  paddingTop?: PaddingTop;
+  paddingBottom?: PaddingBottom;
+  paddingX?: PaddingX;
+  paddingY?: PaddingY;
+  margin?: Margin;
+  marginLeft?: MarginLeft;
+  marginRight?: MarginRight;
+  marginTop?: MarginTop;
+  marginBottom?: MarginBottom;
+  marginX?: MarginX;
+  marginY?: MarginY;
+}
+
+/** @public */
+export type Background =
+  | 'background'
+  | 'elevation1'
+  | 'elevation2'
+  | 'transparent'
+  | Partial<
+      Record<Theme, 'background' | 'elevation1' | 'elevation2' | 'transparent'>
+    >;
+
+/** @public */
+export type Color =
+  | 'primary'
+  | 'secondary'
+  | 'error'
+  | Partial<Record<Theme, 'primary' | 'secondary' | 'error'>>;
+
+/** @public */
+export type AsProps =
+  | 'div'
+  | 'span'
+  | 'p'
+  | 'article'
+  | 'section'
+  | 'main'
+  | 'nav'
+  | 'aside'
+  | 'ul'
+  | 'ol'
+  | 'li'
+  | 'details'
+  | 'summary'
+  | 'dd'
+  | 'dl'
+  | 'dt';
+
+/** @public */
+export interface ColorProps {
+  color?: Color;
+  background?: Background;
+}
diff --git a/packages/canon/src/theme/context.tsx b/packages/canon/src/theme/context.tsx
new file mode 100644
index 0000000000..77f43927f2
--- /dev/null
+++ b/packages/canon/src/theme/context.tsx
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { createContext, useContext, ReactNode } from 'react';
+import { IconMap, IconNames } from '../components/Icon/types';
+import { defaultIcons } from '../components/Icon/icons';
+
+interface ThemeContextProps {
+  icons: IconMap;
+}
+
+const ThemeContext = createContext<ThemeContextProps>({
+  icons: defaultIcons,
+});
+
+/** @public */
+export const ThemeProvider = ({
+  children,
+  overrides,
+}: {
+  children: ReactNode;
+  overrides: Partial<Record<IconNames, React.ComponentType>>;
+}) => {
+  // Merge provided overrides with default icons
+  const combinedIcons = { ...defaultIcons, ...overrides };
+
+  return (
+    <ThemeContext.Provider value={{ icons: combinedIcons }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+};
+
+/** @public */
+export const useTheme = () => useContext(ThemeContext);
diff --git a/packages/canon/src/theme/styles.css b/packages/canon/src/theme/styles.css
new file mode 100644
index 0000000000..8cb74374c6
--- /dev/null
+++ b/packages/canon/src/theme/styles.css
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Geist font */
+@import url('https://fonts.googleapis.com/css2?family=Geist:wght@100..900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&family=Geist:wght@100..900&display=swap');
+
+/* Theme */
+@import './theme.css';
+
+/* Components */
+@import '../components/Button/styles.css';
+@import '../components/Stack/styles.css';
+@import '../components/Inline/styles.css';
+@import '../components/Grid/styles.css';
+@import '../components/Container/styles.css';
+@import '../components/Icon/styles.css';
+@import '../components/Checkbox/styles.css';
diff --git a/packages/canon/src/theme/theme.css b/packages/canon/src/theme/theme.css
new file mode 100644
index 0000000000..ef78b2221a
--- /dev/null
+++ b/packages/canon/src/theme/theme.css
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Light theme */
+:root {
+  /* Colors */
+  --canon-accent: #000;
+  --canon-background: #f8f8f8;
+  --canon-surface-1: #fff;
+  --canon-surface-2: #f4f4f4;
+
+  /* Outlines */
+  --canon-outline: rgba(0, 0, 0, 0.1);
+  --canon-outline-hover: rgba(0, 0, 0, 0.2);
+  --canon-outline-focus: #000;
+
+  /* States - Add more states */
+  --canon-error: #f50000;
+
+  /* Text colors */
+  --canon-text-primary: #000;
+  --canon-text-primary-on-accent: #fff;
+  --canon-text-secondary: #646464;
+
+  /* Box shadows */
+  --canon-box-shadow-small: 0 0 0 1px rgba(0, 0, 0, 0.05);
+  --canon-box-shadow-medium: 0 0 0 1px rgba(0, 0, 0, 0.1);
+  --canon-box-shadow-large: 0 0 0 1px rgba(0, 0, 0, 0.2);
+
+  /* Font families */
+  --canon-font-regular: 'Geist', serif;
+  --canon-font-monospace: 'Monospace', monospace;
+  --canon-font-emoji: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+    'Noto Color Emoji';
+
+  /* Font weights */
+  --canon-font-normal: 400;
+  --canon-font-bold: 600;
+
+  /* Font sizes */
+  --canon-font-sizes-2xs: 0.625rem;
+  --canon-font-sizes-xs: 0.75rem;
+  --canon-font-sizes-sm: 0.875rem;
+  --canon-font-sizes-md: 1rem;
+  --canon-font-sizes-lg: 1.125rem;
+  --canon-font-sizes-xl: 1.25rem;
+  --canon-font-sizes-2xl: 1.5rem;
+  --canon-font-sizes-3xl: 1.875rem;
+  --canon-font-sizes-4xl: 2.25rem;
+  --canon-font-sizes-5xl: 3rem;
+  --canon-font-sizes-6xl: 3.75rem;
+  --canon-font-sizes-7xl: 4.5rem;
+  --canon-font-sizes-8xl: 6rem;
+  --canon-font-sizes-9xl: 8rem;
+
+  /* Spacing */
+  --canon-spacing-2xs: 0.25rem;
+  --canon-spacing-xs: 0.5rem;
+  --canon-spacing-sm: 0.75rem;
+  --canon-spacing-md: 1.25rem;
+  --canon-spacing-lg: 2rem;
+  --canon-spacing-xl: 3.25rem;
+  --canon-spacing-2xl: 5.25rem;
+
+  /* Container */
+  --canon-container-max-width: 1200px;
+  --canon-container-padding: 1rem;
+}
+
+/* Dark theme */
+[data-theme='dark'] {
+  /* Colors */
+  --canon-accent: #fff;
+  --canon-background: #000;
+  --canon-surface-1: #121212;
+  --canon-surface-2: #1a1a1a;
+
+  /* Outlines */
+  --canon-outline: rgba(255, 255, 255, 0.1);
+  --canon-outline-hover: rgba(255, 255, 255, 0.2);
+  --canon-outline-focus: #fff;
+
+  /* States - Add more states */
+  --canon-error: #f50000;
+
+  /* Text colors */
+  --canon-text-primary: #fff;
+  --canon-text-primary-on-accent: #000;
+  --canon-text-secondary: #b3b3b3;
+}
diff --git a/packages/canon/static/CNAME b/packages/canon/static/CNAME
new file mode 100644
index 0000000000..a07d95935a
--- /dev/null
+++ b/packages/canon/static/CNAME
@@ -0,0 +1 @@
+canon.backstage.io
diff --git a/packages/canon/static/favicon.svg b/packages/canon/static/favicon.svg
new file mode 100644
index 0000000000..12cad81e95
--- /dev/null
+++ b/packages/canon/static/favicon.svg
@@ -0,0 +1,4 @@
+<svg width="640" height="640" viewBox="0 0 640 640" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M370.766 153.765C377.563 166.716 371.236 182.114 359.357 190.647C323.005 216.758 299.326 259.411 299.326 307.597C299.326 365.997 334.107 416.27 384.077 438.817C395.235 443.852 403.478 454.368 403.478 466.609V640H382.864C224.433 640 96 511.517 96 353.025L96 20.6143C96 9.22934 105.229 0 116.614 0V0C226.982 3.14552e-06 322.792 62.3523 370.766 153.765Z" fill="black"/>
+<path d="M438.772 411.19C496.335 411.19 543 364.454 543 306.803C543 249.152 496.335 202.417 438.772 202.417C381.208 202.417 334.543 249.152 334.543 306.803C334.543 364.454 381.208 411.19 438.772 411.19Z" fill="black"/>
+</svg>
diff --git a/packages/canon/static/header.png b/packages/canon/static/header.png
new file mode 100644
index 0000000000..507bd05ca7
Binary files /dev/null and b/packages/canon/static/header.png differ
diff --git a/packages/canon/static/logo.svg b/packages/canon/static/logo.svg
new file mode 100644
index 0000000000..eb2b8aeaf2
--- /dev/null
+++ b/packages/canon/static/logo.svg
@@ -0,0 +1 @@
+<svg width="89" height="27" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M77.414 9.71h3.036v2.992l-.264-.022c.279-.88.748-1.65 1.408-2.31.675-.66 1.533-.99 2.574-.99 1.086 0 1.9.352 2.442 1.056.558.689.836 1.598.836 2.728v7.502H84.41v-6.6c0-.66-.117-1.159-.352-1.496-.234-.338-.623-.506-1.166-.506-.601 0-1.122.271-1.562.814a4.321 4.321 0 0 0-.88 1.848v5.94h-3.036V9.71ZM69.868 21.04c-1.13 0-2.142-.257-3.036-.77a5.547 5.547 0 0 1-2.068-2.09c-.484-.895-.726-1.892-.726-2.992 0-1.115.242-2.112.726-2.992a5.503 5.503 0 0 1 2.068-2.112c.88-.514 1.892-.77 3.036-.77 1.144 0 2.156.256 3.036.77a5.347 5.347 0 0 1 2.046 2.112c.498.88.748 1.87.748 2.97 0 1.114-.25 2.12-.748 3.014a5.343 5.343 0 0 1-2.068 2.09c-.88.513-1.885.77-3.014.77Zm0-2.618c.557 0 1.048-.132 1.474-.396a2.79 2.79 0 0 0 .99-1.144c.234-.499.352-1.064.352-1.694 0-.63-.118-1.188-.352-1.672a2.764 2.764 0 0 0-.99-1.166c-.426-.279-.917-.418-1.474-.418-.558 0-1.05.14-1.474.418a2.764 2.764 0 0 0-.99 1.166c-.22.484-.33 1.041-.33 1.672 0 .63.11 1.195.33 1.694.234.484.564.865.99 1.144.425.264.916.396 1.474.396ZM52.385 9.71h3.036v2.992l-.264-.022c.279-.88.748-1.65 1.408-2.31.675-.66 1.533-.99 2.574-.99 1.085 0 1.9.352 2.442 1.056.557.689.836 1.598.836 2.728v7.502h-3.036v-6.6c0-.66-.117-1.159-.352-1.496-.235-.338-.623-.506-1.166-.506-.601 0-1.122.271-1.562.814a4.321 4.321 0 0 0-.88 1.848v5.94h-3.036V9.71ZM43.904 20.952c-1.026 0-1.87-.308-2.53-.924-.66-.616-.99-1.416-.99-2.398 0-1.115.418-2.01 1.254-2.684.85-.69 2.105-1.034 3.762-1.034h2.75l-.924.352v-.462c0-.572-.176-1.02-.528-1.342-.352-.338-.931-.506-1.738-.506-.69 0-1.386.154-2.09.462-.704.308-1.29.69-1.76 1.144v-2.882c.47-.352 1.1-.66 1.892-.924a7.942 7.942 0 0 1 2.486-.396c1.599 0 2.78.41 3.542 1.232.778.806 1.166 1.914 1.166 3.322v5.742c0 .176.008.352.022.528.03.161.066.322.11.484h-3.014v-3.3l.044 1.386a4.044 4.044 0 0 1-1.32 1.606c-.572.396-1.283.594-2.134.594Zm.858-2.156c.558 0 1.049-.206 1.474-.616.44-.426.77-.954.99-1.584v-.792h-1.562c-.762 0-1.334.146-1.716.44-.381.278-.572.674-.572 1.188 0 .41.125.74.374.99.264.25.602.374 1.012.374ZM34.66 21.04c-1.525 0-2.874-.345-4.047-1.034-1.174-.704-2.09-1.68-2.75-2.926-.646-1.247-.968-2.662-.968-4.246 0-1.584.322-2.992.968-4.224.66-1.232 1.576-2.193 2.75-2.882 1.173-.704 2.522-1.056 4.048-1.056.968 0 1.818.11 2.552.33.748.22 1.356.506 1.826.858v3.498c-.396-.484-.96-.895-1.694-1.232-.719-.338-1.51-.506-2.376-.506-.939 0-1.775.22-2.508.66-.719.44-1.284 1.056-1.694 1.848-.396.792-.594 1.694-.594 2.706 0 1.026.198 1.943.594 2.75.41.792.975 1.408 1.694 1.848.733.44 1.57.66 2.508.66.88 0 1.68-.162 2.398-.484.718-.323 1.276-.726 1.672-1.21v3.41a5.686 5.686 0 0 1-1.87.902c-.704.22-1.54.33-2.508.33ZM11.275 6.271c.276.526.019 1.152-.464 1.498a5.846 5.846 0 0 0 1.004 10.082c.454.205.789.632.789 1.13v6.206a.837.837 0 0 1-.838.837C5.33 26.024.112 20.804.112 14.366V.862C.112.399.487.024.95.024c4.483 0 8.376 2.533 10.325 6.247Z" fill="#000"/><path d="M14.037 16.729a4.237 4.237 0 0 0 4.234-4.24 4.237 4.237 0 0 0-4.234-4.242 4.237 4.237 0 0 0-4.234 4.241 4.237 4.237 0 0 0 4.234 4.24Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index 2342156ab2..e9e525a0e1 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,73 @@
 # @backstage/catalog-client
 
+## 1.9.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+
+## 1.9.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 1.8.1-next.0
+
+### Patch Changes
+
+- d7e7836: Fixed a bug in the `queryEntities` method where errors were not being handled properly.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 1.8.0
+
+### Minor Changes
+
+- 656d1ef: Internal update to use the updated generated code from `backstage-cli package schema openapi generate --client-package ...`.
+- 31c4fe0: The client now automatically splits up very large `getEntitiesByRefs` calls into several smaller requests behind the scenes when needed. This ensures that each individual request does not exceed common Express.js request body limits or overload the server.
+
+### Patch Changes
+
+- 873f89a: Fix for certain filter fields in the `catalogApiMock` being case sensitive.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 1.8.0-next.1
+
+### Minor Changes
+
+- 656d1ef: Internal update to use the updated generated code from `backstage-cli package schema openapi generate --client-package ...`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## 1.8.0-next.0
+
+### Minor Changes
+
+- 31c4fe0: The client now automatically splits up very large `getEntitiesByRefs` calls into several smaller requests behind the scenes when needed. This ensures that each individual request does not exceed common Express.js request body limits or overload the server.
+
+### Patch Changes
+
+- 873f89a: Fix for certain filter fields in the `catalogApiMock` being case sensitive.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 1.7.1
 
 ### Patch Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 4664adef98..8e16a4bf91 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-client",
-  "version": "1.7.1",
+  "version": "1.9.0-next.2",
   "description": "An isomorphic client for the catalog backend",
   "backstage": {
     "role": "common-library"
diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts
index ce44b93b59..ea61634a8b 100644
--- a/packages/catalog-client/src/CatalogClient.test.ts
+++ b/packages/catalog-client/src/CatalogClient.test.ts
@@ -525,6 +525,18 @@ describe('CatalogClient', () => {
         '?cursor=prevcursor',
       );
     });
+
+    it('should handle errors', async () => {
+      const mockedEndpoint = jest
+        .fn()
+        .mockImplementation((_req, res, ctx) => res(ctx.status(401)));
+
+      server.use(rest.get(`${mockBaseUrl}/entities/by-query`, mockedEndpoint));
+
+      await expect(() => client.queryEntities()).rejects.toThrow(
+        /Request failed with 401 Unauthorized/,
+      );
+    });
   });
 
   describe('getEntityByRef', () => {
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index ff3429f81b..e820716945 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -42,7 +42,7 @@ import {
   ValidateEntityResponse,
 } from './types/api';
 import { isQueryEntitiesInitialRequest, splitRefsIntoChunks } from './utils';
-import { DefaultApiClient, TypedResponse } from './generated';
+import { DefaultApiClient, TypedResponse } from './schema/openapi';
 
 /**
  * A frontend and backend compatible client for communicating with the Backstage
@@ -237,9 +237,9 @@ export class CatalogClient implements CatalogApi {
       }
     }
 
-    return this.apiClient
-      .getEntitiesByQuery({ query: params }, options)
-      .then(r => r.json());
+    return this.requestRequired(
+      await this.apiClient.getEntitiesByQuery({ query: params }, options),
+    );
   }
 
   /**
diff --git a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts b/packages/catalog-client/src/schema/openapi/generated/apis/Api.client.ts
similarity index 76%
rename from packages/catalog-client/src/generated/apis/DefaultApi.client.ts
rename to packages/catalog-client/src/schema/openapi/generated/apis/Api.client.ts
index 1f1c54d6f8..1bf554672c 100644
--- a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/apis/Api.client.ts
@@ -22,7 +22,6 @@ import { FetchApi } from '../types/fetch';
 import crossFetch from 'cross-fetch';
 import { pluginId } from '../pluginId';
 import * as parser from 'uri-template';
-
 import { AnalyzeLocationRequest } from '../models/AnalyzeLocationRequest.model';
 import { AnalyzeLocationResponse } from '../models/AnalyzeLocationResponse.model';
 import { CreateLocation201Response } from '../models/CreateLocation201Response.model';
@@ -55,9 +54,148 @@ export type TypedResponse<T> = Omit<Response, 'json'> & {
 export interface RequestOptions {
   token?: string;
 }
+/**
+ * @public
+ */
+export type AnalyzeLocation = {
+  body: AnalyzeLocationRequest;
+};
+/**
+ * @public
+ */
+export type CreateLocation = {
+  body: CreateLocationRequest;
+  query: {
+    dryRun?: string;
+  };
+};
+/**
+ * @public
+ */
+export type DeleteEntityByUid = {
+  path: {
+    uid: string;
+  };
+};
+/**
+ * @public
+ */
+export type DeleteLocation = {
+  path: {
+    id: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntities = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    filter?: Array<string>;
+    offset?: number;
+    after?: string;
+    order?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntitiesByQuery = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    offset?: number;
+    orderField?: Array<string>;
+    cursor?: string;
+    filter?: Array<string>;
+    fullTextFilterTerm?: string;
+    fullTextFilterFields?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntitiesByRefs = {
+  body: GetEntitiesByRefsRequest;
+  query: {
+    filter?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityAncestryByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityByUid = {
+  path: {
+    uid: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetEntityFacets = {
+  query: {
+    facet: Array<string>;
+    filter?: Array<string>;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocation = {
+  path: {
+    id: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocationByEntity = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+};
+/**
+ * @public
+ */
+export type GetLocations = {};
+/**
+ * @public
+ */
+export type RefreshEntity = {
+  body: RefreshEntityRequest;
+};
+/**
+ * @public
+ */
+export type ValidateEntity = {
+  body: ValidateEntityRequest;
+};
 
 /**
- * no description
+ * @public
  */
 export class DefaultApiClient {
   private readonly discoveryApi: DiscoveryApi;
@@ -73,13 +211,11 @@ export class DefaultApiClient {
 
   /**
    * Validate a given location.
-   * @param analyzeLocationRequest
+   * @param analyzeLocationRequest -
    */
   public async analyzeLocation(
     // @ts-ignore
-    request: {
-      body: AnalyzeLocationRequest;
-    },
+    request: AnalyzeLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<AnalyzeLocationResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -100,17 +236,12 @@ export class DefaultApiClient {
 
   /**
    * Create a location for a given target.
-   * @param createLocationRequest
-   * @param dryRun
+   * @param createLocationRequest -
+   * @param dryRun -
    */
   public async createLocation(
     // @ts-ignore
-    request: {
-      body: CreateLocationRequest;
-      query: {
-        dryRun?: string;
-      };
-    },
+    request: CreateLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<CreateLocation201Response>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -133,15 +264,11 @@ export class DefaultApiClient {
 
   /**
    * Delete a single entity by UID.
-   * @param uid
+   * @param uid -
    */
   public async deleteEntityByUid(
     // @ts-ignore
-    request: {
-      path: {
-        uid: string;
-      };
-    },
+    request: DeleteEntityByUid,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -163,15 +290,11 @@ export class DefaultApiClient {
 
   /**
    * Delete a location by id.
-   * @param id
+   * @param id -
    */
   public async deleteLocation(
     // @ts-ignore
-    request: {
-      path: {
-        id: string;
-      };
-    },
+    request: DeleteLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -193,25 +316,16 @@ export class DefaultApiClient {
 
   /**
    * Get all entities matching a given filter.
-   * @param fields Restrict to just these fields in the response.
-   * @param limit Number of records to return in the response.
-   * @param filter Filter for just the entities defined by this filter.
-   * @param offset Number of records to skip in the query page.
-   * @param after Pointer to the previous page of results.
-   * @param order
+   * @param fields - Restrict to just these fields in the response.
+   * @param limit - Number of records to return in the response.
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param offset - Number of records to skip in the query page.
+   * @param after - Pointer to the previous page of results.
+   * @param order -
    */
   public async getEntities(
     // @ts-ignore
-    request: {
-      query: {
-        fields?: Array<string>;
-        limit?: number;
-        filter?: Array<string>;
-        offset?: number;
-        after?: string;
-        order?: Array<string>;
-      };
-    },
+    request: GetEntities,
     options?: RequestOptions,
   ): Promise<TypedResponse<Array<Entity>>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -233,28 +347,18 @@ export class DefaultApiClient {
 
   /**
    * Search for entities by a given query.
-   * @param fields Restrict to just these fields in the response.
-   * @param limit Number of records to return in the response.
-   * @param orderField The fields to sort returned results by.
-   * @param cursor Cursor to a set page of results.
-   * @param filter Filter for just the entities defined by this filter.
-   * @param fullTextFilterTerm Text search term.
-   * @param fullTextFilterFields A comma separated list of fields to sort returned results by.
+   * @param fields - Restrict to just these fields in the response.
+   * @param limit - Number of records to return in the response.
+   * @param offset - Number of records to skip in the query page.
+   * @param orderField - The fields to sort returned results by.
+   * @param cursor - Cursor to a set page of results.
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param fullTextFilterTerm - Text search term.
+   * @param fullTextFilterFields - A comma separated list of fields to sort returned results by.
    */
   public async getEntitiesByQuery(
     // @ts-ignore
-    request: {
-      query: {
-        fields?: Array<string>;
-        limit?: number;
-        offset?: number;
-        orderField?: Array<string>;
-        cursor?: string;
-        filter?: Array<string>;
-        fullTextFilterTerm?: string;
-        fullTextFilterFields?: Array<string>;
-      };
-    },
+    request: GetEntitiesByQuery,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntitiesQueryResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -276,23 +380,21 @@ export class DefaultApiClient {
 
   /**
    * Get a batch set of entities given an array of entityRefs.
-   * @param getEntitiesByRefsRequest
+   * @param filter - Filter for just the entities defined by this filter.
+   * @param getEntitiesByRefsRequest -
    */
   public async getEntitiesByRefs(
     // @ts-ignore
-    request: {
-      body: GetEntitiesByRefsRequest;
-      query?: {
-        filter?: Array<string>;
-      };
-    },
+    request: GetEntitiesByRefs,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntitiesBatchResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
 
-    const uriTemplate = `/entities/by-refs/{?filter*}`;
+    const uriTemplate = `/entities/by-refs{?filter*}`;
 
-    const uri = parser.parse(uriTemplate).expand({ ...request.query });
+    const uri = parser.parse(uriTemplate).expand({
+      ...request.query,
+    });
 
     return await this.fetchApi.fetch(`${baseUrl}${uri}`, {
       headers: {
@@ -306,19 +408,13 @@ export class DefaultApiClient {
 
   /**
    * Get an entity's ancestry by entity ref.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getEntityAncestryByName(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetEntityAncestryByName,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntityAncestryResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -342,19 +438,13 @@ export class DefaultApiClient {
 
   /**
    * Get an entity by an entity ref.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getEntityByName(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetEntityByName,
     options?: RequestOptions,
   ): Promise<TypedResponse<Entity>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -378,15 +468,11 @@ export class DefaultApiClient {
 
   /**
    * Get a single entity by the UID.
-   * @param uid
+   * @param uid -
    */
   public async getEntityByUid(
     // @ts-ignore
-    request: {
-      path: {
-        uid: string;
-      };
-    },
+    request: GetEntityByUid,
     options?: RequestOptions,
   ): Promise<TypedResponse<Entity>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -408,17 +494,12 @@ export class DefaultApiClient {
 
   /**
    * Get all entity facets that match the given filters.
-   * @param facet
-   * @param filter Filter for just the entities defined by this filter.
+   * @param facet -
+   * @param filter - Filter for just the entities defined by this filter.
    */
   public async getEntityFacets(
     // @ts-ignore
-    request: {
-      query: {
-        facet: Array<string>;
-        filter?: Array<string>;
-      };
-    },
+    request: GetEntityFacets,
     options?: RequestOptions,
   ): Promise<TypedResponse<EntityFacetsResponse>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -440,15 +521,11 @@ export class DefaultApiClient {
 
   /**
    * Get a location by id.
-   * @param id
+   * @param id -
    */
   public async getLocation(
     // @ts-ignore
-    request: {
-      path: {
-        id: string;
-      };
-    },
+    request: GetLocation,
     options?: RequestOptions,
   ): Promise<TypedResponse<Location>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -470,19 +547,13 @@ export class DefaultApiClient {
 
   /**
    * Get a location for entity.
-   * @param kind
-   * @param namespace
-   * @param name
+   * @param kind -
+   * @param namespace -
+   * @param name -
    */
   public async getLocationByEntity(
     // @ts-ignore
-    request: {
-      path: {
-        kind: string;
-        namespace: string;
-        name: string;
-      };
-    },
+    request: GetLocationByEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<Location>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -509,7 +580,7 @@ export class DefaultApiClient {
    */
   public async getLocations(
     // @ts-ignore
-    request: {},
+    request: GetLocations,
     options?: RequestOptions,
   ): Promise<TypedResponse<Array<GetLocations200ResponseInner>>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -529,13 +600,11 @@ export class DefaultApiClient {
 
   /**
    * Refresh the entity related to entityRef.
-   * @param refreshEntityRequest
+   * @param refreshEntityRequest -
    */
   public async refreshEntity(
     // @ts-ignore
-    request: {
-      body: RefreshEntityRequest;
-    },
+    request: RefreshEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -556,13 +625,11 @@ export class DefaultApiClient {
 
   /**
    * Validate that a passed in entity has no errors in schema.
-   * @param validateEntityRequest
+   * @param validateEntityRequest -
    */
   public async validateEntity(
     // @ts-ignore
-    request: {
-      body: ValidateEntityRequest;
-    },
+    request: ValidateEntity,
     options?: RequestOptions,
   ): Promise<TypedResponse<void>> {
     const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
diff --git a/packages/catalog-client/src/generated/apis/index.ts b/packages/catalog-client/src/schema/openapi/generated/apis/index.ts
similarity index 94%
rename from packages/catalog-client/src/generated/apis/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/apis/index.ts
index 51dcca33fe..af52f9db46 100644
--- a/packages/catalog-client/src/generated/apis/index.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/apis/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export * from './DefaultApi.client';
+export * from './Api.client';
diff --git a/packages/catalog-client/src/generated/index.ts b/packages/catalog-client/src/schema/openapi/generated/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/index.ts
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
index 48d2c897a7..ad2b5aecd1 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationEntityField {
   /**
    * A text to show to the user to inform about the choices made. Like, it could say \"Found a CODEOWNERS file that covers this target, so we suggest leaving this field empty; which would currently make it owned by X\" where X is taken from the codeowners file.
@@ -34,6 +37,9 @@ export interface AnalyzeLocationEntityField {
   field: string;
 }
 
+/**
+ * @public
+ */
 export type AnalyzeLocationEntityFieldStateEnum =
   | 'analysisSuggestedValue'
   | 'analysisSuggestedNoValue'
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
index 7a1417145e..fb01ae8e8e 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
@@ -22,6 +22,7 @@ import { LocationSpec } from '../models/LocationSpec.model';
 
 /**
  * If the folder pointed to already contained catalog info yaml files, they are 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
+ * @public
  */
 export interface AnalyzeLocationExistingEntity {
   entity: Entity;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
index 3e33c59330..e760d9cf94 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
@@ -22,6 +22,7 @@ import { RecursivePartialEntity } from '../models/RecursivePartialEntity.model';
 
 /**
  * This is some form of representation of what the analyzer could deduce. We should probably have a chat about how this can best be conveyed to 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.
+ * @public
  */
 export interface AnalyzeLocationGenerateEntity {
   fields: Array<AnalyzeLocationEntityField>;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
index 15e9b96e2c..c1085a2a7b 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { LocationInput } from '../models/LocationInput.model';
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationRequest {
   catalogFileName?: string;
   location: LocationInput;
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
index e22d45627a..66fc46bc0f 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
@@ -20,6 +20,9 @@
 import { AnalyzeLocationExistingEntity } from '../models/AnalyzeLocationExistingEntity.model';
 import { AnalyzeLocationGenerateEntity } from '../models/AnalyzeLocationGenerateEntity.model';
 
+/**
+ * @public
+ */
 export interface AnalyzeLocationResponse {
   generateEntities: Array<AnalyzeLocationGenerateEntity>;
   existingEntityFiles: Array<AnalyzeLocationExistingEntity>;
diff --git a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
index 367e701af8..27e557639a 100644
--- a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
@@ -20,6 +20,9 @@
 import { Entity } from '../models/Entity.model';
 import { Location } from '../models/Location.model';
 
+/**
+ * @public
+ */
 export interface CreateLocation201Response {
   exists?: boolean;
   entities: Array<Entity>;
diff --git a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
index badddbf60d..5351ac289b 100644
--- a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface CreateLocationRequest {
   target: string;
   type: string;
diff --git a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
index 3275a7b6e7..1a962367d1 100644
--- a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { NullableEntity } from '../models/NullableEntity.model';
 
+/**
+ * @public
+ */
 export interface EntitiesBatchResponse {
   /**
    * 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.
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
index 9950dd98d1..11c42a6aee 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
@@ -20,6 +20,9 @@
 import { EntitiesQueryResponsePageInfo } from '../models/EntitiesQueryResponsePageInfo.model';
 import { Entity } from '../models/Entity.model';
 
+/**
+ * @public
+ */
 export interface EntitiesQueryResponse {
   /**
    * The list of entities paginated by a specific filter.
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
index 4d2a0af058..07b4137c77 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface EntitiesQueryResponsePageInfo {
   /**
    * The cursor for the next batch of entities.
diff --git a/packages/catalog-client/src/generated/models/Entity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/Entity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
index f4a30fbf66..f386f3dd17 100644
--- a/packages/catalog-client/src/generated/models/Entity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/Entity.model.ts
@@ -22,6 +22,7 @@ import { EntityRelation } from '../models/EntityRelation.model';
 
 /**
  * The parts of the format that's common to all versions/kinds of entity.
+ * @public
  */
 export interface Entity {
   /**
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
index 4e0ead7d3b..a94f784f05 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityAncestryResponseItemsInner } from '../models/EntityAncestryResponseItemsInner.model';
 
+/**
+ * @public
+ */
 export interface EntityAncestryResponse {
   items: Array<EntityAncestryResponseItemsInner>;
   rootEntityRef: string;
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
index 22b59e201f..40594a1515 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { Entity } from '../models/Entity.model';
 
+/**
+ * @public
+ */
 export interface EntityAncestryResponseItemsInner {
   parentEntityRefs: Array<string>;
   entity: Entity;
diff --git a/packages/catalog-client/src/generated/models/EntityFacet.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/EntityFacet.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
index aa637501f4..f0f89f6eae 100644
--- a/packages/catalog-client/src/generated/models/EntityFacet.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacet.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface EntityFacet {
   value: string;
   count: number;
diff --git a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
index 33aa505a64..e013f0b5a8 100644
--- a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityFacet } from '../models/EntityFacet.model';
 
+/**
+ * @public
+ */
 export interface EntityFacetsResponse {
   facets: { [key: string]: Array<EntityFacet> };
 }
diff --git a/packages/catalog-client/src/generated/models/EntityLink.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/EntityLink.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
index 9de21c1b10..53d7d1f9ff 100644
--- a/packages/catalog-client/src/generated/models/EntityLink.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityLink.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A link to external information that is related to the entity.
+ * @public
  */
 export interface EntityLink {
   /**
diff --git a/packages/catalog-client/src/generated/models/EntityMeta.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/EntityMeta.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
index 10cda7f226..cc8dd555a6 100644
--- a/packages/catalog-client/src/generated/models/EntityMeta.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityMeta.model.ts
@@ -21,6 +21,7 @@ import { EntityLink } from '../models/EntityLink.model';
 
 /**
  * Metadata fields common to all versions/kinds of entity.
+ * @public
  */
 export interface EntityMeta {
   [key: string]: any;
diff --git a/packages/catalog-client/src/generated/models/EntityRelation.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/EntityRelation.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
index 14f7d0fab3..fe98a84481 100644
--- a/packages/catalog-client/src/generated/models/EntityRelation.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/EntityRelation.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ * @public
  */
 export interface EntityRelation {
   /**
diff --git a/packages/catalog-client/src/generated/models/ErrorError.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorError.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
index a9d3b11fdd..fe5811628d 100644
--- a/packages/catalog-client/src/generated/models/ErrorError.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorError {
   name: string;
   message: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
index be62627814..d44dcb66d9 100644
--- a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorRequest {
   method: string;
   url: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ErrorResponse.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
index 008f8b7348..91c120483d 100644
--- a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ErrorResponse {
   statusCode: number;
 }
diff --git a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
index 07c6500c9f..9160f0823b 100644
--- a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface GetEntitiesByRefsRequest {
   entityRefs: Array<string>;
   fields?: Array<string>;
diff --git a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
index 94c40d2233..a9f1af1c53 100644
--- a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { Location } from '../models/Location.model';
 
+/**
+ * @public
+ */
 export interface GetLocations200ResponseInner {
   data: Location;
 }
diff --git a/packages/catalog-client/src/generated/models/Location.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/Location.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
index 456b76ec7b..d7e4a22de4 100644
--- a/packages/catalog-client/src/generated/models/Location.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/Location.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Entity location for a specific entity.
+ * @public
  */
 export interface Location {
   target: string;
diff --git a/packages/catalog-client/src/generated/models/LocationInput.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/LocationInput.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
index 41537aaded..9cdc4c2c13 100644
--- a/packages/catalog-client/src/generated/models/LocationInput.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/LocationInput.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface LocationInput {
   type: string;
   target: string;
diff --git a/packages/catalog-client/src/generated/models/LocationSpec.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/LocationSpec.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
index cd9eb284f7..1d56d8f3b0 100644
--- a/packages/catalog-client/src/generated/models/LocationSpec.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/LocationSpec.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Holds the entity location information.
+ * @public
  */
 export interface LocationSpec {
   target: string;
diff --git a/packages/catalog-client/src/generated/models/ModelError.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ModelError.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
index 7bfa165493..5526d703e6 100644
--- a/packages/catalog-client/src/generated/models/ModelError.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ModelError.model.ts
@@ -21,6 +21,9 @@ import { ErrorError } from '../models/ErrorError.model';
 import { ErrorRequest } from '../models/ErrorRequest.model';
 import { ErrorResponse } from '../models/ErrorResponse.model';
 
+/**
+ * @public
+ */
 export interface ModelError {
   [key: string]: any;
 
diff --git a/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts
new file mode 100644
index 0000000000..aa6135ded4
--- /dev/null
+++ b/packages/catalog-client/src/schema/openapi/generated/models/NullableEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityMeta } from '../models/EntityMeta.model';
+import { EntityRelation } from '../models/EntityRelation.model';
+
+/**
+ * The parts of the format that's common to all versions/kinds of entity.
+ * @public
+ */
+export type NullableEntity = {
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<EntityRelation>;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  metadata: EntityMeta;
+  /**
+   * The high level entity type being described.
+   */
+  kind: string;
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion: string;
+} | null;
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
index db5ac31de3..b3913ccd85 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
@@ -22,6 +22,7 @@ import { RecursivePartialEntityRelation } from '../models/RecursivePartialEntity
 
 /**
  * Makes all keys of an entire hierarchy optional.
+ * @public
  */
 export interface RecursivePartialEntity {
   /**
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
index 93e849ac99..df5ce3811b 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { EntityLink } from '../models/EntityLink.model';
 
+/**
+ * @public
+ */
 export interface RecursivePartialEntityMeta {
   /**
    * A list of external hyperlinks related to the entity.
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
index 7e06368102..6598f8df96 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
@@ -21,6 +21,7 @@ import { EntityLink } from '../models/EntityLink.model';
 
 /**
  * Metadata fields common to all versions/kinds of entity.
+ * @public
  */
 export interface RecursivePartialEntityMetaAllOf {
   /**
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
similarity index 99%
rename from packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
index 9179add222..9c7dafb534 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ * @public
  */
 export interface RecursivePartialEntityRelation {
   /**
diff --git a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
index c5ab4c38eb..617f35288b 100644
--- a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
@@ -20,6 +20,7 @@
 
 /**
  * Options for requesting a refresh of entities in the catalog.
+ * @public
  */
 export interface RefreshEntityRequest {
   authorizationToken?: string;
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
index 7cd5044782..fac9525afa 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
@@ -19,6 +19,9 @@
 // ******************************************************************
 import { ValidateEntity400ResponseErrorsInner } from '../models/ValidateEntity400ResponseErrorsInner.model';
 
+/**
+ * @public
+ */
 export interface ValidateEntity400Response {
   errors: Array<ValidateEntity400ResponseErrorsInner>;
 }
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
similarity index 98%
rename from packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
index 5617ee00bb..8718d7938d 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ValidateEntity400ResponseErrorsInner {
   [key: string]: any;
 
diff --git a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
index 152f28cf85..c3be04818d 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
+++ b/packages/catalog-client/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
@@ -18,6 +18,9 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 
+/**
+ * @public
+ */
 export interface ValidateEntityRequest {
   location: string;
   entity: { [key: string]: any };
diff --git a/packages/catalog-client/src/generated/models/index.ts b/packages/catalog-client/src/schema/openapi/generated/models/index.ts
similarity index 100%
rename from packages/catalog-client/src/generated/models/index.ts
rename to packages/catalog-client/src/schema/openapi/generated/models/index.ts
diff --git a/packages/catalog-client/src/generated/pluginId.ts b/packages/catalog-client/src/schema/openapi/generated/pluginId.ts
similarity index 100%
rename from packages/catalog-client/src/generated/pluginId.ts
rename to packages/catalog-client/src/schema/openapi/generated/pluginId.ts
diff --git a/packages/catalog-client/src/generated/types/discovery.ts b/packages/catalog-client/src/schema/openapi/generated/types/discovery.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/discovery.ts
rename to packages/catalog-client/src/schema/openapi/generated/types/discovery.ts
diff --git a/packages/catalog-client/src/generated/types/fetch.ts b/packages/catalog-client/src/schema/openapi/generated/types/fetch.ts
similarity index 100%
rename from packages/catalog-client/src/generated/types/fetch.ts
rename to packages/catalog-client/src/schema/openapi/generated/types/fetch.ts
diff --git a/packages/catalog-client/src/schema/openapi/index.ts b/packages/catalog-client/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/packages/catalog-client/src/schema/openapi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './generated';
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 005fd75e58..1e5d752f2f 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/catalog-model
 
+## 1.7.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## 1.7.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
 ## 1.7.0
 
 ### Minor Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 6e26a011d9..97ebc54888 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "1.7.0",
+  "version": "1.7.2-next.0",
   "description": "Types and validators that help describe the model of a Backstage Catalog",
   "backstage": {
     "role": "common-library"
diff --git a/packages/cli-common/CHANGELOG.md b/packages/cli-common/CHANGELOG.md
index 29ffc4984c..4a7880688d 100644
--- a/packages/cli-common/CHANGELOG.md
+++ b/packages/cli-common/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/cli-common
 
+## 0.1.15
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index c316f15322..d8242fd325 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli-common",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Common functionality used by cli, backend, and create-app",
   "backstage": {
     "role": "node-library"
@@ -36,6 +36,6 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@types/node": "^18.17.8"
+    "@types/node": "^20.16.0"
   }
 }
diff --git a/packages/cli-node/CHANGELOG.md b/packages/cli-node/CHANGELOG.md
index 183ba88a1f..129564d605 100644
--- a/packages/cli-node/CHANGELOG.md
+++ b/packages/cli-node/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/cli-node
 
+## 0.2.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/types@1.2.0
+
+## 0.2.11-next.0
+
+### Patch Changes
+
+- af665ea: add PackageManager and Lockfile interfaces for future use
+- cbfc69e: Internal refactor
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.2.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/packages/cli-node/package.json b/packages/cli-node/package.json
index 7b8a867ebc..1aa460550d 100644
--- a/packages/cli-node/package.json
+++ b/packages/cli-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli-node",
-  "version": "0.2.9",
+  "version": "0.2.11-next.1",
   "description": "Node.js library for Backstage CLIs",
   "backstage": {
     "role": "node-library"
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
-    "@backstage/cli": "workspace:^"
+    "@backstage/cli": "workspace:^",
+    "@backstage/test-utils": "workspace:^"
   }
 }
diff --git a/packages/cli-node/src/errors.ts b/packages/cli-node/src/errors.ts
new file mode 100644
index 0000000000..8be5faeb4f
--- /dev/null
+++ b/packages/cli-node/src/errors.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CustomErrorBase } from '@backstage/errors';
+
+export class ExitCodeError extends CustomErrorBase {
+  readonly code: number;
+
+  constructor(code: number, command?: string) {
+    super(
+      command
+        ? `Command '${command}' exited with code ${code}`
+        : `Child exited with code ${code}`,
+    );
+    this.code = code;
+  }
+}
+
+export class NotFoundError extends CustomErrorBase {}
diff --git a/packages/cli-node/src/git/GitUtils.ts b/packages/cli-node/src/git/GitUtils.ts
index df04b1c6a2..7b87487c56 100644
--- a/packages/cli-node/src/git/GitUtils.ts
+++ b/packages/cli-node/src/git/GitUtils.ts
@@ -15,8 +15,7 @@
  */
 
 import { assertError, ForwardedError } from '@backstage/errors';
-import { paths } from '../paths';
-import { execFile } from '../run';
+import { execFile, paths } from '../util';
 
 /**
  * Run a git command, trimming the output splitting it into lines.
diff --git a/packages/cli-node/src/monorepo/PackageGraph.test.ts b/packages/cli-node/src/monorepo/PackageGraph.test.ts
index 9bc9cbf72b..e2378b91c0 100644
--- a/packages/cli-node/src/monorepo/PackageGraph.test.ts
+++ b/packages/cli-node/src/monorepo/PackageGraph.test.ts
@@ -23,7 +23,7 @@ import { GitUtils } from '../git';
 const mockListChangedFiles = jest.spyOn(GitUtils, 'listChangedFiles');
 const mockReadFileAtRef = jest.spyOn(GitUtils, 'readFileAtRef');
 
-jest.mock('../paths', () => ({
+jest.mock('../util', () => ({
   paths: {
     targetRoot: '/',
     resolveTargetRoot: (...paths: string[]) => resolvePath('/', ...paths),
diff --git a/packages/cli-node/src/monorepo/PackageGraph.ts b/packages/cli-node/src/monorepo/PackageGraph.ts
index 69ec99c2dd..721aa79e50 100644
--- a/packages/cli-node/src/monorepo/PackageGraph.ts
+++ b/packages/cli-node/src/monorepo/PackageGraph.ts
@@ -16,7 +16,7 @@
 
 import path from 'path';
 import { getPackages, Package } from '@manypkg/get-packages';
-import { paths } from '../paths';
+import { paths } from '../util';
 import { PackageRole } from '../roles';
 import { GitUtils } from '../git';
 import { Lockfile } from './Lockfile';
diff --git a/packages/cli-node/src/monorepo/isMonoRepo.ts b/packages/cli-node/src/monorepo/isMonoRepo.ts
index da78c8dd53..f47ac4b9ad 100644
--- a/packages/cli-node/src/monorepo/isMonoRepo.ts
+++ b/packages/cli-node/src/monorepo/isMonoRepo.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { paths } from '../paths';
+import { paths } from '../util';
 import fs from 'fs-extra';
 
 /**
diff --git a/packages/cli-node/src/monorepo/isMonorepo.test.ts b/packages/cli-node/src/monorepo/isMonorepo.test.ts
index de0dae0893..30c2d3ccbc 100644
--- a/packages/cli-node/src/monorepo/isMonorepo.test.ts
+++ b/packages/cli-node/src/monorepo/isMonorepo.test.ts
@@ -19,7 +19,7 @@ import { createMockDirectory } from '@backstage/backend-test-utils';
 
 const mockDir = createMockDirectory();
 
-jest.mock('../paths', () => ({
+jest.mock('../util', () => ({
   paths: { resolveTargetRoot: (...args: string[]) => mockDir.resolve(...args) },
 }));
 
diff --git a/packages/cli-node/src/pacman/Lockfile.ts b/packages/cli-node/src/pacman/Lockfile.ts
new file mode 100644
index 0000000000..51ba07827b
--- /dev/null
+++ b/packages/cli-node/src/pacman/Lockfile.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * An entry for a single package in a {@link Lockfile}.
+ *
+ * @public
+ */
+export type LockfileEntry = {
+  range: string;
+  version: 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[];
+};
+
+/**
+ * Represents the lockfile for a package manager.
+ *
+ * @public
+ */
+export interface Lockfile {
+  /** Get the entries for a single package in the lockfile */
+  get(name: string): LockfileEntry[] | undefined;
+
+  /** Returns the names of all packages available in the lockfile */
+  keys(): IterableIterator<string>;
+
+  /**
+   * 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>>;
+
+  /**
+   * Diff with another lockfile, returning entries that have been
+   * added, changed, and removed compared to the other lockfile.
+   */
+  diff(otherLockfile: Lockfile): LockfileDiff;
+
+  /**
+   * Generates a sha1 hex hash of the dependency graph for a package.
+   */
+  getDependencyTreeHash(startName: string): string;
+}
diff --git a/packages/cli-node/src/pacman/PackageManager.test.ts b/packages/cli-node/src/pacman/PackageManager.test.ts
new file mode 100644
index 0000000000..3997da554c
--- /dev/null
+++ b/packages/cli-node/src/pacman/PackageManager.test.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { detectPackageManager } from './PackageManager';
+import { Yarn } from './yarn';
+import { withLogCollector } from '@backstage/test-utils';
+
+const mockDir = createMockDirectory();
+
+jest.mock('../util', () => ({
+  ...jest.requireActual('../util'),
+  paths: { resolveTargetRoot: (...args: string[]) => mockDir.resolve(...args) },
+}));
+
+const mockYarnCreate = jest.spyOn(Yarn, 'create');
+
+describe('PackageManager', () => {
+  describe('detectPackageManager', () => {
+    describe('yarn', () => {
+      afterEach(() => {
+        jest.resetAllMocks();
+      });
+
+      it('should detect via yarn.lock', async () => {
+        mockDir.setContent({
+          'yarn.lock': 'just needs to exist',
+        });
+        await detectPackageManager();
+        expect(mockYarnCreate).toHaveBeenCalled();
+      });
+
+      it('should detect via root package.json workspaces', async () => {
+        mockDir.setContent({
+          'package.json': JSON.stringify({
+            name: 'foo',
+            workspaces: {
+              packages: [],
+            },
+          }),
+        });
+        await detectPackageManager();
+        expect(mockYarnCreate).toHaveBeenCalled();
+      });
+
+      it('should detect via root package.json packageManager', async () => {
+        mockDir.setContent({
+          'package.json': JSON.stringify({
+            name: 'foo',
+            packageManager: 'yarn@1.0.0',
+          }),
+        });
+        await detectPackageManager();
+        expect(mockYarnCreate).toHaveBeenCalled();
+      });
+
+      it('should fall back to yarn when root package.json packageManager field is unrecognized', async () => {
+        mockDir.setContent({
+          'package.json': JSON.stringify({
+            name: 'foo',
+            packageManager: 'something-else@1.0.0',
+          }),
+        });
+
+        const { log } = await withLogCollector(async () => {
+          await detectPackageManager();
+        });
+
+        expect(mockYarnCreate).toHaveBeenCalledTimes(1);
+        expect(log).toHaveLength(1);
+      });
+
+      it('should fall back to yarn with available detection methods', async () => {
+        mockDir.setContent({
+          'package.json': JSON.stringify({
+            name: 'foo',
+          }),
+        });
+
+        const { log } = await withLogCollector(async () => {
+          await detectPackageManager();
+        });
+
+        expect(mockYarnCreate).toHaveBeenCalledTimes(1);
+        expect(log).toHaveLength(1);
+      });
+
+      it('should fall back to yarn with no package.json at all', async () => {
+        mockDir.setContent({});
+
+        const { log } = await withLogCollector(async () => {
+          await detectPackageManager();
+        });
+
+        expect(mockYarnCreate).toHaveBeenCalledTimes(1);
+        // extra log for the error reading package.json
+        expect(log).toHaveLength(2);
+      });
+    });
+  });
+});
diff --git a/packages/cli-node/src/pacman/PackageManager.ts b/packages/cli-node/src/pacman/PackageManager.ts
new file mode 100644
index 0000000000..fc0aaa2c97
--- /dev/null
+++ b/packages/cli-node/src/pacman/PackageManager.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Yarn } from './yarn';
+import { Lockfile } from './Lockfile';
+import { SpawnOptionsPartialEnv, paths } from '../util';
+import fs from 'fs-extra';
+
+/**
+ * Package info retrieved from the package manager, usually from NPM.
+ *
+ * @public
+ */
+export type PackageInfo = {
+  name: string;
+  'dist-tags': Record<string, string>;
+  versions: string[];
+  time: { [version: string]: string };
+};
+
+/**
+ * Represents the package manager in use by this instance of Backstage. This
+ * interface allows Backstage adopters to change the package manager used by
+ * their repo and still use the Backstage CLI, and it's helpful tooling.
+ *
+ * @public
+ */
+export interface PackageManager {
+  /** The name of the package manager. */
+  name(): string;
+
+  /** The self-reported version of the package manager. */
+  version(): string;
+
+  /** The file name of the lockfile used by the package manager. */
+  lockfileName(): string;
+
+  /**
+   * If this repo is a monorepo, returns the patterns specified by the package
+   * manager's monorepo configuration. Does not attempt to resolve any globs.
+   */
+  getMonorepoPackages(): Promise<string[]>;
+
+  /** Uses the package manager to run a command in the repo. */
+  run(args: string[], options?: SpawnOptionsPartialEnv): Promise<void>;
+
+  /**
+   * Executes the package manager's pack command to bundle the repo into an
+   * archive.
+   */
+  pack(output: string, packageDir: string): Promise<void>;
+
+  /** Fetches information about the given package, usually from NPM. */
+  fetchPackageInfo(name: string): Promise<PackageInfo>;
+
+  /** Reads the lockfile from the repo. See {@link Lockfile} */
+  loadLockfile(): Promise<Lockfile>;
+
+  /** Parses the given string as a {@link Lockfile}. */
+  parseLockfile(contents: string): Promise<Lockfile>;
+
+  /**
+   * Whether the package manager supports the 'backstage:^' version protocol.
+   */
+  supportsBackstageVersionProtocol(): Promise<boolean>;
+
+  /** A string representation of the package manager. */
+  toString(): string;
+}
+
+/**
+ * Uses several mechanisms to detect the currently used package manager. The
+ * detection methods are intended to be ordered roughly from fastest to slowest
+ * in order to make this method as fast as possible.
+ *
+ * @public
+ */
+export async function detectPackageManager(): Promise<PackageManager> {
+  const hasYarnLockfile = await fileExists(
+    paths.resolveTargetRoot('yarn.lock'),
+  );
+  if (hasYarnLockfile) {
+    return await Yarn.create();
+  }
+
+  try {
+    const packageJson = await fs.readJson(
+      paths.resolveTargetRoot('package.json'),
+    );
+    if (packageJson.workspaces) {
+      // technically this could be NPM as well
+      return await Yarn.create();
+    }
+
+    const declaredPacman = packageJson.packageManager;
+    if (declaredPacman) {
+      const [name, _version] = declaredPacman.split('@');
+      switch (name) {
+        case 'yarn':
+          return await Yarn.create();
+        default:
+          console.log(`Detected unsupported package manager: ${name}.`);
+          return await Yarn.create();
+      }
+    }
+  } catch (error) {
+    console.log(`Error during package manager detection: ${error}`);
+  }
+
+  // currently yarn is the only package manager supported so just log an error and use it anyway
+  console.log(
+    'Yarn was not detected, but is the only supported package manager.',
+  );
+  return await Yarn.create();
+}
+
+async function fileExists(filePath: string): Promise<boolean> {
+  try {
+    await fs.access(filePath);
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
diff --git a/packages/cli-node/src/pacman/index.ts b/packages/cli-node/src/pacman/index.ts
new file mode 100644
index 0000000000..4e8974d5f8
--- /dev/null
+++ b/packages/cli-node/src/pacman/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export type { PackageManager, PackageInfo } from './PackageManager';
+export type {
+  Lockfile,
+  LockfileEntry,
+  LockfileDiff,
+  LockfileDiffEntry,
+} from './Lockfile';
+
+export { detectPackageManager } from './PackageManager';
diff --git a/packages/cli-node/src/pacman/yarn/Yarn.test.ts b/packages/cli-node/src/pacman/yarn/Yarn.test.ts
new file mode 100644
index 0000000000..9584ef54b2
--- /dev/null
+++ b/packages/cli-node/src/pacman/yarn/Yarn.test.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { Yarn } from './Yarn';
+
+const mockDir = createMockDirectory();
+
+jest.mock('../../util', () => ({
+  ...jest.requireActual('../../util'),
+  paths: { resolveTargetRoot: (...args: string[]) => mockDir.resolve(...args) },
+}));
+
+const yarnClassic = new Yarn({ version: '1.0.0', codename: 'classic' });
+const yarnBerry = new Yarn({ version: '3.0.0', codename: 'berry' });
+const allYarnVersions = [yarnClassic, yarnBerry];
+
+describe('Yarn', () => {
+  describe.each(allYarnVersions)('%s.getMonorepoPackages', yarn => {
+    it('should detect a monorepo', async () => {
+      mockDir.setContent({
+        'package.json': JSON.stringify({
+          name: 'foo',
+          workspaces: {
+            packages: ['packages/*'],
+          },
+        }),
+      });
+      await expect(yarn.getMonorepoPackages()).resolves.toEqual(['packages/*']);
+    });
+
+    it('should detect a non-monorepo', async () => {
+      mockDir.setContent({
+        'package.json': JSON.stringify({
+          name: 'foo',
+        }),
+      });
+      await expect(yarn.getMonorepoPackages()).resolves.toEqual([]);
+    });
+
+    it('should return false if package.json is missing', async () => {
+      mockDir.setContent({});
+      await expect(yarn.getMonorepoPackages()).resolves.toEqual([]);
+    });
+  });
+});
diff --git a/packages/cli-node/src/pacman/yarn/Yarn.ts b/packages/cli-node/src/pacman/yarn/Yarn.ts
new file mode 100644
index 0000000000..0a2b8d55ea
--- /dev/null
+++ b/packages/cli-node/src/pacman/yarn/Yarn.ts
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  assertError,
+  ForwardedError,
+  NotImplementedError,
+} from '@backstage/errors';
+import { PackageInfo, PackageManager } from '../PackageManager';
+import { Lockfile } from '../Lockfile';
+import { YarnVersion } from './types';
+import fs from 'fs-extra';
+import { paths, run, execFile, SpawnOptionsPartialEnv } from '../../util';
+
+export class Yarn implements PackageManager {
+  constructor(private readonly yarnVersion: YarnVersion) {}
+
+  static async create(dir?: string): Promise<Yarn> {
+    const yarnVersion = await detectYarnVersion(dir);
+    return new Yarn(yarnVersion);
+  }
+
+  name() {
+    return 'yarn';
+  }
+
+  version() {
+    return this.yarnVersion.version;
+  }
+
+  lockfileName(): string {
+    return 'yarn.lock';
+  }
+
+  async getMonorepoPackages() {
+    const rootPackageJsonPath = paths.resolveTargetRoot('package.json');
+    try {
+      const pkg = await fs.readJson(rootPackageJsonPath);
+      return pkg?.workspaces?.packages || [];
+    } catch (error) {
+      return [];
+    }
+  }
+
+  async pack(out: string, packageDir: string) {
+    const outArg =
+      this.yarnVersion.codename === 'classic' ? '--filename' : '--out';
+    await this.run(['pack', outArg, out], {
+      cwd: packageDir,
+    });
+  }
+
+  async run(args: string[], options?: SpawnOptionsPartialEnv) {
+    await run('yarn', args, options);
+  }
+
+  async fetchPackageInfo(): Promise<PackageInfo> {
+    throw new NotImplementedError();
+  }
+
+  async loadLockfile(): Promise<Lockfile> {
+    throw new NotImplementedError();
+  }
+
+  async parseLockfile(): Promise<Lockfile> {
+    throw new NotImplementedError();
+  }
+
+  async supportsBackstageVersionProtocol(): Promise<boolean> {
+    throw new NotImplementedError();
+  }
+
+  toString(): string {
+    return `${this.name()}@${this.yarnVersion.version}`;
+  }
+}
+
+const versions = new Map<string, Promise<YarnVersion>>();
+
+function detectYarnVersion(dir?: string): Promise<YarnVersion> {
+  const cwd = dir ?? process.cwd();
+  if (versions.has(cwd)) {
+    return versions.get(cwd)!;
+  }
+
+  const promise = Promise.resolve().then(async () => {
+    try {
+      const { stdout } = await execFile('yarn', ['--version'], {
+        shell: true,
+        cwd,
+      });
+      const versionString = stdout.trim();
+      const codename: 'classic' | 'berry' = versionString.startsWith('1.')
+        ? 'classic'
+        : 'berry';
+      return { version: versionString, codename };
+    } catch (error) {
+      assertError(error);
+      if ('stderr' in error) {
+        process.stderr.write(error.stderr as Buffer);
+      }
+      throw new ForwardedError('Failed to determine yarn version', error);
+    }
+  });
+
+  versions.set(cwd, promise);
+  return promise;
+}
diff --git a/packages/cli-node/src/pacman/yarn/index.ts b/packages/cli-node/src/pacman/yarn/index.ts
new file mode 100644
index 0000000000..a0998d50c4
--- /dev/null
+++ b/packages/cli-node/src/pacman/yarn/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { Yarn } from './Yarn';
diff --git a/packages/cli-node/src/pacman/yarn/types.ts b/packages/cli-node/src/pacman/yarn/types.ts
new file mode 100644
index 0000000000..f7ba98f706
--- /dev/null
+++ b/packages/cli-node/src/pacman/yarn/types.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export type YarnVersion = {
+  codename: 'classic' | 'berry';
+  version: string;
+};
diff --git a/packages/cli-node/src/util.ts b/packages/cli-node/src/util.ts
new file mode 100644
index 0000000000..eaf05855b1
--- /dev/null
+++ b/packages/cli-node/src/util.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  ChildProcess,
+  execFile as execFileCb,
+  spawn,
+  SpawnOptions,
+} from 'child_process';
+import { promisify } from 'util';
+import { findPaths } from '@backstage/cli-common';
+import { ExitCodeError } from './errors';
+
+export const execFile = promisify(execFileCb);
+
+/* eslint-disable-next-line no-restricted-syntax */
+export const paths = findPaths(__dirname);
+
+/**
+ * A function that can be used to log data from a child process
+ *
+ * @public
+ */
+export type LogFunc = (data: Buffer) => void;
+
+/**
+ * Options for running a child process
+ *
+ * @public
+ */
+export type SpawnOptionsPartialEnv = Omit<SpawnOptions, 'env'> & {
+  env?: Partial<NodeJS.ProcessEnv>;
+  // Pipe stdout to this log function
+  stdoutLogFunc?: LogFunc;
+  // Pipe stderr to this log function
+  stderrLogFunc?: LogFunc;
+};
+
+// Runs a child command, returning a promise that is only resolved if the child exits with code 0.
+export async function run(
+  name: string,
+  args: string[] = [],
+  options: SpawnOptionsPartialEnv = {},
+) {
+  const { stdoutLogFunc, stderrLogFunc } = options;
+  const env: NodeJS.ProcessEnv = {
+    ...process.env,
+    FORCE_COLOR: 'true',
+    ...(options.env ?? {}),
+  };
+
+  const stdio = [
+    'inherit',
+    stdoutLogFunc ? 'pipe' : 'inherit',
+    stderrLogFunc ? 'pipe' : 'inherit',
+  ] as ('inherit' | 'pipe')[];
+
+  const child = spawn(name, args, {
+    stdio,
+    shell: true,
+    ...options,
+    env,
+  });
+
+  if (stdoutLogFunc && child.stdout) {
+    child.stdout.on('data', stdoutLogFunc);
+  }
+  if (stderrLogFunc && child.stderr) {
+    child.stderr.on('data', stderrLogFunc);
+  }
+
+  await waitForExit(child, name);
+}
+
+async function waitForExit(
+  child: ChildProcess & { exitCode: number | null },
+  name?: string,
+): Promise<void> {
+  if (typeof child.exitCode === 'number') {
+    if (child.exitCode) {
+      throw new ExitCodeError(child.exitCode, name);
+    }
+    return;
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    child.once('error', error => reject(error));
+    child.once('exit', code => {
+      if (code) {
+        reject(new ExitCodeError(code, name));
+      } else {
+        resolve();
+      }
+    });
+  });
+}
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index b3c94f04f0..f8dd593d52 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,254 @@
 # @backstage/cli
 
+## 0.29.3-next.2
+
+### Patch Changes
+
+- 62a9062: Updated dependency `@module-federation/enhanced` to `^0.8.0`.
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/types@1.2.0
+
+## 0.29.3-next.1
+
+### Patch Changes
+
+- a49030a: Add support for `--output-file` option from ESLint to `package lint` and `repo lint` commands.
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## 0.29.3-next.0
+
+### Patch Changes
+
+- 2b6c1ea: If the Backstage yarn plugin is installed, it will now be automatically updated as part of `versions:bump`.
+- 7dcff85: Remove special-casing for `@types` packages when generating dependency entries
+  during templating
+- 0aff006: Bumped the version range for `html-webpack-plugin` to fix the `htmlPluginExports.getCompilationHooks is not a function` error when using experimental Rspack.
+- 583f3d4: Added `@backstage/cli/config/prettier` as a replacement for `@spotify/prettier-config`, but with the same configuration.
+- 5f04976: Update `rollup` to avoid issues with build output when running `backstage-cli package build`.
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/release-manifests@0.0.12-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/types@1.2.0
+
+## 0.29.0
+
+### Minor Changes
+
+- bc47b17: **BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
+- 6819f8c: Added a new optimization to the `repo test` command that will filter out unused packages in watch mode if all provide filters are paths that point from the repo root. This significantly speeds up running individual tests from the repo root in a large workspace, for example:
+
+  ```sh
+  yarn test packages/app/src/App.test.tsx
+  ```
+
+- d849865: The package packing now populates `typesVersions` for additional entry points rather than using additional `package.json` files for type resolution. This improves auto completion of separate entry points when consuming published packages.
+- bc71665: **BREAKING**: The `LEGACY_BACKEND_START` flag has been removed, along with support for `src/run.ts` as the development entry point.
+
+### Patch Changes
+
+- 4046d53: Fixed an issue where the `--successCache` option for the `repo test` and `repo lint` commands would be include the workspace path in generated cache keys. This previously broke caching in environments where the workspace path varies across builds.
+- 4a378d3: Fix dev server reloads of plugin discovery for new frontend system.
+- 28b60ad: The check for `react-dom/client` in the Jest configuration will now properly always run from the target directory.
+- 6b2888c: Fixed an issue with the `--successCache` flag for `repo test` where the tree hash for the wrong package directory would sometimes be used to generate the cache key.
+- e30b65d: Added `--alwaysPack` as a replacement for the now hidden `--alwaysYarnPack` flag for the `build-workspace` command.
+- be0278e: Removed circular import
+- a7f97e4: Added a new `"rejectFrontendNetworkRequests"` configuration flag that can be set in the `"jest"` field in the root `package.json`:
+
+  ```json
+  {
+    "jest": {
+      "rejectFrontendNetworkRequests": true
+    }
+  }
+  ```
+
+  This flag causes rejection of any form of network requests that are attempted to be made in frontend or common package tests. This flag can only be set in the root `package.json` and can not be overridden in individual package configurations.
+
+- 6c48ebd: Add `--max-warnings -1` support to `backstage-cli package lint`
+- 04297a0: The `--successCache` option for the `repo test` and `repo lint` commands now use an additive store that keeps old entries around for a week before they are cleaned up automatically.
+- a2f0559: When using the experimental Rspack flag the app build and dev server now injects configuration via a `<script type="backstage.io/config">...</script>` tag in `index.html` rather than the `process.env.APP_CONFIG` definition, which will now be defined as an empty array instead.
+
+  This requires the app to be using the config loader from the 1.31 release of Backstage. Make sure your app is using at least that version if you are upgrading to this version of the CLI.
+
+  If you have copied the implementation of the `defaultConfigLoader`, make sure to update it to the new implementation. In particular the config loader needs to be able to read configuration from `script` tags with the type `backstage.io/config`.
+
+- b4627f2: Fixed an issue where the `raw-loader` for loading HTML templates was not resolved from the context of the CLI package.
+- cd1ef2b: Updated dependency `vite` to `^5.0.0`.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- b533056: Updated dependency `css-loader` to `^7.0.0`.
+- be008c3: Updated dependency `@module-federation/enhanced` to `^0.7.0`.
+- 6266ed3: Updated dependency `del` to `^8.0.0`.
+- 4046d53: Fixed an issue with the `repo lint` command where the cache key for the `--successCache` option would not properly ignore files that should be ignored according to `.eslintignore`s.
+- e19c53c: Fix for the `--link` flag for `package start` to deduplicate `react-router` and `react-router-dom`.
+- 17850a5: Update upgrade-helper link in `versions:bump` command to include `yarnPlugin` parameter when the yarn plugin is installed
+- 09ea093: Fixed an issue where `.css` style injection would fail for published packages.
+- 702f41d: Bumped dev dependencies `@types/node`
+- 5d74716: Remove unused backend-common dependency
+- b084f5a: Bump the Webpack dependency range to `^5.94.0`, as our current configuration is not compatible with some older versions.
+- e565f73: Added support for `.webp` files in the frontend tooling.
+- 946fa34: Added a new `--link <workspace-path>` option for frontend builds that allow you to override module resolution to link in an external workspace at runtime.
+
+  As part of this change the Webpack linked workspace resolution plugin for frontend builds has been removed. It was in place to support the old workspace linking where it was done by Yarn, which is no longer a working option.
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.2
+  - @backstage/release-manifests@0.0.11
+
+## 0.29.0-next.3
+
+### Minor Changes
+
+- d849865: The package packing now populates `typesVersions` for additional entry points rather than using additional `package.json` files for type resolution. This improves auto completion of separate entry points when consuming published packages.
+
+### Patch Changes
+
+- 4a378d3: Fix dev server reloads of plugin discovery for new frontend system.
+- 6c48ebd: Add `--max-warnings -1` support to `backstage-cli package lint`
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- b533056: Updated dependency `css-loader` to `^7.0.0`.
+- be008c3: Updated dependency `@module-federation/enhanced` to `^0.7.0`.
+- 09ea093: Fixed an issue where `.css` style injection would fail for published packages.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## 0.29.0-next.2
+
+### Minor Changes
+
+- bc47b17: **BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
+
+### Patch Changes
+
+- e19c53c: Fix for the `--link` flag for `package start` to deduplicate `react-router` and `react-router-dom`.
+- e565f73: Added support for `.webp` files in the frontend tooling.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## 0.29.0-next.1
+
+### Minor Changes
+
+- 6819f8c: Added a new optimization to the `repo test` command that will filter out unused packages in watch mode if all provide filters are paths that point from the repo root. This significantly speeds up running individual tests from the repo root in a large workspace, for example:
+
+  ```sh
+  yarn test packages/app/src/App.test.tsx
+  ```
+
+### Patch Changes
+
+- 4046d53: Fixed an issue where the `--successCache` option for the `repo test` and `repo lint` commands would be include the workspace path in generated cache keys. This previously broke caching in environments where the workspace path varies across builds.
+- 6b2888c: Fixed an issue with the `--successCache` flag for `repo test` where the tree hash for the wrong package directory would sometimes be used to generate the cache key.
+- 6266ed3: Updated dependency `del` to `^8.0.0`.
+- 4046d53: Fixed an issue with the `repo lint` command where the cache key for the `--successCache` option would not properly ignore files that should be ignored according to `.eslintignore`s.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## 0.29.0-next.0
+
+### Minor Changes
+
+- bc71665: **BREAKING**: The `LEGACY_BACKEND_START` flag has been removed, along with support for `src/run.ts` as the development entry point.
+
+### Patch Changes
+
+- 28b60ad: The check for `react-dom/client` in the Jest configuration will now properly always run from the target directory.
+- e30b65d: Added `--alwaysPack` as a replacement for the now hidden `--alwaysYarnPack` flag for the `build-workspace` command.
+- a7f97e4: Added a new `"rejectFrontendNetworkRequests"` configuration flag that can be set in the `"jest"` field in the root `package.json`:
+
+  ```json
+  {
+    "jest": {
+      "rejectFrontendNetworkRequests": true
+    }
+  }
+  ```
+
+  This flag causes rejection of any form of network requests that are attempted to be made in frontend or common package tests. This flag can only be set in the root `package.json` and can not be overridden in individual package configurations.
+
+- 04297a0: The `--successCache` option for the `repo test` and `repo lint` commands now use an additive store that keeps old entries around for a week before they are cleaned up automatically.
+- b4627f2: Fixed an issue where the `raw-loader` for loading HTML templates was not resolved from the context of the CLI package.
+- 17850a5: Update upgrade-helper link in `versions:bump` command to include `yarnPlugin` parameter when the yarn plugin is installed
+- b084f5a: Bump the Webpack dependency range to `^5.94.0`, as our current configuration is not compatible with some older versions.
+- 946fa34: Added a new `--link <workspace-path>` option for frontend builds that allow you to override module resolution to link in an external workspace at runtime.
+
+  As part of this change the Webpack linked workspace resolution plugin for frontend builds has been removed. It was in place to support the old workspace linking where it was done by Yarn, which is no longer a working option.
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
 ## 0.28.0
 
 ### Minor Changes
diff --git a/packages/cli-node/src/run.ts b/packages/cli/bin/backstage-cli-alpha
old mode 100644
new mode 100755
similarity index 81%
rename from packages/cli-node/src/run.ts
rename to packages/cli/bin/backstage-cli-alpha
index e924b5c5b8..38a2df3319
--- a/packages/cli-node/src/run.ts
+++ b/packages/cli/bin/backstage-cli-alpha
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2020 The Backstage Authors
  *
@@ -14,7 +15,5 @@
  * limitations under the License.
  */
 
-import { execFile as execFileCb } from 'child_process';
-import { promisify } from 'util';
-
-export const execFile = promisify(execFileCb);
+require('@backstage/cli/config/nodeTransform.cjs');
+require('../src/alpha');
diff --git a/packages/cli/cli-report.md b/packages/cli/cli-report.md
index e17af5a312..d9fec4db22 100644
--- a/packages/cli/cli-report.md
+++ b/packages/cli/cli-report.md
@@ -236,6 +236,7 @@ Usage: backstage-cli package lint [options] [directories...]
 
 Options:
   --format <format>
+  --output-file <path>
   --fix
   --max-warnings <number>
   -h, --help
@@ -271,6 +272,7 @@ Options:
   --inspect [host]
   --inspect-brk [host]
   --require <path>
+  --link <path>
   -h, --help
 ```
 
@@ -445,6 +447,7 @@ Usage: backstage-cli repo lint [options]
 
 Options:
   --format <format>
+  --output-file <path>
   --since <ref>
   --successCache
   --successCacheDir <path>
diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index 856068eef9..3ae455c4b8 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -167,7 +167,7 @@ function createConfig(dir, extraConfig = {}) {
         },
       },
       {
-        files: ['**/src/generated/**/*.ts'],
+        files: ['**/src/**/generated/**/*.ts'],
         rules: {
           ...tsRules,
           'no-unused-vars': 'off',
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index b6d945c119..45d744d7bc 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -213,7 +213,7 @@ async function getProjectConfig(targetPath, extraConfig, extraOptions) {
           },
         },
       ],
-      '\\.(bmp|gif|jpg|jpeg|png|ico|frag|xml|svg|eot|woff|woff2|ttf)$':
+      '\\.(bmp|gif|jpg|jpeg|png|ico|webp|frag|xml|svg|eot|woff|woff2|ttf)$':
         require.resolve('./jestFileTransform.js'),
       '\\.(yaml)$': require.resolve('./jestYamlTransform'),
     },
@@ -264,7 +264,7 @@ async function getProjectConfig(targetPath, extraConfig, extraOptions) {
       .createHash('sha256')
       .update(version)
       .update(Buffer.alloc(1))
-      .update(JSON.stringify(config.transform))
+      .update(JSON.stringify(config.transform).replaceAll(paths.targetRoot, ''))
       .digest('hex');
     config.id = `backstage_cli_${configHash}`;
   }
@@ -326,7 +326,7 @@ async function getRootConfig() {
     ),
   ).then(_ => _.flat());
 
-  let configs = await Promise.all(
+  let projects = await Promise.all(
     projectPaths.flat().map(async projectPath => {
       const packagePath = path.resolve(projectPath, 'package.json');
       if (!(await fs.pathExists(packagePath))) {
@@ -357,12 +357,16 @@ async function getRootConfig() {
 
   const cache = global.__backstageCli_jestSuccessCache;
   if (cache) {
-    configs = await cache.filterConfigs(configs, globalRootConfig);
+    projects = await cache.filterConfigs(projects, globalRootConfig);
+  }
+  const watchProjectFilter = global.__backstageCli_watchProjectFilter;
+  if (watchProjectFilter) {
+    projects = await watchProjectFilter.filter(projects);
   }
 
   return {
     rootDir: paths.targetRoot,
-    projects: configs,
+    projects,
     testResultsProcessor: cache
       ? require.resolve('./jestCacheResultProcessor.cjs')
       : undefined,
diff --git a/packages/cli/config/nodeTransform.cjs b/packages/cli/config/nodeTransform.cjs
index a5eb4e8fb0..1cf79cb1bb 100644
--- a/packages/cli/config/nodeTransform.cjs
+++ b/packages/cli/config/nodeTransform.cjs
@@ -16,6 +16,39 @@
 
 const { transformSync } = require('@swc/core');
 const { addHook } = require('pirates');
+const { Module } = require('module');
+
+// This hooks into module resolution and overrides imports of packages that
+// exist in the linked workspace to instead be resolved from the linked workspace.
+if (process.env.BACKSTAGE_CLI_LINKED_WORKSPACE) {
+  const { join: joinPath } = require('path');
+  const { getPackagesSync } = require('@manypkg/get-packages');
+  const { packages: linkedPackages, root: linkedRoot } = getPackagesSync(
+    process.env.BACKSTAGE_CLI_LINKED_WORKSPACE,
+  );
+
+  // Matches all packages in the linked workspaces, as well as sub-path exports from them
+  const replacementRegex = new RegExp(
+    `^(?:${linkedPackages
+      .map(pkg => pkg.packageJson.name)
+      .join('|')})(?:/.*)?$`,
+  );
+
+  const origLoad = Module._load;
+  Module._load = function requireHook(request, parent) {
+    if (!replacementRegex.test(request)) {
+      return origLoad.call(this, request, parent);
+    }
+
+    // The package import that we're overriding will always existing in the root
+    // node_modules of the linked workspace, so it's enough to override the
+    // parent paths with that single entry
+    return origLoad.call(this, request, {
+      ...parent,
+      paths: [joinPath(linkedRoot.dir, 'node_modules')],
+    });
+  };
+}
 
 addHook(
   (code, filename) => {
diff --git a/packages/cli/config/prettier.json b/packages/cli/config/prettier.json
new file mode 100644
index 0000000000..5393aaf2da
--- /dev/null
+++ b/packages/cli/config/prettier.json
@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "avoid"
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index b61d3c7149..e5ad8f0d8f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.28.0",
+  "version": "0.29.3-next.2",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -53,7 +53,7 @@
     "@backstage/release-manifests": "workspace:^",
     "@backstage/types": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
-    "@module-federation/enhanced": "^0.6.0",
+    "@module-federation/enhanced": "^0.8.0",
     "@octokit/graphql": "^5.0.0",
     "@octokit/graphql-schema": "^13.7.0",
     "@octokit/oauth-app": "^4.2.0",
@@ -88,7 +88,7 @@
     "commander": "^12.0.0",
     "cross-fetch": "^4.0.0",
     "cross-spawn": "^7.0.3",
-    "css-loader": "^6.5.1",
+    "css-loader": "^7.0.0",
     "ctrlc-windows": "^2.1.0",
     "esbuild": "^0.24.0",
     "esbuild-loader": "^4.0.0",
@@ -111,7 +111,7 @@
     "global-agent": "^3.0.0",
     "globby": "^11.1.0",
     "handlebars": "^4.7.3",
-    "html-webpack-plugin": "^5.3.1",
+    "html-webpack-plugin": "^5.6.3",
     "inquirer": "^8.2.0",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
@@ -122,7 +122,6 @@
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.4.2",
     "minimatch": "^9.0.0",
-    "node-fetch": "^2.7.0",
     "node-libs-browser": "^2.2.1",
     "npm-packlist": "^5.0.0",
     "ora": "^5.3.0",
@@ -136,7 +135,7 @@
     "react-refresh": "^0.14.0",
     "recursive-readdir": "^2.2.2",
     "replace-in-file": "^7.1.0",
-    "rollup": "^4.0.0",
+    "rollup": "^4.27.3",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-postcss": "^4.0.0",
@@ -147,7 +146,7 @@
     "swc-loader": "^0.2.3",
     "tar": "^6.1.12",
     "terser-webpack-plugin": "^5.1.3",
-    "ts-morph": "^23.0.0",
+    "ts-morph": "^24.0.0",
     "util": "^0.12.3",
     "webpack": "^5.94.0",
     "webpack-dev-server": "^5.0.0",
@@ -158,7 +157,6 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
@@ -184,7 +182,7 @@
     "@types/fs-extra": "^11.0.0",
     "@types/http-proxy": "^1.17.4",
     "@types/inquirer": "^8.1.3",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.16.0",
     "@types/npm-packlist": "^3.0.0",
     "@types/recursive-readdir": "^2.2.0",
     "@types/rollup-plugin-peer-deps-external": "^2.2.0",
@@ -195,7 +193,7 @@
     "@types/webpack-sources": "^3.2.3",
     "@types/yarnpkg__lockfile": "^1.1.4",
     "@vitejs/plugin-react": "^4.3.1",
-    "del": "^7.0.0",
+    "del": "^8.0.0",
     "msw": "^1.0.0",
     "nodemon": "^3.0.1",
     "vite": "^5.0.0",
@@ -208,7 +206,7 @@
     "@rspack/dev-server": "^1.0.9",
     "@rspack/plugin-react-refresh": "^1.0.0",
     "@vitejs/plugin-react": "^4.0.4",
-    "vite": "^4.4.9",
+    "vite": "^5.0.0",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-node-polyfills": "^0.22.0"
   },
diff --git a/packages/cli/src/alpha.ts b/packages/cli/src/alpha.ts
new file mode 100644
index 0000000000..4b2cfa4842
--- /dev/null
+++ b/packages/cli/src/alpha.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CliInitializer } from './wiring/CliInitializer';
+import chalk from 'chalk';
+
+(async () => {
+  console.warn(
+    chalk.yellow(
+      'THIS ENTRYPOINT IS IN ALPHA AND MAY CHANGE IN THE FUTURE - DO NOT USE THIS FOR NORMAL DEVELOPMENT',
+    ),
+  );
+  const initializer = new CliInitializer();
+  initializer.add(import('./modules/config/alpha').then(m => m.default));
+  await initializer.run();
+})();
diff --git a/packages/cli/src/commands/build/buildFrontend.ts b/packages/cli/src/commands/build/buildFrontend.ts
index 59f3225738..0ba0669c32 100644
--- a/packages/cli/src/commands/build/buildFrontend.ts
+++ b/packages/cli/src/commands/build/buildFrontend.ts
@@ -18,7 +18,7 @@ import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
 import { buildBundle, getModuleFederationOptions } from '../../lib/bundler';
 import { getEnvironmentParallelism } from '../../lib/parallel';
-import { loadCliConfig } from '../../lib/config';
+import { loadCliConfig } from '../../modules/config/lib/config';
 
 interface BuildAppOptions {
   targetDir: string;
diff --git a/packages/cli/src/commands/create-github-app/index.ts b/packages/cli/src/commands/create-github-app/index.ts
index 681b471c91..105a6b4c24 100644
--- a/packages/cli/src/commands/create-github-app/index.ts
+++ b/packages/cli/src/commands/create-github-app/index.ts
@@ -20,7 +20,6 @@ import { stringify as stringifyYaml } from 'yaml';
 import inquirer, { Question, Answers } from 'inquirer';
 import { paths } from '../../lib/paths';
 import { GithubCreateAppServer } from './GithubCreateAppServer';
-import fetch from 'node-fetch';
 import openBrowser from 'react-dev-utils/openBrowser';
 
 // This is an experimental command that at this point does not support GitHub Enterprise
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index 369138cb1a..0f38fc1e8a 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -15,15 +15,11 @@
  */
 
 import { Command, Option } from 'commander';
-import { assertError } from '@backstage/errors';
-import { exitWithError } from '../lib/errors';
-
-const configOption = [
-  '--config <path>',
-  'Config files to load instead of app-config.yaml',
-  (opt: string, opts: string[]) => (opts ? [...opts, opt] : [opt]),
-  Array<string>(),
-] as const;
+import { lazy } from '../lib/lazy';
+import {
+  configOption,
+  registerCommands as registerConfigCommands,
+} from '../modules/config';
 
 export function registerRepoCommand(program: Command) {
   const command = program
@@ -57,6 +53,10 @@ export function registerRepoCommand(program: Command) {
       'Lint report output format',
       'eslint-formatter-friendly',
     )
+    .option(
+      '--output-file <path>',
+      'Write the lint report to a file instead of stdout',
+    )
     .option(
       '--since <ref>',
       'Only lint packages that changed since the specified ref',
@@ -138,6 +138,7 @@ export function registerScriptCommand(program: Command) {
       'Enable debugger in Node.js environments, breaking before code starts',
     )
     .option('--require <path>', 'Add a --require argument to the node process')
+    .option('--link <path>', 'Link an external workspace for module resolution')
     .action(lazy(() => import('./start').then(m => m.command)));
 
   command
@@ -171,10 +172,14 @@ export function registerScriptCommand(program: Command) {
       'Lint report output format',
       'eslint-formatter-friendly',
     )
+    .option(
+      '--output-file <path>',
+      'Write the lint report to a file instead of stdout',
+    )
     .option('--fix', 'Attempt to automatically fix violations')
     .option(
       '--max-warnings <number>',
-      'Fail if more than this number of warnings (default: 0)',
+      'Fail if more than this number of warnings. -1 allows warnings. (default: 0)',
     )
     .description('Lint a package')
     .action(lazy(() => import('./lint').then(m => m.default)));
@@ -278,66 +283,7 @@ export function registerCommands(program: Command) {
     .option('--no-private', 'Do not mark new packages as private')
     .action(lazy(() => import('./new/new').then(m => m.default)));
 
-  program
-    .command('config:docs')
-    .option(
-      '--package <name>',
-      'Only include the schema that applies to the given package',
-    )
-    .description('Browse the configuration reference documentation')
-    .action(lazy(() => import('./config/docs').then(m => m.default)));
-
-  program
-    .command('config:print')
-    .option(
-      '--package <name>',
-      'Only load config schema that applies to the given package',
-    )
-    .option('--lax', 'Do not require environment variables to be set')
-    .option('--frontend', 'Print only the frontend configuration')
-    .option('--with-secrets', 'Include secrets in the printed configuration')
-    .option(
-      '--format <format>',
-      'Format to print the configuration in, either json or yaml [yaml]',
-    )
-    .option(...configOption)
-    .description('Print the app configuration for the current package')
-    .action(lazy(() => import('./config/print').then(m => m.default)));
-
-  program
-    .command('config:check')
-    .option(
-      '--package <name>',
-      'Only load config schema that applies to the given package',
-    )
-    .option('--lax', 'Do not require environment variables to be set')
-    .option('--frontend', 'Only validate the frontend configuration')
-    .option('--deprecated', 'Output deprecated configuration settings')
-    .option(
-      '--strict',
-      'Enable strict config validation, forbidding errors and unknown keys',
-    )
-    .option(...configOption)
-    .description(
-      'Validate that the given configuration loads and matches schema',
-    )
-    .action(lazy(() => import('./config/validate').then(m => m.default)));
-
-  program
-    .command('config:schema')
-    .option(
-      '--package <name>',
-      'Only output config schema that applies to the given package',
-    )
-    .option(
-      '--format <format>',
-      'Format to print the schema in, either json or yaml [yaml]',
-    )
-    .option('--merge', 'Print the config schemas merged', true)
-    .option('--no-merge', 'Print the config schemas not merged')
-    .description('Print configuration schema')
-    .action(lazy(() => import('./config/schema').then(m => m.default)));
-
+  registerConfigCommands(program);
   registerRepoCommand(program);
   registerScriptCommand(program);
   registerMigrateCommand(program);
@@ -443,20 +389,3 @@ function removed(message?: string) {
     process.exit(1);
   };
 }
-
-// Wraps an action function so that it always exits and handles errors
-function lazy(
-  getActionFunc: () => Promise<(...args: any[]) => Promise<void>>,
-): (...args: any[]) => Promise<never> {
-  return async (...args: any[]) => {
-    try {
-      const actionFunc = await getActionFunc();
-      await actionFunc(...args);
-
-      process.exit(0);
-    } catch (error) {
-      assertError(error);
-      exitWithError(error);
-    }
-  };
-}
diff --git a/packages/cli/src/commands/lint.ts b/packages/cli/src/commands/lint.ts
index 8816221fb4..8c8877c19c 100644
--- a/packages/cli/src/commands/lint.ts
+++ b/packages/cli/src/commands/lint.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import fs from 'fs-extra';
 import { OptionValues } from 'commander';
 import { paths } from '../lib/paths';
 import { ESLint } from 'eslint';
@@ -30,11 +31,13 @@ export default async (directories: string[], opts: OptionValues) => {
   );
 
   const maxWarnings = opts.maxWarnings ?? 0;
+  const ignoreWarnings = +maxWarnings === -1;
 
   const failed =
     results.some(r => r.errorCount > 0) ||
-    results.reduce((current, next) => current + next.warningCount, 0) >
-      maxWarnings;
+    (!ignoreWarnings &&
+      results.reduce((current, next) => current + next.warningCount, 0) >
+        maxWarnings);
 
   if (opts.fix) {
     await ESLint.outputFixes(results);
@@ -47,10 +50,14 @@ export default async (directories: string[], opts: OptionValues) => {
     process.chdir(paths.targetRoot);
   }
 
-  const resultText = formatter.format(results);
+  const resultText = await formatter.format(results);
 
   if (resultText) {
-    console.log(resultText);
+    if (opts.outputFile) {
+      await fs.writeFile(paths.resolveTarget(opts.outputFile), resultText);
+    } else {
+      console.log(resultText);
+    }
   }
 
   if (failed) {
diff --git a/packages/cli/src/commands/repo/lint.ts b/packages/cli/src/commands/repo/lint.ts
index 9b1ce4ee3e..f78b51ea5d 100644
--- a/packages/cli/src/commands/repo/lint.ts
+++ b/packages/cli/src/commands/repo/lint.ts
@@ -15,6 +15,7 @@
  */
 
 import chalk from 'chalk';
+import fs from 'fs-extra';
 import { Command, OptionValues } from 'commander';
 import { createHash } from 'crypto';
 import { relative as relativePath } from 'path';
@@ -125,8 +126,7 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
       const globby = require('globby') as typeof import('globby');
       const { readFile } =
         require('fs/promises') as typeof import('fs/promises');
-      const { relative: workerRelativePath } =
-        require('path') as typeof import('path');
+      const workerPath = require('path') as typeof import('path');
 
       return async ({
         fullDir,
@@ -163,15 +163,20 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
           hash.update('\0');
 
           for (const path of result.sort()) {
-            if (await eslint.isPathIgnored(path)) {
+            const absPath = workerPath.resolve(rootDir, path);
+            const pathInPackage = workerPath.relative(fullDir, absPath);
+
+            if (await eslint.isPathIgnored(pathInPackage)) {
               continue;
             }
-            hash.update(workerRelativePath(fullDir, path));
+            hash.update(pathInPackage);
             hash.update('\0');
-            hash.update(await readFile(path));
+            hash.update(await readFile(absPath));
             hash.update('\0');
             hash.update(
-              JSON.stringify(await eslint.calculateConfigForFile(path)),
+              JSON.stringify(
+                await eslint.calculateConfigForFile(pathInPackage),
+              ).replaceAll(rootDir, ''),
             );
             hash.update('\0');
           }
@@ -195,11 +200,14 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
         }
 
         const maxWarnings = lintOptions?.maxWarnings ?? 0;
+        const ignoreWarnings = +maxWarnings === -1;
+
         const resultText = formatter.format(results) as string;
         const failed =
           results.some(r => r.errorCount > 0) ||
-          results.reduce((current, next) => current + next.warningCount, 0) >
-            maxWarnings;
+          (!ignoreWarnings &&
+            results.reduce((current, next) => current + next.warningCount, 0) >
+              maxWarnings);
 
         return {
           relativeDir,
@@ -213,6 +221,8 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
 
   const outputSuccessCache = [];
 
+  let errorOutput = '';
+
   let failed = false;
   for (const {
     relativeDir,
@@ -227,14 +237,22 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
       // When doing repo lint, only list the results if the lint failed to avoid a log
       // dump of all warnings that might be irrelevant
       if (resultText) {
-        console.log();
-        console.log(resultText.trimStart());
+        if (opts.outputFile) {
+          errorOutput += `${resultText}\n`;
+        } else {
+          console.log();
+          console.log(resultText.trimStart());
+        }
       }
     } else if (sha) {
       outputSuccessCache.push(sha);
     }
   }
 
+  if (opts.outputFile && errorOutput) {
+    await fs.writeFile(paths.resolveTargetRoot(opts.outputFile), errorOutput);
+  }
+
   if (cacheContext) {
     await cache.write(outputSuccessCache);
   }
diff --git a/packages/cli/src/commands/repo/test.ts b/packages/cli/src/commands/repo/test.ts
index 1035354eb2..6b3478b5d9 100644
--- a/packages/cli/src/commands/repo/test.ts
+++ b/packages/cli/src/commands/repo/test.ts
@@ -17,6 +17,7 @@
 import os from 'os';
 import crypto from 'node:crypto';
 import yargs from 'yargs';
+import { run as runJest, yargsOptions as jestYargsOptions } from 'jest-cli';
 import { relative as relativePath } from 'path';
 import { Command, OptionValues } from 'commander';
 import { Lockfile, PackageGraph } from '@backstage/cli-node';
@@ -27,9 +28,10 @@ import { SuccessCache } from '../../lib/cache/SuccessCache';
 
 type JestProject = {
   displayName: string;
+  rootDir: string;
 };
 
-interface GlobalWithCache extends Global {
+interface TestGlobal extends Global {
   __backstageCli_jestSuccessCache?: {
     filterConfigs(
       projectConfigs: JestProject[],
@@ -48,32 +50,45 @@ interface GlobalWithCache extends Global {
       }>;
     }): Promise<void>;
   };
+  __backstageCli_watchProjectFilter?: {
+    filter(projectConfigs: JestProject[]): Promise<JestProject[]>;
+  };
 }
 
 /**
  * Use git to get the HEAD tree hashes of each package in the project.
  */
 async function readPackageTreeHashes(graph: PackageGraph) {
-  const pkgs = Array.from(graph.values());
+  const pkgs = Array.from(graph.values()).map(pkg => ({
+    ...pkg,
+    path: relativePath(paths.targetRoot, pkg.dir),
+  }));
   const output = await runPlain(
     'git',
     'ls-tree',
-    '--object-only',
+    '--format="%(objectname)=%(path)"',
     'HEAD',
     '--',
-    ...pkgs.map(pkg => relativePath(paths.targetRoot, pkg.dir)),
+    ...pkgs.map(pkg => pkg.path),
   );
 
-  const treeShaList = output.trim().split(/\r?\n/);
-  if (treeShaList.length !== pkgs.length) {
-    throw new Error(
-      `Error listing project git tree hashes, output length does not equal input length`,
-    );
-  }
-
   const map = new Map(
-    pkgs.map((pkg, i) => [pkg.packageJson.name, treeShaList[i]]),
+    output
+      .trim()
+      .split(/\r?\n/)
+      .map(line => {
+        const [itemSha, ...itemPathParts] = line.split('=');
+        const itemPath = itemPathParts.join('=');
+        const pkg = pkgs.find(p => p.path === itemPath);
+        if (!pkg) {
+          throw new Error(
+            `Unexpectedly missing tree sha entry for path ${itemPath}`,
+          );
+        }
+        return [pkg.packageJson.name, itemSha];
+      }),
   );
+
   return (pkgName: string) => {
     const sha = map.get(pkgName);
     if (!sha) {
@@ -128,6 +143,8 @@ function removeOptionArg(args: string[], option: string, size: number = 2) {
 }
 
 export async function command(opts: OptionValues, cmd: Command): Promise<void> {
+  const testGlobal = global as TestGlobal;
+
   // all args are forwarded to jest
   let parent = cmd;
   while (parent.parent) {
@@ -138,6 +155,9 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
 
   const hasFlags = createFlagFinder(args);
 
+  // Parse the args to ensure that no file filters are provided, in which case we refuse to run
+  const { _: parsedArgs } = await yargs(args).options(jestYargsOptions).argv;
+
   // Only include our config if caller isn't passing their own config
   if (!hasFlags('-c', '--config')) {
     args.push('--config', paths.resolveOwn('config/jest.js'));
@@ -148,6 +168,7 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
   }
 
   // Run in watch mode unless in CI, coverage mode, or running all tests
+  let isSingleWatchMode = args.includes('--watch');
   if (
     !opts.since &&
     !process.env.CI &&
@@ -158,12 +179,47 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     const isMercurialRepo = () => runCheck('hg', '--cwd', '.', 'root');
 
     if ((await isGitRepo()) || (await isMercurialRepo())) {
+      isSingleWatchMode = true;
       args.push('--watch');
     } else {
       args.push('--watchAll');
     }
   }
 
+  // Due to our monorepo Jest project setup watch mode can be quite slow as it
+  // will always scan all projects for matches. This is an optimization where if
+  // the only provides filter paths from the repo root as args, we filter the
+  // projects to only run tests for those.
+  //
+  // This does mean you're not able to edit the watch filters during the watch
+  // session to point outside of the selected packages, but we consider that a
+  // worthwhile tradeoff, and you can always avoid providing paths upfront.
+  if (isSingleWatchMode && parsedArgs.length > 0) {
+    testGlobal.__backstageCli_watchProjectFilter = {
+      async filter(projectConfigs) {
+        const selectedProjects = [];
+        const usedArgs = new Set();
+
+        for (const project of projectConfigs) {
+          for (const arg of parsedArgs) {
+            if (isChildPath(project.rootDir, String(arg))) {
+              selectedProjects.push(project);
+              usedArgs.add(arg);
+            }
+          }
+        }
+
+        // If we didn't end up using all args in the filtering we need to bail
+        // and let Jest do the full filtering instead.
+        if (usedArgs.size !== parsedArgs.length) {
+          return projectConfigs;
+        }
+
+        return selectedProjects;
+      },
+    };
+  }
+
   // When running tests from the repo root in large repos you can easily hit the heap limit.
   // This is because Jest workers leak a lot of memory, and the workaround is to limit worker memory.
   // We set a default memory limit, but if an explicit one is supplied it will be used instead
@@ -240,17 +296,13 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     (process.stdout as any)._handle.setBlocking(true);
   }
 
-  const jestCli = require('jest-cli');
-
   // This code path is enabled by the --successCache flag, which is specific to
   // the `repo test` command in the Backstage CLI.
   if (opts.successCache) {
     removeOptionArg(args, '--successCache', 1);
     removeOptionArg(args, '--successCacheDir');
 
-    // Parse the args to ensure that no file filters are provided, in which case we refuse to run
-    const { _: parsedArgs } = await yargs(args).options(jestCli.yargsOptions)
-      .argv;
+    // Refuse to run if file filters are provided
     if (parsedArgs.length > 0) {
       throw new Error(
         `The --successCache flag can not be combined with the following arguments: ${parsedArgs.join(
@@ -274,8 +326,7 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
 
     // Set up a bridge with the @backstage/cli/config/jest configuration file. These methods
     // are picked up by the config script itself, as well as the custom result processor.
-    const globalWithCache = global as GlobalWithCache;
-    globalWithCache.__backstageCli_jestSuccessCache = {
+    testGlobal.__backstageCli_jestSuccessCache = {
       // This is called by `config/jest.js` after the project configs have been gathered
       async filterConfigs(projectConfigs, globalRootConfig) {
         const cacheEntries = await cache.read();
@@ -290,7 +341,9 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
         baseHash.update('\0');
         baseHash.update(process.version); // Node.js version
         baseHash.update('\0');
-        baseHash.update(JSON.stringify(globalRootConfig)); // Variable global jest config
+        baseHash.update(
+          SuccessCache.trimPaths(JSON.stringify(globalRootConfig)),
+        ); // Variable global jest config
         const baseSha = baseHash.digest('hex');
 
         return projectConfigs.filter(project => {
@@ -316,7 +369,7 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
 
           // The project ID is a hash of the transform configuration, which helps
           // us bust the cache when any changes are made to the transform implementation.
-          hash.update(JSON.stringify(project));
+          hash.update(SuccessCache.trimPaths(JSON.stringify(project)));
           hash.update(lockfile.getDependencyTreeHash(packageName));
 
           const sha = hash.digest('hex');
@@ -369,5 +422,5 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     };
   }
 
-  await jestCli.run(args);
+  await runJest(args);
 }
diff --git a/packages/cli/src/commands/start/command.ts b/packages/cli/src/commands/start/command.ts
index aa46b717bb..10dc19cad8 100644
--- a/packages/cli/src/commands/start/command.ts
+++ b/packages/cli/src/commands/start/command.ts
@@ -26,6 +26,7 @@ export async function command(opts: OptionValues): Promise<void> {
   const options = {
     configPaths: opts.config as string[],
     checksEnabled: Boolean(opts.check),
+    linkedWorkspace: opts.link,
     inspectEnabled: opts.inspect,
     inspectBrkEnabled: opts.inspectBrk,
     require: opts.require,
diff --git a/packages/cli/src/commands/start/startBackend.ts b/packages/cli/src/commands/start/startBackend.ts
index 4f62044de7..84f9eb0890 100644
--- a/packages/cli/src/commands/start/startBackend.ts
+++ b/packages/cli/src/commands/start/startBackend.ts
@@ -22,6 +22,7 @@ interface StartBackendOptions {
   checksEnabled: boolean;
   inspectEnabled: boolean;
   inspectBrkEnabled: boolean;
+  linkedWorkspace?: string;
   require?: string;
 }
 
@@ -30,6 +31,7 @@ export async function startBackend(options: StartBackendOptions) {
     entry: 'src/index',
     inspectEnabled: options.inspectEnabled,
     inspectBrkEnabled: options.inspectBrkEnabled,
+    linkedWorkspace: options.linkedWorkspace,
     require: options.require,
   });
 
@@ -52,6 +54,7 @@ export async function startBackendPlugin(options: StartBackendOptions) {
     inspectEnabled: options.inspectEnabled,
     inspectBrkEnabled: options.inspectBrkEnabled,
     require: options.require,
+    linkedWorkspace: options.linkedWorkspace,
   });
 
   await waitForExit();
diff --git a/packages/cli/src/commands/start/startFrontend.ts b/packages/cli/src/commands/start/startFrontend.ts
index 20faf4a9ff..df317799f4 100644
--- a/packages/cli/src/commands/start/startFrontend.ts
+++ b/packages/cli/src/commands/start/startFrontend.ts
@@ -26,6 +26,7 @@ interface StartAppOptions {
   configPaths: string[];
   skipOpenBrowser?: boolean;
   isModuleFederationRemote?: boolean;
+  linkedWorkspace?: string;
 }
 
 export async function startFrontend(options: StartAppOptions) {
@@ -37,6 +38,7 @@ export async function startFrontend(options: StartAppOptions) {
     configPaths: options.configPaths,
     verifyVersions: options.verifyVersions,
     skipOpenBrowser: options.skipOpenBrowser,
+    linkedWorkspace: options.linkedWorkspace,
     moduleFederation: getModuleFederationOptions(
       name,
       options.isModuleFederationRemote,
diff --git a/packages/cli/src/commands/versions/bump.test.ts b/packages/cli/src/commands/versions/bump.test.ts
index cc48b91fd8..96e8de517b 100644
--- a/packages/cli/src/commands/versions/bump.test.ts
+++ b/packages/cli/src/commands/versions/bump.test.ts
@@ -33,6 +33,7 @@ jest.mock('global-agent/bootstrap', () => {});
 
 // Remove log coloring to simplify log matching
 jest.mock('chalk', () => ({
+  bold: (str: string) => str,
   red: (str: string) => str,
   blue: (str: string) => str,
   cyan: (str: string) => str,
@@ -90,6 +91,12 @@ const REGISTRY_VERSIONS: { [name: string]: string } = {
   '@backstage/create-app': '1.0.0',
 };
 
+const yarnRcMock = `plugins:
+  - checksum: cafedead
+    path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
+    spec: 'https://versions.backstage.io/v1/releases/0.0.0/yarn-plugin'
+`;
+
 const HEADER = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
 
@@ -435,6 +442,117 @@ describe('bump', () => {
     });
   });
 
+  it('should use backstage:^ versions for packages in the release manifest when the yarn plugin is installed', async () => {
+    mockDir.setContent({
+      '.yarnrc.yml': yarnRcMock,
+      'yarn.lock': lockfileMock,
+      'package.json': JSON.stringify({
+        workspaces: {
+          packages: ['packages/*'],
+        },
+      }),
+      packages: {
+        a: {
+          'package.json': JSON.stringify({
+            name: 'a',
+            dependencies: {
+              '@backstage/core': '^1.0.5',
+            },
+          }),
+        },
+        b: {
+          'package.json': JSON.stringify({
+            name: 'b',
+            dependencies: {
+              '@backstage/core': '^1.0.3',
+              '@backstage/theme': '^1.0.0',
+            },
+          }),
+        },
+      },
+    });
+
+    jest.spyOn(runObj, 'run').mockResolvedValue(undefined);
+    worker.use(
+      rest.get(
+        'https://versions.backstage.io/v1/tags/main/manifest.json',
+        (_, res, ctx) =>
+          res(
+            ctx.status(200),
+            ctx.json({
+              releaseVersion: '0.0.1',
+              packages: [
+                {
+                  name: '@backstage/theme',
+                  version: '5.0.0',
+                },
+                {
+                  name: '@backstage/create-app',
+                  version: '3.0.0',
+                },
+              ],
+            }),
+          ),
+      ),
+    );
+    const { log: logs } = await withLogCollector(['log', 'warn'], async () => {
+      await bump({ pattern: null, release: 'main' } as unknown as Command);
+    });
+    expectLogsToMatch(logs, [
+      'Using default pattern glob @backstage/*',
+      'Checking for updates of @backstage/core',
+      'Checking for updates of @backstage/theme',
+      'NOTE: this bump used backstage:^ versions in package.json files, since the Backstage yarn plugin was detected in the repository. To migrate back to explicit npm versions, remove the plugin by running "yarn plugin remove @yarnpkg/plugin-backstage", then repeat this command.',
+      'Some packages are outdated, updating',
+      'bumping @backstage/theme in b to ^5.0.0',
+      'bumping @backstage/core in b to ^1.0.6',
+      'bumping @backstage/core in a to ^1.0.6',
+      'Updating yarn plugin to v0.0.1...',
+      'Your project is now at version 0.0.1, which has been written to backstage.json',
+      'Running yarn install to install new versions',
+      'Checking for moved packages to the @backstage-community namespace...',
+      '⚠️  The following packages may have breaking changes:',
+      '  @backstage/theme : 1.0.0 ~> 5.0.0',
+      '    https://github.com/backstage/backstage/blob/master/packages/theme/CHANGELOG.md',
+      'Version bump complete!',
+    ]);
+
+    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(1);
+    expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core');
+
+    expect(runObj.run).toHaveBeenCalledTimes(2);
+    expect(runObj.run).toHaveBeenCalledWith('yarn', [
+      'plugin',
+      'import',
+      'https://versions.backstage.io/v1/releases/0.0.1/yarn-plugin',
+    ]);
+    expect(runObj.run).toHaveBeenCalledWith(
+      'yarn',
+      ['install'],
+      expect.any(Object),
+    );
+
+    const packageA = await fs.readJson(
+      mockDir.resolve('packages/a/package.json'),
+    );
+    expect(packageA).toEqual({
+      name: 'a',
+      dependencies: {
+        '@backstage/core': '^1.0.6',
+      },
+    });
+    const packageB = await fs.readJson(
+      mockDir.resolve('packages/b/package.json'),
+    );
+    expect(packageB).toEqual({
+      name: 'b',
+      dependencies: {
+        '@backstage/core': '^1.0.6',
+        '@backstage/theme': 'backstage:^',
+      },
+    });
+  });
+
   it('should only bump packages in the manifest when a specific release is specified', async () => {
     mockDir.setContent({
       'yarn.lock': lockfileMock,
diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts
index 8d43f38967..76e6092140 100644
--- a/packages/cli/src/commands/versions/bump.ts
+++ b/packages/cli/src/commands/versions/bump.ts
@@ -22,14 +22,12 @@ if (shouldUseGlobalAgent()) {
 
 import fs from 'fs-extra';
 import chalk from 'chalk';
-import ora from 'ora';
 import semver from 'semver';
 import { OptionValues } from 'commander';
 import yaml from 'yaml';
 import z from 'zod';
 import { isError, NotFoundError } from '@backstage/errors';
 import { resolve as resolvePath } from 'path';
-import { run } from '../../lib/run';
 import { paths } from '../../lib/paths';
 import {
   mapDependencies,
@@ -45,6 +43,8 @@ import {
   ReleaseManifest,
 } from '@backstage/release-manifests';
 import { migrateMovedPackages } from './migrate';
+import { runYarnInstall } from './utils';
+import { run } from '../../lib/run';
 
 function shouldUseGlobalAgent(): boolean {
   // see https://www.npmjs.com/package/global-agent
@@ -121,6 +121,20 @@ export default async (opts: OptionValues) => {
     });
   }
 
+  if (hasYarnPlugin) {
+    console.log();
+    console.log(
+      `Updating yarn plugin to v${releaseManifest.releaseVersion}...`,
+    );
+    console.log();
+    await run('yarn', [
+      'plugin',
+      'import',
+      `https://versions.backstage.io/v1/releases/${releaseManifest.releaseVersion}/yarn-plugin`,
+    ]);
+    console.log();
+  }
+
   // First we discover all Backstage dependencies within our own repo
   const dependencyMap = await mapDependencies(paths.targetDir, pattern);
 
@@ -508,35 +522,3 @@ async function getHasYarnPlugin() {
     plugin => plugin.path === '.yarn/plugins/@yarnpkg/plugin-backstage.cjs',
   );
 }
-
-export async function runYarnInstall() {
-  const spinner = ora({
-    prefixText: `Running ${chalk.blue('yarn install')} to install new versions`,
-    spinner: 'arc',
-    color: 'green',
-  }).start();
-
-  const installOutput = new Array<Buffer>();
-  try {
-    await run('yarn', ['install'], {
-      env: {
-        FORCE_COLOR: 'true',
-        // We filter out all of the npm_* environment variables that are added when
-        // executing through yarn. This works around an issue where these variables
-        // incorrectly override local yarn or npm config in the project directory.
-        ...Object.fromEntries(
-          Object.entries(process.env).map(([name, value]) =>
-            name.startsWith('npm_') ? [name, undefined] : [name, value],
-          ),
-        ),
-      },
-      stdoutLogFunc: data => installOutput.push(data),
-      stderrLogFunc: data => installOutput.push(data),
-    });
-    spinner.succeed();
-  } catch (error) {
-    spinner.fail();
-    process.stdout.write(Buffer.concat(installOutput));
-    throw error;
-  }
-}
diff --git a/packages/cli/src/commands/versions/migrate.ts b/packages/cli/src/commands/versions/migrate.ts
index 321a78ef9f..8415de0f57 100644
--- a/packages/cli/src/commands/versions/migrate.ts
+++ b/packages/cli/src/commands/versions/migrate.ts
@@ -19,7 +19,7 @@ import { resolve as resolvePath, join as joinPath } from 'path';
 import { OptionValues } from 'commander';
 import { readJson, writeJson } from 'fs-extra';
 import { minimatch } from 'minimatch';
-import { runYarnInstall } from './bump';
+import { runYarnInstall } from './utils';
 import replace from 'replace-in-file';
 
 declare module 'replace-in-file' {
diff --git a/packages/cli/src/commands/versions/utils.ts b/packages/cli/src/commands/versions/utils.ts
new file mode 100644
index 0000000000..22c5f0c028
--- /dev/null
+++ b/packages/cli/src/commands/versions/utils.ts
@@ -0,0 +1,51 @@
+/*
+ * 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 ora from 'ora';
+import chalk from 'chalk';
+import { run } from '../../lib/run';
+
+export async function runYarnInstall() {
+  const spinner = ora({
+    prefixText: `Running ${chalk.blue('yarn install')} to install new versions`,
+    spinner: 'arc',
+    color: 'green',
+  }).start();
+
+  const installOutput = new Array<Buffer>();
+  try {
+    await run('yarn', ['install'], {
+      env: {
+        FORCE_COLOR: 'true',
+        // We filter out all of the npm_* environment variables that are added when
+        // executing through yarn. This works around an issue where these variables
+        // incorrectly override local yarn or npm config in the project directory.
+        ...Object.fromEntries(
+          Object.entries(process.env).map(([name, value]) =>
+            name.startsWith('npm_') ? [name, undefined] : [name, value],
+          ),
+        ),
+      },
+      stdoutLogFunc: data => installOutput.push(data),
+      stderrLogFunc: data => installOutput.push(data),
+    });
+    spinner.succeed();
+  } catch (error) {
+    spinner.fail();
+    process.stdout.write(Buffer.concat(installOutput));
+    throw error;
+  }
+}
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 59e1cd57c3..e419503649 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -115,10 +115,16 @@ export async function makeRollupConfigs(
     const output = new Array<OutputOptions>();
     const mainFields = ['module', 'main'];
 
+    // Avoid using node_modules as a directory name, since it's trimmed from published packages.
+    // This can happen when inlining dependencies such as style-inject added for css injection.
+    const rewriteNodeModules = (name: string) =>
+      name.replaceAll('node_modules', 'node_modules_dist');
+
     if (options.outputs.has(Output.cjs)) {
       output.push({
         dir: distDir,
-        entryFileNames: `[name].cjs.js`,
+        entryFileNames: chunkInfo =>
+          `${rewriteNodeModules(chunkInfo.name)}.cjs.js`,
         chunkFileNames: `cjs/[name]-[hash].cjs.js`,
         format: 'commonjs',
         interop: 'compat',
@@ -131,7 +137,8 @@ export async function makeRollupConfigs(
     if (options.outputs.has(Output.esm)) {
       output.push({
         dir: distDir,
-        entryFileNames: `[name].esm.js`,
+        entryFileNames: chunkInfo =>
+          `${rewriteNodeModules(chunkInfo.name)}.esm.js`,
         chunkFileNames: `esm/[name]-[hash].esm.js`,
         format: 'module',
         sourcemap: true,
@@ -167,6 +174,7 @@ export async function makeRollupConfigs(
             /\.gif$/,
             /\.jpg$/,
             /\.jpeg$/,
+            /\.webp$/,
             /\.eot$/,
             /\.woff$/,
             /\.woff2$/,
diff --git a/packages/cli/src/lib/bundler/ConfigInjectingHtmlWebpackPlugin.ts b/packages/cli/src/lib/bundler/ConfigInjectingHtmlWebpackPlugin.ts
new file mode 100644
index 0000000000..5aa8b75098
--- /dev/null
+++ b/packages/cli/src/lib/bundler/ConfigInjectingHtmlWebpackPlugin.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { AppConfig } from '@backstage/config';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+
+export class ConfigInjectingHtmlWebpackPlugin extends HtmlWebpackPlugin {
+  readonly name = 'ConfigInjectingHtmlWebpackPlugin';
+  readonly #getFrontendAppConfigs: () => AppConfig[];
+
+  constructor(
+    options: HtmlWebpackPlugin.Options,
+    getFrontendAppConfigs: () => AppConfig[],
+  ) {
+    super(options);
+    this.#getFrontendAppConfigs = getFrontendAppConfigs;
+  }
+
+  apply: HtmlWebpackPlugin['apply'] = compiler => {
+    super.apply(compiler);
+
+    compiler.hooks.compilation.tap(this.name, compilation => {
+      const hooks = HtmlWebpackPlugin.getCompilationHooks(compilation);
+      hooks.alterAssetTagGroups.tap(this.name, ctx => {
+        if (ctx.plugin !== this) {
+          return ctx;
+        }
+        return {
+          ...ctx,
+          headTags: [
+            ...ctx.headTags,
+            HtmlWebpackPlugin.createHtmlTagObject(
+              'script',
+              { type: 'backstage.io/config' },
+              `\n${JSON.stringify(this.#getFrontendAppConfigs(), null, 2)}\n`,
+            ),
+          ],
+        };
+      });
+    });
+  };
+}
diff --git a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts
deleted file mode 100644
index a64630d6fb..0000000000
--- a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import * as os from 'os';
-import * as path from 'path';
-import { LinkedPackageResolvePlugin } from './LinkedPackageResolvePlugin';
-
-describe('LinkedPackageResolvePlugin', () => {
-  const root = os.platform() === 'win32' ? 'C:\\root' : '/root';
-
-  it('should re-write paths for external packages', () => {
-    const plugin = new LinkedPackageResolvePlugin(
-      path.resolve(root, 'repo/node_modules'),
-      [
-        {
-          dir: path.resolve(root, 'external-a'),
-          packageJson: {
-            name: 'a',
-            version: '1.0.0',
-          },
-        },
-        {
-          dir: path.resolve(root, 'external-b'),
-          packageJson: {
-            name: '@s/b',
-            version: '1.0.0',
-          },
-        },
-      ],
-    );
-
-    const tapAsync = jest.fn();
-    const doResolve = jest.fn();
-
-    const resolver = {
-      hooks: { resolve: { tapAsync } },
-      doResolve,
-    };
-    plugin.apply(resolver);
-
-    expect(tapAsync).toHaveBeenCalledTimes(1);
-    expect(tapAsync).toHaveBeenCalledWith(
-      'LinkedPackageResolvePlugin',
-      expect.any(Function),
-    );
-    expect(doResolve).toHaveBeenCalledTimes(0);
-
-    // Internal module resolution is not affected
-    const tap = tapAsync.mock.calls[0][1];
-    const callbackX = jest.fn();
-    tap(
-      {
-        request: path.resolve(root, 'repo/package/x/src/module.ts'),
-        path: path.resolve(root, 'repo/package/x/src'),
-        context: {
-          issuer: path.resolve(root, 'repo/package/x/src/index.ts'),
-        },
-      },
-      'some-context',
-      callbackX,
-    );
-    expect(callbackX).toHaveBeenCalledTimes(1);
-    expect(callbackX).toHaveBeenCalledWith();
-    expect(doResolve).toHaveBeenCalledTimes(0);
-
-    // Path is sometimes false
-    const callbackFalse = jest.fn();
-    tap(
-      {
-        request: 'sample',
-        path: false,
-      },
-      'some-context',
-      callbackFalse,
-    );
-    expect(callbackFalse).toHaveBeenCalledTimes(1);
-    expect(callbackFalse).toHaveBeenCalledWith();
-    expect(doResolve).toHaveBeenCalledTimes(0);
-
-    // Internal modules with a path prefix of an external module
-    const callbackY = jest.fn();
-    tap(
-      {
-        request: path.resolve(root, 'external-aa/src/module.ts'),
-        path: path.resolve(root, 'external-aa/src'),
-        context: {
-          issuer: path.resolve(root, 'external-aa/src/index.ts'),
-        },
-      },
-      'some-context',
-      callbackY,
-    );
-    expect(callbackY).toHaveBeenCalledTimes(1);
-    expect(callbackY).toHaveBeenCalledWith();
-    expect(doResolve).toHaveBeenCalledTimes(0);
-
-    // External modules have their path and issuer context rewritten, but not the request
-    const callbackA = jest.fn();
-    tap(
-      {
-        request: path.resolve(root, 'external-a/src/module.ts'),
-        path: path.resolve(root, 'external-a/src'),
-        context: {
-          issuer: path.resolve(root, 'external-a/src/index.ts'),
-        },
-      },
-      'some-context',
-      callbackA,
-    );
-    expect(callbackA).toHaveBeenCalledTimes(0);
-    expect(doResolve).toHaveBeenCalledTimes(1);
-    expect(doResolve).toHaveBeenCalledWith(
-      resolver.hooks.resolve,
-      {
-        request: path.resolve(root, 'external-a/src/module.ts'),
-        path: path.resolve(root, 'repo/node_modules/a/src'),
-        context: {
-          issuer: path.resolve(root, 'repo/node_modules/a/src/index.ts'),
-        },
-      },
-      `resolve ${path.resolve(
-        root,
-        'external-a/src/module.ts',
-      )} in ${path.resolve(root, 'repo/node_modules/a')}`,
-      'some-context',
-      callbackA,
-    );
-
-    // Also handles scoped packages correctly, and issuer is not required
-    const callbackB = jest.fn();
-    tap(
-      {
-        request: path.resolve(root, 'external-b/src/module.ts'),
-        path: path.resolve(root, 'external-b/src'),
-        context: {
-          issuer: false,
-        },
-      },
-      'some-context',
-      callbackB,
-    );
-    expect(callbackB).toHaveBeenCalledTimes(0);
-    expect(doResolve).toHaveBeenCalledTimes(2);
-    expect(doResolve).toHaveBeenLastCalledWith(
-      resolver.hooks.resolve,
-      {
-        request: path.resolve(root, 'external-b/src/module.ts'),
-        path: path.resolve(root, 'repo/node_modules/@s/b/src'),
-        context: {
-          issuer: false,
-        },
-      },
-      `resolve ${path.resolve(
-        root,
-        'external-b/src/module.ts',
-      )} in ${path.resolve(root, 'repo/node_modules/@s/b')}`,
-      'some-context',
-      callbackB,
-    );
-
-    expect(tapAsync).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts
deleted file mode 100644
index 4811afec6f..0000000000
--- a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts
+++ /dev/null
@@ -1,82 +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 { resolve as resolvePath } from 'path';
-import { WebpackPluginInstance } from 'webpack';
-import { isChildPath } from '@backstage/cli-common';
-import { Package } from '@manypkg/get-packages';
-
-// Enables proper resolution of packages when linking in external packages.
-// Without this the packages would depend on dependencies in the node_modules
-// of the external packages themselves, leading to module duplication
-export class LinkedPackageResolvePlugin implements WebpackPluginInstance {
-  constructor(
-    private readonly targetModules: string,
-    private readonly packages: Package[],
-  ) {}
-
-  apply(resolver: any) {
-    resolver.hooks.resolve.tapAsync(
-      'LinkedPackageResolvePlugin',
-      (
-        data: {
-          request: string;
-          path?: false | string;
-          context?: { issuer?: string };
-        },
-        context: unknown,
-        callback: () => void,
-      ) => {
-        const pkg = this.packages.find(
-          pkge => data.path && isChildPath(pkge.dir, data.path),
-        );
-        if (!pkg) {
-          callback();
-          return;
-        }
-
-        // pkg here is an external package. We rewrite the context of any imports to resolve
-        // from the location of the package within the node_modules of the target root rather
-        // than the real location of the external package.
-        const modulesLocation = resolvePath(
-          this.targetModules,
-          pkg.packageJson.name,
-        );
-        const newContext = data.context?.issuer
-          ? {
-              ...data.context,
-              issuer: data.context.issuer.replace(pkg.dir, modulesLocation),
-            }
-          : data.context;
-
-        // Re-run resolution but this time from the point of view of our target monorepo rather
-        // than the location of the external package. By resolving modules using this method we avoid
-        // pulling in e.g. `react` from the external repo, which would otherwise lead to conflicts.
-        resolver.doResolve(
-          resolver.hooks.resolve,
-          {
-            ...data,
-            context: newContext,
-            path: data.path && data.path.replace(pkg.dir, modulesLocation),
-          },
-          `resolve ${data.request} in ${modulesLocation}`,
-          context,
-          callback,
-        );
-      },
-    );
-  }
-}
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index c61c117452..5e379783ba 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -25,13 +25,10 @@ import ESLintPlugin from 'eslint-webpack-plugin';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { ModuleFederationPlugin } from '@module-federation/enhanced/webpack';
-import { LinkedPackageResolvePlugin } from './LinkedPackageResolvePlugin';
 import ModuleScopePlugin from 'react-dev-utils/ModuleScopePlugin';
 import ReactRefreshPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import { paths as cliPaths } from '../../lib/paths';
 import fs from 'fs-extra';
-import { getPackages } from '@manypkg/get-packages';
-import { isChildPath } from '@backstage/cli-common';
 import { optimization as optimizationConfig } from './optimization';
 import pickBy from 'lodash/pickBy';
 import { runPlain } from '../run';
@@ -39,6 +36,8 @@ import { transforms } from './transforms';
 import { version } from '../../lib/version';
 import yn from 'yn';
 import { hasReactDomClient } from './hasReactDomClient';
+import { createWorkspaceLinkingPlugins } from './linkWorkspaces';
+import { ConfigInjectingHtmlWebpackPlugin } from './ConfigInjectingHtmlWebpackPlugin';
 
 const BUILD_CACHE_ENV_VAR = 'BACKSTAGE_CLI_EXPERIMENTAL_BUILD_CACHE';
 
@@ -130,8 +129,6 @@ export async function createConfig(
   const { plugins, loaders } = transforms(options);
   // Any package that is part of the monorepo but outside the monorepo root dir need
   // separate resolution logic.
-  const { packages } = await getPackages(cliPaths.targetDir);
-  const externalPkgs = packages.filter(p => !isChildPath(paths.root, p.dir));
 
   const validBaseUrl = resolveBaseUrl(frontendConfig, moduleFederation);
   let publicPath = validBaseUrl.pathname.replace(/\/$/, '');
@@ -186,19 +183,35 @@ export async function createConfig(
   );
 
   if (options.moduleFederation?.mode !== 'remote') {
-    plugins.push(
-      // `rspack.HtmlRspackPlugin` does not support object type `templateParameters` value, `frontendConfig` in this case
-      new HtmlWebpackPlugin({
-        meta: {
-          'backstage-app-mode': options?.appMode ?? 'public',
-        },
-        template: paths.targetHtml,
-        templateParameters: {
-          publicPath,
-          config: frontendConfig,
-        },
-      }),
-    );
+    const templateOptions = {
+      meta: {
+        'backstage-app-mode': options?.appMode ?? 'public',
+      },
+      template: paths.targetHtml,
+      templateParameters: {
+        publicPath,
+        config: frontendConfig,
+      },
+    };
+    if (rspack) {
+      // With Rspack we inject config via index.html, this is both because we
+      // can't use APP_CONFIG due to the lack of support for runtime values, but
+      // also because we are able to do it and it lines up better with what the
+      // app-backend is doing.
+      //
+      // We still use the html plugin from WebPack, since the Rspack one won't
+      // let us inject complex objects like the config.
+      plugins.push(
+        new ConfigInjectingHtmlWebpackPlugin(
+          templateOptions,
+          options.getFrontendAppConfigs,
+        ),
+      );
+    } else {
+      // Config injection via index.html doesn't work across reloads with
+      // WebPack, so we rely on the APP_CONFIG injection instead
+      plugins.push(new HtmlWebpackPlugin(templateOptions));
+    }
     plugins.push(
       new HtmlWebpackPlugin({
         meta: {
@@ -209,7 +222,7 @@ export async function createConfig(
         minify: false,
         publicPath: '<%= publicPath %>',
         filename: 'index.html.tmpl',
-        template: `raw-loader!${paths.targetHtml}`,
+        template: `${require.resolve('raw-loader')}!${paths.targetHtml}`,
       }),
     );
   }
@@ -288,8 +301,7 @@ export async function createConfig(
     new bundler.DefinePlugin({
       'process.env.BUILD_INFO': JSON.stringify(buildInfo),
       'process.env.APP_CONFIG': rspack
-        ? // FIXME: see also https://github.com/web-infra-dev/rspack/issues/5606
-          JSON.stringify(options.getFrontendAppConfigs())
+        ? JSON.stringify([]) // Inject via index.html instead
         : bundler.DefinePlugin.runtimeValue(
             () => JSON.stringify(options.getFrontendAppConfigs()),
             true,
@@ -300,6 +312,15 @@ export async function createConfig(
     }),
   );
 
+  if (options.linkedWorkspace) {
+    plugins.push(
+      ...(await createWorkspaceLinkingPlugins(
+        bundler,
+        options.linkedWorkspace,
+      )),
+    );
+  }
+
   // These files are required by the transpiled code when using React Refresh.
   // They need to be excluded to the module scope plugin which ensures that files
   // that exist in the package are required.
@@ -367,7 +388,7 @@ export async function createConfig(
     ...(isDev
       ? {
           watchOptions: {
-            ignored: /node_modules/,
+            ignored: /node_modules\/(?!__backstage-autodetected-plugins__)/,
           },
         }
       : {}),
@@ -406,7 +427,6 @@ export async function createConfig(
       // FIXME: see also https://github.com/web-infra-dev/rspack/issues/3408
       ...(!rspack && {
         plugins: [
-          new LinkedPackageResolvePlugin(paths.rootNodeModules, externalPkgs),
           new ModuleScopePlugin(
             [paths.targetSrc, paths.targetDev],
             [paths.targetPackageJson, ...reactRefreshFiles],
diff --git a/packages/cli/src/lib/bundler/linkWorkspaces.ts b/packages/cli/src/lib/bundler/linkWorkspaces.ts
new file mode 100644
index 0000000000..2fe0eb2fb3
--- /dev/null
+++ b/packages/cli/src/lib/bundler/linkWorkspaces.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { relative as relativePath } from 'path';
+import { getPackages } from '@manypkg/get-packages';
+import webpack from 'webpack';
+import { paths } from '../paths';
+
+/**
+ * This returns of collection of plugins that links a separate workspace into
+ * the target one. Any packages that are present in the linked workspaces will
+ * always be used in place of the ones in the target workspace, with the exception
+ * of react and react-dom which are always resolved from the target workspace.
+ */
+export async function createWorkspaceLinkingPlugins(
+  bundler: typeof webpack,
+  workspace: string,
+) {
+  const { packages: linkedPackages, root: linkedRoot } = await getPackages(
+    workspace,
+  );
+
+  // Matches all packages in the linked workspaces, as well as sub-path exports from them
+  const replacementRegex = new RegExp(
+    `^(?:${linkedPackages
+      .map(pkg => pkg.packageJson.name)
+      .join('|')})(?:/.*)?$`,
+  );
+
+  return [
+    // Any imports of a package that is present in the linked workspace will
+    // be redirected to be resolved within the context of the linked workspace
+    new bundler.NormalModuleReplacementPlugin(replacementRegex, resource => {
+      resource.context = linkedRoot.dir;
+    }),
+    // react and react-dom are always resolved from the target directory
+    // Note: this often requires that the linked and target workspace use the same versions of React
+    new bundler.NormalModuleReplacementPlugin(
+      /^react(?:-router)?(?:-dom)?$/,
+      resource => {
+        if (!relativePath(linkedRoot.dir, resource.context).startsWith('..')) {
+          resource.context = paths.targetDir;
+        }
+      },
+    ),
+  ];
+}
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 44d6d54379..dc16a4577d 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -22,7 +22,7 @@ import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 
 import { paths as libPaths } from '../../lib/paths';
-import { loadCliConfig } from '../config';
+import { loadCliConfig } from '../../modules/config/lib/config';
 import { createConfig, resolveBaseUrl, resolveEndpoint } from './config';
 import { createDetectedModulesEntryPoint } from './packageDetection';
 import { resolveBundlingPaths, resolveOptionalBundlingPaths } from './paths';
@@ -59,6 +59,26 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
 
   let latestFrontendAppConfigs: AppConfig[] = [];
 
+  /** Triggers a full reload of all clients */
+  const triggerReload = () => {
+    if (viteServer) {
+      viteServer.restart();
+    }
+
+    if (webpackServer) {
+      webpackServer.invalidate();
+
+      // For the Rspack server it's not enough to invalidate, we also need to
+      // tell the browser to reload, which we do with a 'static-changed' message
+      if (process.env.EXPERIMENTAL_RSPACK) {
+        webpackServer.sendMessage(
+          webpackServer.webSocketServer?.clients ?? [],
+          'static-changed',
+        );
+      }
+    }
+  };
+
   const cliConfig = await loadCliConfig({
     args: options.configPaths,
     fromPackage: name,
@@ -66,8 +86,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     watch(appConfigs) {
       latestFrontendAppConfigs = appConfigs;
 
-      webpackServer?.invalidate();
-      viteServer?.restart();
+      triggerReload();
     },
   });
   latestFrontendAppConfigs = cliConfig.frontendAppConfigs;
@@ -102,8 +121,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     config: fullConfig,
     targetPath: paths.targetPath,
     watch() {
-      webpackServer?.invalidate();
-      viteServer?.restart();
+      triggerReload();
     },
   });
 
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 75099bf430..addefacd6e 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -150,6 +150,7 @@ export const transforms = (options: TransformOptions): Transforms => {
         { and: [/\.svg$/, { not: [/\.icon\.svg$/] }] },
         /\.xml$/,
         /\.ico$/,
+        /\.webp$/,
       ],
       type: 'asset/resource',
       generator: {
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 277b93f4a6..c5afb86b88 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -36,6 +36,8 @@ export type BundlingOptions = {
   publicSubPath?: string;
   // Mode that the app is running in, 'protected' or 'public', default is 'public'
   appMode?: string;
+  // An external linked workspace to include in the bundling
+  linkedWorkspace?: string;
   moduleFederation?: ModuleFederationOptions;
   rspack?: typeof import('@rspack/core').rspack;
 };
@@ -46,6 +48,8 @@ export type ServeOptions = BundlingPathsOptions & {
   verifyVersions?: boolean;
   skipOpenBrowser?: boolean;
   moduleFederation?: ModuleFederationOptions;
+  // An external linked workspace to include in the bundling
+  linkedWorkspace?: string;
 };
 
 export type BuildOptions = BundlingPathsOptions & {
diff --git a/packages/cli/src/lib/cache/SuccessCache.ts b/packages/cli/src/lib/cache/SuccessCache.ts
index 5370958537..a799970b4d 100644
--- a/packages/cli/src/lib/cache/SuccessCache.ts
+++ b/packages/cli/src/lib/cache/SuccessCache.ts
@@ -16,6 +16,7 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'node:path';
+import { paths } from '../paths';
 
 const DEFAULT_CACHE_BASE_PATH = 'node_modules/.cache/backstage-cli';
 
@@ -24,6 +25,15 @@ const CACHE_MAX_AGE_MS = 7 * 24 * 3600_000;
 export class SuccessCache {
   readonly #path: string;
 
+  /**
+   * Trim any occurrences of the workspace root path from the input string. This
+   * is useful to ensure stable hashes that don't vary based on the workspace
+   * location.
+   */
+  static trimPaths(input: string) {
+    return input.replaceAll(paths.targetRoot, '');
+  }
+
   constructor(name: string, basePath?: string) {
     this.#path = resolvePath(basePath ?? DEFAULT_CACHE_BASE_PATH, name);
   }
diff --git a/packages/cli/src/lib/lazy.ts b/packages/cli/src/lib/lazy.ts
new file mode 100644
index 0000000000..6d2cb1cd4f
--- /dev/null
+++ b/packages/cli/src/lib/lazy.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { assertError } from '@backstage/errors';
+import { exitWithError } from '../lib/errors';
+
+// Wraps an action function so that it always exits and handles errors
+export function lazy(
+  getActionFunc: () => Promise<(...args: any[]) => Promise<void>>,
+): (...args: any[]) => Promise<never> {
+  return async (...args: any[]) => {
+    try {
+      const actionFunc = await getActionFunc();
+      await actionFunc(...args);
+
+      process.exit(0);
+    } catch (error) {
+      assertError(error);
+      exitWithError(error);
+    }
+  };
+}
diff --git a/packages/cli/src/lib/packager/productionPack.ts b/packages/cli/src/lib/packager/productionPack.ts
index c15a7f8b9e..9736e97b8d 100644
--- a/packages/cli/src/lib/packager/productionPack.ts
+++ b/packages/cli/src/lib/packager/productionPack.ts
@@ -49,11 +49,7 @@ export async function productionPack(options: ProductionPackOptions) {
   }
 
   // This mutates pkg to fill in index exports, so call it before applying publishConfig
-  const writeCompatibilityEntryPoints = await prepareExportsEntryPoints(
-    pkg,
-    packageDir,
-    options.featureDetectionProject,
-  );
+  await rewriteEntryPoints(pkg, packageDir, options.featureDetectionProject);
 
   // TODO(Rugvip): Once exports are rolled out more broadly we should deprecate and remove this behavior
   const publishConfig = pkg.publishConfig ?? {};
@@ -63,9 +59,6 @@ export async function productionPack(options: ProductionPackOptions) {
     }
   }
 
-  // For published packages we rely on compatibility entry points rather than this
-  delete pkg.typesVersions;
-
   // We remove the dependencies from package.json of packages that are marked
   // as bundled, so that yarn doesn't try to install them.
   if (pkg.bundled) {
@@ -97,10 +90,6 @@ export async function productionPack(options: ProductionPackOptions) {
   } else {
     await fs.writeJson(pkgPath, pkg, { encoding: 'utf8', spaces: 2 });
   }
-
-  if (writeCompatibilityEntryPoints) {
-    await writeCompatibilityEntryPoints(targetDir ?? packageDir);
-  }
 }
 
 // Reverts the changes made by productionPack when called without a targetDir.
@@ -138,7 +127,7 @@ const EXPORT_MAP = {
  * well as returning a function that creates backwards compatibility
  * entry points for importers that don't support exports.
  */
-async function prepareExportsEntryPoints(
+async function rewriteEntryPoints(
   pkg: BackstagePackageJson,
   packageDir: string,
   featureDetectionProject?: Project,
@@ -150,12 +139,13 @@ async function prepareExportsEntryPoints(
   const distFiles = await fs.readdir(distPath);
   const outputExports = {} as Record<string, string | Record<string, string>>;
 
-  const compatibilityWriters = new Array<
-    (targetDir: string) => Promise<void>
-  >();
-
   const entryPoints = readEntryPoints(pkg);
 
+  // Clear to ensure a clean slate before adding entries back in further down
+  if (pkg.typesVersions) {
+    pkg.typesVersions = { '*': {} };
+  }
+
   for (const entryPoint of entryPoints) {
     if (!SCRIPT_EXTS.includes(entryPoint.ext)) {
       outputExports[entryPoint.mount] = entryPoint.path;
@@ -171,6 +161,16 @@ async function prepareExportsEntryPoints(
       }
     }
 
+    // Our current tooling relies on the typesVersions field rather than export.*.types
+    if (exp.types) {
+      if (!pkg.typesVersions) {
+        pkg.typesVersions = { '*': {} };
+      }
+      pkg.typesVersions['*'][entryPoint.name] = [
+        `dist/${entryPoint.name}.d.ts`,
+      ];
+    }
+
     exp.default = exp.require ?? exp.import;
 
     // Find the default export type for the entry point, if feature detection is active
@@ -192,7 +192,6 @@ async function prepareExportsEntryPoints(
       }
     }
 
-    // This creates a directory with a lone package.json for backwards compatibility
     if (entryPoint.mount === '.') {
       if (exp.default) {
         pkg.main = exp.default;
@@ -203,28 +202,6 @@ async function prepareExportsEntryPoints(
       if (exp.types) {
         pkg.types = exp.types;
       }
-    } else {
-      // This is deferred until after we have created the target directory
-      compatibilityWriters.push(async targetDir => {
-        const entryPointDir = resolvePath(targetDir, entryPoint.name);
-        await fs.ensureDir(entryPointDir);
-        await fs.writeJson(
-          resolvePath(entryPointDir, PKG_PATH),
-          {
-            // Need a temporary name, as sharing the same name causes some typescript issues with caching of packages names
-            // And their defined `types` field.
-            name: `${pkg.name}__${entryPoint.name.toLocaleLowerCase('en-US')}`,
-            version: pkg.version,
-            ...(exp.default ? { main: posixPath.join('..', exp.default) } : {}),
-            ...(exp.import ? { module: posixPath.join('..', exp.import) } : {}),
-            ...(exp.types ? { types: posixPath.join('..', exp.types) } : {}),
-          },
-          { encoding: 'utf8', spaces: 2 },
-        );
-      });
-      if (Array.isArray(pkg.files) && !pkg.files.includes(entryPoint.name)) {
-        pkg.files.push(entryPoint.name);
-      }
     }
 
     if (Object.keys(exp).length > 0) {
@@ -238,10 +215,5 @@ async function prepareExportsEntryPoints(
     pkg.exports['./package.json'] = './package.json';
   }
 
-  if (compatibilityWriters.length > 0) {
-    return async (targetDir: string) => {
-      await Promise.all(compatibilityWriters.map(writer => writer(targetDir)));
-    };
-  }
   return undefined;
 }
diff --git a/packages/cli/src/lib/runner/runBackend.ts b/packages/cli/src/lib/runner/runBackend.ts
index f0ce971fee..fb8fdd9d55 100644
--- a/packages/cli/src/lib/runner/runBackend.ts
+++ b/packages/cli/src/lib/runner/runBackend.ts
@@ -40,6 +40,8 @@ export type RunBackendOptions = {
   inspectBrkEnabled: boolean;
   /** Additional module to require via the --require flag to the node process */
   require?: string;
+  /** An external linked workspace to override module resolution towards */
+  linkedWorkspace?: string;
 };
 
 export async function runBackend(options: RunBackendOptions) {
@@ -119,6 +121,7 @@ export async function runBackend(options: RunBackendOptions) {
         stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
         env: {
           ...process.env,
+          BACKSTAGE_CLI_LINKED_WORKSPACE: options.linkedWorkspace,
           BACKSTAGE_CLI_CHANNEL: '1',
           ESBK_TSCONFIG_PATH: paths.resolveTargetRoot('tsconfig.json'),
         },
diff --git a/packages/cli/src/lib/version.test.ts b/packages/cli/src/lib/version.test.ts
index 6b1aa391d5..744874d7e9 100644
--- a/packages/cli/src/lib/version.test.ts
+++ b/packages/cli/src/lib/version.test.ts
@@ -66,6 +66,10 @@ describe('createPackageVersionProvider', () => {
     expect(provider('c', '0.3.0-rc1')).toBe('0.3.0-rc1');
     expect(provider('c', '0.3.0')).toBe('^0.3.0');
     expect(provider('c', '0.3.6')).toBe('^0.3.4');
+
+    // No special handling for @types packages.
+    expect(provider('@types/t', '1.4.2')).toBe('^1.2.3');
+
     const cliVersion = packageVersions['@backstage/cli'];
     expect(provider('@backstage/cli')).toBe(
       // If we're currently in pre-release we expect that to be picked instead
@@ -74,6 +78,5 @@ describe('createPackageVersionProvider', () => {
     expect(provider('@backstage/core-plugin-api')).toBe(
       `^${corePluginApiPkg.version}`,
     );
-    expect(provider('@types/t', '1.4.2')).toBe('*');
   });
 });
diff --git a/packages/cli/src/lib/version.ts b/packages/cli/src/lib/version.ts
index 51826ef681..f267dadfeb 100644
--- a/packages/cli/src/lib/version.ts
+++ b/packages/cli/src/lib/version.ts
@@ -90,12 +90,6 @@ export function createPackageVersionProvider(lockfile?: Lockfile) {
     }
 
     const lockfileEntries = lockfile?.get(name);
-    if (
-      name.startsWith('@types/') &&
-      lockfileEntries?.some(entry => entry.range === '*')
-    ) {
-      return '*';
-    }
 
     for (const specifier of ['^', '~', '*']) {
       const range = `workspace:${specifier}`;
diff --git a/packages/cli/src/modules/config/alpha.ts b/packages/cli/src/modules/config/alpha.ts
new file mode 100644
index 0000000000..c32982086a
--- /dev/null
+++ b/packages/cli/src/modules/config/alpha.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createCliPlugin } from '../../wiring/factory';
+import yargs from 'yargs';
+import { Command } from 'commander';
+import { lazy } from '../../lib/lazy';
+
+export default createCliPlugin({
+  pluginId: 'config',
+  init: async reg => {
+    reg.addCommand({
+      path: ['config:docs'],
+      description: 'Browse the configuration reference documentation',
+      execute: async ({ args }) => {
+        const command = new Command();
+        const defaultCommand = command
+          .option(
+            '--package <name>',
+            'Only include the schema that applies to the given package',
+          )
+          .description('Browse the configuration reference documentation')
+          .action(lazy(() => import('./commands/docs').then(m => m.default)));
+
+        await defaultCommand.parseAsync(args, { from: 'user' });
+      },
+    });
+    reg.addCommand({
+      path: ['config', 'docs'],
+      description: 'Browse the configuration reference documentation',
+      execute: async ({ args }) => {
+        const argv = await yargs
+          .options({
+            package: { type: 'string' },
+          })
+          .help()
+          .parse(args);
+        const m = await import('./commands/docs');
+        await m.default(argv);
+      },
+    });
+    reg.addCommand({
+      path: ['config:print'],
+      description: 'Print the app configuration for the current package',
+      execute: async ({ args }) => {
+        const argv = await yargs
+          .options({
+            package: { type: 'string' },
+            lax: { type: 'boolean' },
+            frontend: { type: 'boolean' },
+            'with-secrets': { type: 'boolean' },
+            format: { type: 'string' },
+            config: { type: 'string', array: true },
+          })
+          .help()
+          .parse(args);
+        const m = await import('./commands/print');
+        await m.default(argv);
+      },
+    });
+    reg.addCommand({
+      path: ['config:check'],
+      description:
+        'Validate that the given configuration loads and matches schema',
+      execute: async ({ args }) => {
+        const argv = await yargs
+          .options({
+            package: { type: 'string' },
+            lax: { type: 'boolean' },
+            frontend: { type: 'boolean' },
+            deprecated: { type: 'boolean' },
+            strict: { type: 'boolean', required: true },
+            config: {
+              type: 'string',
+              array: true,
+              default: [],
+            },
+          })
+          .help()
+          .parse(args);
+        const m = await import('./commands/validate');
+        await m.default(argv);
+      },
+    });
+  },
+});
diff --git a/packages/cli/src/commands/config/docs.ts b/packages/cli/src/modules/config/commands/docs.ts
similarity index 96%
rename from packages/cli/src/commands/config/docs.ts
rename to packages/cli/src/modules/config/commands/docs.ts
index 98e683e87c..25e3a864f4 100644
--- a/packages/cli/src/commands/config/docs.ts
+++ b/packages/cli/src/modules/config/commands/docs.ts
@@ -19,7 +19,7 @@ import { mergeConfigSchemas } from '@backstage/config-loader';
 import { OptionValues } from 'commander';
 import { JSONSchema7 as JSONSchema } from 'json-schema';
 import openBrowser from 'react-dev-utils/openBrowser';
-import { loadCliConfig } from '../../lib/config';
+import { loadCliConfig } from '../lib/config';
 
 const DOCS_URL = 'https://config.backstage.io';
 
diff --git a/packages/cli/src/commands/config/print.ts b/packages/cli/src/modules/config/commands/print.ts
similarity index 97%
rename from packages/cli/src/commands/config/print.ts
rename to packages/cli/src/modules/config/commands/print.ts
index 9ef725ebf8..98833a7946 100644
--- a/packages/cli/src/commands/config/print.ts
+++ b/packages/cli/src/modules/config/commands/print.ts
@@ -17,7 +17,7 @@
 import { OptionValues } from 'commander';
 import { stringify as stringifyYaml } from 'yaml';
 import { AppConfig, ConfigReader } from '@backstage/config';
-import { loadCliConfig } from '../../lib/config';
+import { loadCliConfig } from '../lib/config';
 import { ConfigSchema, ConfigVisibility } from '@backstage/config-loader';
 
 export default async (opts: OptionValues) => {
diff --git a/packages/cli/src/commands/config/schema.ts b/packages/cli/src/modules/config/commands/schema.ts
similarity index 97%
rename from packages/cli/src/commands/config/schema.ts
rename to packages/cli/src/modules/config/commands/schema.ts
index 08bc46d1cc..73eb487d60 100644
--- a/packages/cli/src/commands/config/schema.ts
+++ b/packages/cli/src/modules/config/commands/schema.ts
@@ -17,7 +17,7 @@
 import { OptionValues } from 'commander';
 import { JSONSchema7 as JSONSchema } from 'json-schema';
 import { stringify as stringifyYaml } from 'yaml';
-import { loadCliConfig } from '../../lib/config';
+import { loadCliConfig } from '../lib/config';
 import { JsonObject } from '@backstage/types';
 import { mergeConfigSchemas } from '@backstage/config-loader';
 
diff --git a/packages/cli/src/commands/config/validate.ts b/packages/cli/src/modules/config/commands/validate.ts
similarity index 94%
rename from packages/cli/src/commands/config/validate.ts
rename to packages/cli/src/modules/config/commands/validate.ts
index c81d82832e..ac0b9d15e0 100644
--- a/packages/cli/src/commands/config/validate.ts
+++ b/packages/cli/src/modules/config/commands/validate.ts
@@ -15,7 +15,7 @@
  */
 
 import { OptionValues } from 'commander';
-import { loadCliConfig } from '../../lib/config';
+import { loadCliConfig } from '../lib/config';
 
 export default async (opts: OptionValues) => {
   await loadCliConfig({
diff --git a/packages/cli/src/modules/config/index.ts b/packages/cli/src/modules/config/index.ts
new file mode 100644
index 0000000000..0c6a79577d
--- /dev/null
+++ b/packages/cli/src/modules/config/index.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Command } from 'commander';
+import { lazy } from '../../lib/lazy';
+
+export const configOption = [
+  '--config <path>',
+  'Config files to load instead of app-config.yaml',
+  (opt: string, opts: string[]) => (opts ? [...opts, opt] : [opt]),
+  Array<string>(),
+] as const;
+
+export function registerCommands(program: Command) {
+  program
+    .command('config:docs')
+    .option(
+      '--package <name>',
+      'Only include the schema that applies to the given package',
+    )
+    .description('Browse the configuration reference documentation')
+    .action(lazy(() => import('./commands/docs').then(m => m.default)));
+
+  program
+    .command('config:print')
+    .option(
+      '--package <name>',
+      'Only load config schema that applies to the given package',
+    )
+    .option('--lax', 'Do not require environment variables to be set')
+    .option('--frontend', 'Print only the frontend configuration')
+    .option('--with-secrets', 'Include secrets in the printed configuration')
+    .option(
+      '--format <format>',
+      'Format to print the configuration in, either json or yaml [yaml]',
+    )
+    .option(...configOption)
+    .description('Print the app configuration for the current package')
+    .action(lazy(() => import('./commands/print').then(m => m.default)));
+
+  program
+    .command('config:check')
+    .option(
+      '--package <name>',
+      'Only load config schema that applies to the given package',
+    )
+    .option('--lax', 'Do not require environment variables to be set')
+    .option('--frontend', 'Only validate the frontend configuration')
+    .option('--deprecated', 'Output deprecated configuration settings')
+    .option(
+      '--strict',
+      'Enable strict config validation, forbidding errors and unknown keys',
+    )
+    .option(...configOption)
+    .description(
+      'Validate that the given configuration loads and matches schema',
+    )
+    .action(lazy(() => import('./commands/validate').then(m => m.default)));
+
+  program
+    .command('config:schema')
+    .option(
+      '--package <name>',
+      'Only output config schema that applies to the given package',
+    )
+    .option(
+      '--format <format>',
+      'Format to print the schema in, either json or yaml [yaml]',
+    )
+    .option('--merge', 'Print the config schemas merged', true)
+    .option('--no-merge', 'Print the config schemas not merged')
+    .description('Print configuration schema')
+    .action(lazy(() => import('./commands/schema').then(m => m.default)));
+}
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/modules/config/lib/config.ts
similarity index 99%
rename from packages/cli/src/lib/config.ts
rename to packages/cli/src/modules/config/lib/config.ts
index aab16a8670..afed53af6f 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/modules/config/lib/config.ts
@@ -16,7 +16,7 @@
 
 import { ConfigSources, loadConfigSchema } from '@backstage/config-loader';
 import { AppConfig, ConfigReader } from '@backstage/config';
-import { paths } from './paths';
+import { paths } from '../../../lib/paths';
 import { getPackages } from '@manypkg/get-packages';
 import { PackageGraph } from '@backstage/cli-node';
 
diff --git a/packages/cli/src/wiring/CliInitializer.ts b/packages/cli/src/wiring/CliInitializer.ts
new file mode 100644
index 0000000000..9fe8bb8084
--- /dev/null
+++ b/packages/cli/src/wiring/CliInitializer.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommandGraph } from './CommandGraph';
+import { CliFeature, InternalCliFeature, InternalCliPlugin } from './types';
+import { CommandRegistry } from './CommandRegistry';
+import { program } from 'commander';
+import { version } from '../lib/version';
+import chalk from 'chalk';
+import { exitWithError } from '../lib/errors';
+import { assertError } from '@backstage/errors';
+
+type UninitializedFeature = CliFeature | Promise<CliFeature>;
+
+export class CliInitializer {
+  private graph = new CommandGraph();
+  private commandRegistry = new CommandRegistry(this.graph);
+  #uninitiazedFeatures: Promise<CliFeature>[] = [];
+
+  add(module: UninitializedFeature) {
+    this.#uninitiazedFeatures.push(Promise.resolve(module));
+  }
+
+  async #register(feature: CliFeature) {
+    if (isCliPlugin(feature)) {
+      await feature.init(this.commandRegistry);
+    } else {
+      throw new Error(`Unsupported feature type: ${feature.$$type}`);
+    }
+  }
+
+  async #doInit() {
+    const features = await Promise.all(this.#uninitiazedFeatures);
+    for (const feature of features) {
+      await this.#register(feature);
+    }
+  }
+
+  /**
+   * Actually parse argv and pass it to the command.
+   */
+  async run() {
+    await this.#doInit();
+    program
+      .name('backstage-cli')
+      .version(version)
+      .allowUnknownOption(true)
+      .allowExcessArguments(true);
+
+    const queue = this.graph.atDepth(0).map(node => ({
+      node,
+      argParser: program,
+    }));
+    while (queue.length) {
+      const { node, argParser } = queue.shift()!;
+      if (node.$$type === '@tree/root') {
+        const treeParser = argParser
+          .command(`${node.name} [command]`)
+          .description(node.name);
+
+        queue.push(
+          ...node.children.map(child => ({
+            node: child,
+            argParser: treeParser,
+          })),
+        );
+      } else {
+        argParser
+          .command(node.name)
+          .description(node.command.description)
+          .helpOption(false)
+          .allowUnknownOption(true)
+          .allowExcessArguments(true)
+          .action(async () => {
+            try {
+              await node.command.execute({
+                args: program.parseOptions(process.argv).unknown,
+              });
+              process.exit(0);
+            } catch (error) {
+              assertError(error);
+              exitWithError(error);
+            }
+          });
+      }
+    }
+    program.on('command:*', () => {
+      console.log();
+      console.log(chalk.red(`Invalid command: ${program.args.join(' ')}`));
+      console.log();
+      program.outputHelp();
+      process.exit(1);
+    });
+
+    process.on('unhandledRejection', rejection => {
+      if (rejection instanceof Error) {
+        exitWithError(rejection);
+      } else {
+        exitWithError(new Error(`Unknown rejection: '${rejection}'`));
+      }
+    });
+
+    program.parse(process.argv);
+  }
+}
+
+function toInternalCliFeature(feature: CliFeature): InternalCliFeature {
+  if (feature.$$type !== '@backstage/CliFeature') {
+    throw new Error(`Invalid CliFeature, bad type '${feature.$$type}'`);
+  }
+  const internal = feature as InternalCliFeature;
+  if (internal.version !== 'v1') {
+    throw new Error(`Invalid CliFeature, bad version '${internal.version}'`);
+  }
+  return internal;
+}
+
+function isCliPlugin(feature: CliFeature): feature is InternalCliPlugin {
+  const internal = toInternalCliFeature(feature);
+  if (internal.featureType === 'plugin') {
+    return true;
+  }
+  // Backwards compatibility for v1 registrations that use duck typing
+  return 'plugin' in internal;
+}
diff --git a/packages/cli/src/wiring/CommandGraph.ts b/packages/cli/src/wiring/CommandGraph.ts
new file mode 100644
index 0000000000..a0a2de3305
--- /dev/null
+++ b/packages/cli/src/wiring/CommandGraph.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { BackstageCommand } from './types';
+
+type Node = TreeNode | LeafNode;
+
+interface TreeNode {
+  $$type: '@tree/root';
+  name: string;
+  children: TreeNode[];
+}
+
+interface LeafNode {
+  $$type: '@tree/leaf';
+  name: string;
+  command: BackstageCommand;
+}
+
+/**
+ * A sparse graph of commands.
+ */
+export class CommandGraph {
+  private graph: Node[] = [];
+
+  /**
+   * Adds a command to the graph. The graph is sparse, so we use the path to determine the nodes
+   *    to traverse. Only leaf nodes should have a command/action.
+   */
+  add(command: BackstageCommand) {
+    const path = command.path;
+    let current = this.graph;
+    for (let i = 0; i < path.length - 1; i++) {
+      const name = path[i];
+      let next = current.find(n => n.name === name);
+      if (!next) {
+        next = { $$type: '@tree/root', name, children: [] };
+        current.push(next);
+      } else if (next.$$type === '@tree/leaf') {
+        throw new Error(
+          `Command already exists at path: "${path.slice(0, i).join(' ')}"`,
+        );
+      }
+      current = next.children;
+    }
+    const last = current.find(n => n.name === path[path.length - 1]);
+    if (last && last.$$type === '@tree/leaf') {
+      throw new Error(
+        `Command already exists at path: "${path.slice(0, -1).join(' ')}"`,
+      );
+    } else {
+      current.push({
+        $$type: '@tree/leaf',
+        name: path[path.length - 1],
+        command,
+      });
+    }
+  }
+
+  /**
+   * Given a path, try to find a command that matches it.
+   */
+  find(path: string[]): BackstageCommand | undefined {
+    let current = this.graph;
+    for (let i = 0; i < path.length - 1; i++) {
+      const name = path[i];
+      const next = current.find(n => n.name === name);
+      if (!next) {
+        return undefined;
+      } else if (next.$$type === '@tree/leaf') {
+        return undefined;
+      }
+      current = next.children;
+    }
+    const last = current.find(n => n.name === path[path.length - 1]);
+    if (!last || last.$$type === '@tree/root') {
+      return undefined;
+    }
+    return last?.command;
+  }
+
+  atDepth(depth: number): Node[] {
+    let current = this.graph;
+    for (let i = 0; i < depth; i++) {
+      current = current.flatMap(n =>
+        n.$$type === '@tree/root' ? n.children : [],
+      );
+    }
+    return current;
+  }
+}
diff --git a/packages/cli/src/wiring/CommandRegistry.ts b/packages/cli/src/wiring/CommandRegistry.ts
new file mode 100644
index 0000000000..9e8ff9646c
--- /dev/null
+++ b/packages/cli/src/wiring/CommandRegistry.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CommandGraph } from './CommandGraph';
+import { BackstageCommand } from './types';
+
+export class CommandRegistry {
+  private graph: CommandGraph;
+  constructor(graph: CommandGraph) {
+    this.graph = graph;
+  }
+
+  addCommand(command: BackstageCommand) {
+    this.graph.add(command);
+  }
+}
diff --git a/packages/cli/src/wiring/factory.ts b/packages/cli/src/wiring/factory.ts
new file mode 100644
index 0000000000..eec058e180
--- /dev/null
+++ b/packages/cli/src/wiring/factory.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommandRegistry } from './CommandRegistry';
+import { InternalCliPlugin } from './types';
+
+export function createCliPlugin(options: {
+  pluginId: string;
+  init: (registry: CommandRegistry) => Promise<void>;
+}): InternalCliPlugin {
+  return {
+    id: options.pluginId,
+    init: options.init,
+    $$type: '@backstage/CliFeature',
+    version: 'v1',
+    featureType: 'plugin',
+    description: 'A Backstage CLI plugin',
+  };
+}
diff --git a/packages/cli/src/wiring/types.ts b/packages/cli/src/wiring/types.ts
new file mode 100644
index 0000000000..d9237a4c3a
--- /dev/null
+++ b/packages/cli/src/wiring/types.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CommandRegistry } from './CommandRegistry';
+
+export interface BackstageCommand {
+  path: string[];
+  description: string;
+  execute: (options: { args: string[] }) => Promise<void>;
+}
+
+export interface CliFeature {
+  $$type: '@backstage/CliFeature';
+}
+
+export interface CliPlugin {
+  id: string;
+  init: (registry: CommandRegistry) => Promise<void>;
+  $$type: '@backstage/CliFeature';
+}
+
+/**
+ * @public
+ */
+export interface InternalCliPlugin extends CliFeature {
+  version: 'v1';
+  featureType: 'plugin';
+  description: string;
+  id: string;
+  init: (registry: CommandRegistry) => Promise<void>;
+}
+
+/** @internal */
+export type InternalCliFeature = InternalCliPlugin;
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
index b26c8f76f6..89c2f0ecfa 100644
--- a/packages/codemods/CHANGELOG.md
+++ b/packages/codemods/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/codemods
 
+## 0.1.52
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## 0.1.52-next.0
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
 ## 0.1.51
 
 ### Patch Changes
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 95cdc2bc47..92b3dc7042 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/codemods",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "description": "A collection of codemods for Backstage projects",
   "backstage": {
     "role": "cli"
@@ -52,6 +52,6 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@types/jscodeshift": "^0.12.0",
-    "@types/node": "^18.17.8"
+    "@types/node": "^20.16.0"
   }
 }
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index 9107e5b104..15548ca9d7 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/config-loader
 
+## 1.9.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 1.9.3-next.0
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 1.9.2
+
+### Patch Changes
+
+- c5e39e7: Internal refactor to use the deferred from the types package
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 1.9.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 1.9.1
 
 ### Patch Changes
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 79a2eb5338..3359e285d9 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/config-loader",
-  "version": "1.9.1",
+  "version": "1.9.3-next.1",
   "description": "Config loading functionality used by Backstage backend, and CLI",
   "backstage": {
     "role": "node-library"
@@ -49,7 +49,6 @@
     "json-schema-traverse": "^1.0.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
-    "node-fetch": "^2.7.0",
     "typescript-json-schema": "^0.65.0",
     "yaml": "^2.0.0"
   },
diff --git a/packages/config-loader/src/loader.test.ts b/packages/config-loader/src/loader.test.ts
index a8299962b7..8908b4268b 100644
--- a/packages/config-loader/src/loader.test.ts
+++ b/packages/config-loader/src/loader.test.ts
@@ -20,6 +20,7 @@ import fs from 'fs-extra';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { createMockDirectory } from '@backstage/backend-test-utils';
+import { createDeferred } from '@backstage/types';
 
 describe('loadConfig', () => {
   const mockDir = createMockDirectory({
@@ -298,8 +299,8 @@ describe('loadConfig', () => {
   });
 
   it('watches config files', async () => {
-    const onChange = defer<AppConfig[]>();
-    const stopSignal = defer<void>();
+    const onChange = createDeferred<AppConfig[]>();
+    const stopSignal = createDeferred();
 
     await expect(
       loadConfig({
@@ -307,7 +308,7 @@ describe('loadConfig', () => {
         configTargets: [],
         watch: {
           onChange: onChange.resolve,
-          stopSignal: stopSignal.promise,
+          stopSignal,
         },
       }),
     ).resolves.toEqual({
@@ -331,7 +332,7 @@ describe('loadConfig', () => {
         title: 'New Title',
       },
     });
-    await expect(onChange.promise).resolves.toEqual([
+    await expect(onChange).resolves.toEqual([
       {
         context: 'app-config.yaml',
         data: {
@@ -347,8 +348,8 @@ describe('loadConfig', () => {
   });
 
   it('watches included files', async () => {
-    const onChange = defer<AppConfig[]>();
-    const stopSignal = defer<void>();
+    const onChange = createDeferred<AppConfig[]>();
+    const stopSignal = createDeferred();
 
     await expect(
       loadConfig({
@@ -358,7 +359,7 @@ describe('loadConfig', () => {
         ],
         watch: {
           onChange: onChange.resolve,
-          stopSignal: stopSignal.promise,
+          stopSignal,
         },
       }),
     ).resolves.toEqual({
@@ -387,7 +388,7 @@ describe('loadConfig', () => {
     // via included.yaml
     await fs.writeFile(mockDir.resolve('secrets/session-key.txt'), 'abc234');
 
-    await expect(onChange.promise).resolves.toEqual([
+    await expect(onChange).resolves.toEqual([
       {
         context: 'app-config.development.yaml',
         data: {
@@ -413,8 +414,8 @@ describe('loadConfig', () => {
   it('watches remote config urls', async () => {
     server.use(initialLoaderHandler);
 
-    const onChange = defer<AppConfig[]>();
-    const stopSignal = defer<void>();
+    const onChange = createDeferred<AppConfig[]>();
+    const stopSignal = createDeferred();
 
     const configUrl = 'https://some.domain.io/app-config.yaml';
     await expect(
@@ -423,7 +424,7 @@ describe('loadConfig', () => {
         configTargets: [{ url: configUrl }],
         watch: {
           onChange: onChange.resolve,
-          stopSignal: stopSignal.promise,
+          stopSignal,
         },
         remote: {
           reloadIntervalSeconds: 1,
@@ -446,7 +447,7 @@ describe('loadConfig', () => {
 
     server.use(reloadHandler);
 
-    await expect(onChange.promise).resolves.toEqual([
+    await expect(onChange).resolves.toEqual([
       {
         context: configUrl,
         data: {
@@ -463,7 +464,7 @@ describe('loadConfig', () => {
   });
 
   it('stops watching config files', async () => {
-    const stopSignal = defer<void>();
+    const stopSignal = createDeferred();
 
     await loadConfig({
       configRoot: mockDir.path,
@@ -472,7 +473,7 @@ describe('loadConfig', () => {
         onChange: () => {
           expect('not').toBe('called');
         },
-        stopSignal: stopSignal.promise,
+        stopSignal,
       },
     });
 
@@ -496,12 +497,4 @@ describe('loadConfig', () => {
       appConfigs: [],
     });
   });
-
-  function defer<T>() {
-    let resolve: (value: T) => void;
-    const promise = new Promise<T>(_resolve => {
-      resolve = _resolve;
-    });
-    return { promise, resolve: resolve! };
-  }
 });
diff --git a/packages/config-loader/src/sources/MutableConfigSource.ts b/packages/config-loader/src/sources/MutableConfigSource.ts
index 85585e2882..404a7216d5 100644
--- a/packages/config-loader/src/sources/MutableConfigSource.ts
+++ b/packages/config-loader/src/sources/MutableConfigSource.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '@backstage/types';
+import { DeferredPromise, JsonObject, createDeferred } from '@backstage/types';
 import {
   AsyncConfigSourceGenerator,
   ConfigSource,
   ReadConfigDataOptions,
 } from './types';
-import { simpleDefer, SimpleDeferred, waitOrAbort } from './utils';
+import { waitOrAbort } from './utils';
 
 /**
  * Options for {@link MutableConfigSource.create}.
@@ -52,20 +52,20 @@ export class MutableConfigSource implements ConfigSource {
   }
 
   #currentData?: JsonObject;
-  #deferred: SimpleDeferred<void>;
+  #deferred: DeferredPromise<void>;
   readonly #context: string;
   readonly #abortController = new AbortController();
 
   private constructor(context: string, initialData?: JsonObject) {
     this.#currentData = initialData;
     this.#context = context;
-    this.#deferred = simpleDefer();
+    this.#deferred = createDeferred();
   }
 
   async *readConfigData(
     options?: ReadConfigDataOptions | undefined,
   ): AsyncConfigSourceGenerator {
-    let deferredPromise = this.#deferred.promise;
+    let deferredPromise = this.#deferred;
 
     if (this.#currentData !== undefined) {
       yield { configs: [{ data: this.#currentData, context: this.#context }] };
@@ -79,7 +79,7 @@ export class MutableConfigSource implements ConfigSource {
       if (!ok) {
         return;
       }
-      deferredPromise = this.#deferred.promise;
+      deferredPromise = this.#deferred;
 
       if (this.#currentData !== undefined) {
         yield {
@@ -98,7 +98,7 @@ export class MutableConfigSource implements ConfigSource {
     if (!this.#abortController.signal.aborted) {
       this.#currentData = data;
       const oldDeferred = this.#deferred;
-      this.#deferred = simpleDefer();
+      this.#deferred = createDeferred();
       oldDeferred.resolve();
     }
   }
diff --git a/packages/config-loader/src/sources/RemoteConfigSource.ts b/packages/config-loader/src/sources/RemoteConfigSource.ts
index 1492cd4d28..d8fa07d708 100644
--- a/packages/config-loader/src/sources/RemoteConfigSource.ts
+++ b/packages/config-loader/src/sources/RemoteConfigSource.ts
@@ -21,7 +21,6 @@ import {
   durationToMilliseconds,
 } from '@backstage/types';
 import isEqual from 'lodash/isEqual';
-import fetch from 'node-fetch';
 import { ConfigTransformer, createConfigTransformer } from './transform';
 import {
   AsyncConfigSourceGenerator,
@@ -137,7 +136,7 @@ export class RemoteConfigSource implements ConfigSource {
 
   async #load(signal?: AbortSignal): Promise<JsonObject> {
     const res = await fetch(this.#url, {
-      signal: signal as import('node-fetch').RequestInit['signal'],
+      signal: signal as RequestInit['signal'],
     });
     if (!res.ok) {
       throw await ResponseError.fromResponse(res);
diff --git a/packages/config-loader/src/sources/StaticConfigSource.ts b/packages/config-loader/src/sources/StaticConfigSource.ts
index 3cbe9771a7..014ead8a99 100644
--- a/packages/config-loader/src/sources/StaticConfigSource.ts
+++ b/packages/config-loader/src/sources/StaticConfigSource.ts
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import { JsonObject, Observable } from '@backstage/types';
+import { JsonObject, Observable, createDeferred } from '@backstage/types';
 import {
   AsyncConfigSourceGenerator,
   ConfigSource,
   ReadConfigDataOptions,
 } from './types';
-import { simpleDefer } from './utils';
 
 /**
  * Options for {@link StaticConfigSource.create}.
@@ -47,13 +46,13 @@ class StaticObservableConfigSource implements ConfigSource {
     options?: ReadConfigDataOptions | undefined,
   ): AsyncConfigSourceGenerator {
     const queue = new Array<JsonObject>();
-    let deferred = simpleDefer<void>();
+    let deferred = createDeferred();
 
     const sub = this.data.subscribe({
       next(value) {
         queue.push(value);
         deferred.resolve();
-        deferred = simpleDefer();
+        deferred = createDeferred();
       },
       complete() {
         deferred.resolve();
@@ -73,7 +72,7 @@ class StaticObservableConfigSource implements ConfigSource {
     }
 
     for (;;) {
-      await deferred.promise;
+      await deferred;
       if (queue.length === 0) {
         return;
       }
diff --git a/packages/config-loader/src/sources/types.ts b/packages/config-loader/src/sources/types.ts
index abdf2f5c8e..fedce213c5 100644
--- a/packages/config-loader/src/sources/types.ts
+++ b/packages/config-loader/src/sources/types.ts
@@ -39,7 +39,7 @@ export interface ReadConfigDataOptions {
 }
 
 /**
- * The the generator returned by {@link ConfigSource.readConfigData}.
+ * The generator returned by {@link ConfigSource.readConfigData}.
  *
  * @public
  */
diff --git a/packages/config-loader/src/sources/utils.ts b/packages/config-loader/src/sources/utils.ts
index b948cc47b4..5095364f45 100644
--- a/packages/config-loader/src/sources/utils.ts
+++ b/packages/config-loader/src/sources/utils.ts
@@ -17,21 +17,6 @@
 import { Parser } from './types';
 import yaml from 'yaml';
 
-/** @internal */
-export interface SimpleDeferred<T> {
-  promise: Promise<T>;
-  resolve(value: T): void;
-}
-
-/** @internal */
-export function simpleDefer<T>(): SimpleDeferred<T> {
-  let resolve: (value: T) => void;
-  const promise = new Promise<T>(_resolve => {
-    resolve = _resolve;
-  });
-  return { promise, resolve: resolve! };
-}
-
 /** @internal */
 export async function waitOrAbort<T>(
   promise: PromiseLike<T>,
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 43cc91fd34..f4f0429f8e 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/config
 
+## 1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## 1.3.0
+
+### Minor Changes
+
+- d52d7f9: Make `readDurationFromConfig` support both ISO and ms formats as well, to make it easier to enter time as an end user
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/packages/config/package.json b/packages/config/package.json
index 35bc0719e3..79a2dfe980 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/config",
-  "version": "1.2.0",
+  "version": "1.3.1-next.0",
   "description": "Config API used by Backstage core, backend, and CLI",
   "backstage": {
     "role": "common-library"
@@ -37,7 +37,8 @@
   },
   "dependencies": {
     "@backstage/errors": "workspace:^",
-    "@backstage/types": "workspace:^"
+    "@backstage/types": "workspace:^",
+    "ms": "^2.1.3"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/packages/config/src/readDurationFromConfig.test.ts b/packages/config/src/readDurationFromConfig.test.ts
index 3da790ddcf..f3fa0819b0 100644
--- a/packages/config/src/readDurationFromConfig.test.ts
+++ b/packages/config/src/readDurationFromConfig.test.ts
@@ -15,114 +15,254 @@
  */
 
 import {
-  readDurationFromConfig,
   propsOfHumanDuration,
+  readDurationFromConfig,
 } from './readDurationFromConfig';
 import { ConfigReader } from './reader';
 
 describe('readDurationFromConfig', () => {
-  it('reads all known keys', () => {
-    const config = new ConfigReader({
-      milliseconds: 1,
-      seconds: 2,
-      minutes: 3,
-      hours: 4,
-      days: 5,
-      weeks: 6,
-      months: 7,
-      years: 8,
+  describe('ISO form', () => {
+    it('parses the known forms', () => {
+      const config = new ConfigReader({
+        d1: 'P2DT6H',
+        d2: 'PT0.5S',
+        d3: 'PT3.1S',
+        d4: 'P1Y2M3W4DT5H6M7.8S',
+      });
+
+      expect(readDurationFromConfig(config, { key: 'd1' })).toEqual({
+        days: 2,
+        hours: 6,
+      });
+      expect(readDurationFromConfig(config, { key: 'd2' })).toEqual({
+        milliseconds: 500,
+      });
+      expect(readDurationFromConfig(config, { key: 'd3' })).toEqual({
+        seconds: 3,
+        milliseconds: 100,
+      });
+      expect(readDurationFromConfig(config, { key: 'd4' })).toEqual({
+        years: 1,
+        months: 2,
+        weeks: 3,
+        days: 4,
+        hours: 5,
+        minutes: 6,
+        seconds: 7,
+        milliseconds: 800,
+      });
     });
-    expect(readDurationFromConfig(config)).toEqual({
-      milliseconds: 1,
-      seconds: 2,
-      minutes: 3,
-      hours: 4,
-      days: 5,
-      weeks: 6,
-      months: 7,
-      years: 8,
+
+    it('throws on errors', () => {
+      const config = new ConfigReader({
+        d1: 'P 1Y',
+        d2: 'P1L',
+        d3: 'P',
+      });
+
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd1' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid duration 'P 1Y' in config at 'd1', Error: Invalid ISO format, expected a value similar to 'P2DT6H' (2 days 6 hours) or 'PT1M' (1 minute)"`,
+      );
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd2' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid duration 'P1L' in config at 'd2', Error: Invalid ISO format, expected a value similar to 'P2DT6H' (2 days 6 hours) or 'PT1M' (1 minute)"`,
+      );
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd3' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid duration 'P' in config at 'd3', Error: Invalid ISO format, no values given"`,
+      );
     });
   });
 
-  it('reads all known keys, for a subkey', () => {
-    const config = new ConfigReader({
-      sub: {
-        key: {
-          milliseconds: 1,
-          seconds: 2,
-          minutes: 3,
-          hours: 4,
-          days: 5,
-          weeks: 6,
-          months: 7,
-          years: 8,
+  describe('ms form', () => {
+    it('parses the known units', () => {
+      // this is not exhaustive, but tests all supported units to ensure that
+      // our conversion to HumanDuration form works
+      const config = new ConfigReader({
+        d1: '1y',
+        d2: '2 years',
+        d3: '4w',
+        d4: '5h',
+        d5: '6 hrs',
+        d6: '7min',
+        d7: '9 minutes',
+        d8: '3.5 seconds',
+        d9: '25 ms',
+        d10: '1850ms',
+      });
+
+      expect(readDurationFromConfig(config, { key: 'd1' })).toEqual({
+        years: 1,
+      });
+      expect(readDurationFromConfig(config, { key: 'd2' })).toEqual({
+        years: 2,
+      });
+      expect(readDurationFromConfig(config, { key: 'd3' })).toEqual({
+        weeks: 4,
+      });
+      expect(readDurationFromConfig(config, { key: 'd4' })).toEqual({
+        hours: 5,
+      });
+      expect(readDurationFromConfig(config, { key: 'd5' })).toEqual({
+        hours: 6,
+      });
+      expect(readDurationFromConfig(config, { key: 'd6' })).toEqual({
+        minutes: 7,
+      });
+      expect(readDurationFromConfig(config, { key: 'd7' })).toEqual({
+        minutes: 9,
+      });
+      expect(readDurationFromConfig(config, { key: 'd8' })).toEqual({
+        seconds: 3,
+        milliseconds: 500,
+      });
+      expect(readDurationFromConfig(config, { key: 'd9' })).toEqual({
+        milliseconds: 25,
+      });
+      expect(readDurationFromConfig(config, { key: 'd10' })).toEqual({
+        seconds: 1,
+        milliseconds: 850,
+      });
+    });
+
+    it('throws on errors', () => {
+      const config = new ConfigReader({
+        d1: '1m 3s',
+        d2: '-3s',
+        d3: '',
+      });
+
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd1' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid duration '1m 3s' in config at 'd1', Error: Not a valid duration string, try a number followed by a unit such as '1d' or '2 seconds'"`,
+      );
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd2' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid duration '-3s' in config at 'd2', Error: Negative durations are not allowed"`,
+      );
+      expect(() =>
+        readDurationFromConfig(config, { key: 'd3' }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid type in config for key 'd3' in 'mock-config', got empty-string, wanted string"`,
+      );
+    });
+  });
+
+  describe('object form', () => {
+    it('reads all known keys', () => {
+      const config = new ConfigReader({
+        milliseconds: 1,
+        seconds: 2,
+        minutes: 3,
+        hours: 4,
+        days: 5,
+        weeks: 6,
+        months: 7,
+        years: 8,
+      });
+      expect(readDurationFromConfig(config)).toEqual({
+        milliseconds: 1,
+        seconds: 2,
+        minutes: 3,
+        hours: 4,
+        days: 5,
+        weeks: 6,
+        months: 7,
+        years: 8,
+      });
+    });
+
+    it('reads all known keys, for a subkey', () => {
+      const config = new ConfigReader({
+        sub: {
+          key: {
+            milliseconds: 1,
+            seconds: 2,
+            minutes: 3,
+            hours: 4,
+            days: 5,
+            weeks: 6,
+            months: 7,
+            years: 8,
+          },
         },
+      });
+      expect(readDurationFromConfig(config, { key: 'sub.key' })).toEqual({
+        milliseconds: 1,
+        seconds: 2,
+        minutes: 3,
+        hours: 4,
+        days: 5,
+        weeks: 6,
+        months: 7,
+        years: 8,
+      });
+    });
+
+    it('rejects wrong type of target, for a subkey', () => {
+      const config = new ConfigReader({
+        sub: { key: 7 },
+      });
+      expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
+        "Failed to read duration from config, TypeError: Invalid type in config for key 'sub.key' in 'mock-config', got number, wanted object",
+      );
+    });
+
+    it('rejects no keys', () => {
+      const config = new ConfigReader({});
+      expect(() => readDurationFromConfig(config)).toThrow(
+        `Failed to read duration from config, Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+      );
+    });
+
+    it('rejects no keys, for a subkey', () => {
+      const config = new ConfigReader({ sub: { key: {} } });
+      expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
+        `Failed to read duration from config at 'sub.key', Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+      );
+    });
+
+    it('rejects unknown keys', () => {
+      const config = new ConfigReader({
+        minutes: 3,
+        invalid: 'value',
+      });
+      expect(() => readDurationFromConfig(config)).toThrow(
+        `Failed to read duration from config, Error: Unknown property 'invalid'; expected one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
+      );
+    });
+
+    it.each(propsOfHumanDuration)('rejects non-number %p', prop => {
+      const config = new ConfigReader({
+        [prop]: 'value',
+      });
+      expect(() => readDurationFromConfig(config)).toThrow(
+        `Failed to read duration from config, Error: Unable to convert config value for key '${prop}' in 'mock-config' to a number`,
+      );
+    });
+
+    it.each(propsOfHumanDuration)(
+      'rejects non-number %p, for a subkey',
+      prop => {
+        const config = new ConfigReader({
+          sub: {
+            key: {
+              [prop]: 'value',
+            },
+          },
+        });
+        expect(() =>
+          readDurationFromConfig(config, { key: 'sub.key' }),
+        ).toThrow(
+          `Failed to read duration from config, Error: Unable to convert config value for key 'sub.key.${prop}' in 'mock-config' to a number`,
+        );
       },
-    });
-    expect(readDurationFromConfig(config, { key: 'sub.key' })).toEqual({
-      milliseconds: 1,
-      seconds: 2,
-      minutes: 3,
-      hours: 4,
-      days: 5,
-      weeks: 6,
-      months: 7,
-      years: 8,
-    });
-  });
-
-  it('rejects wrong type of target, for a subkey', () => {
-    const config = new ConfigReader({
-      sub: { key: 7 },
-    });
-    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
-      "Failed to read duration from config, TypeError: Invalid type in config for key 'sub.key' in 'mock-config', got number, wanted object",
-    );
-  });
-
-  it('rejects no keys', () => {
-    const config = new ConfigReader({});
-    expect(() => readDurationFromConfig(config)).toThrow(
-      `Failed to read duration from config, Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
-    );
-  });
-
-  it('rejects no keys, for a subkey', () => {
-    const config = new ConfigReader({ sub: { key: {} } });
-    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
-      `Failed to read duration from config at 'sub.key', Error: Needs one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
-    );
-  });
-
-  it('rejects unknown keys', () => {
-    const config = new ConfigReader({
-      minutes: 3,
-      invalid: 'value',
-    });
-    expect(() => readDurationFromConfig(config)).toThrow(
-      `Failed to read duration from config, Error: Unknown property 'invalid'; expected one or more of 'years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds'`,
-    );
-  });
-
-  it.each(propsOfHumanDuration)('rejects non-number %p', prop => {
-    const config = new ConfigReader({
-      [prop]: 'value',
-    });
-    expect(() => readDurationFromConfig(config)).toThrow(
-      `Failed to read duration from config, Error: Unable to convert config value for key '${prop}' in 'mock-config' to a number`,
-    );
-  });
-
-  it.each(propsOfHumanDuration)('rejects non-number %p, for a subkey', prop => {
-    const config = new ConfigReader({
-      sub: {
-        key: {
-          [prop]: 'value',
-        },
-      },
-    });
-    expect(() => readDurationFromConfig(config, { key: 'sub.key' })).toThrow(
-      `Failed to read duration from config, Error: Unable to convert config value for key 'sub.key.${prop}' in 'mock-config' to a number`,
     );
   });
 });
diff --git a/packages/config/src/readDurationFromConfig.ts b/packages/config/src/readDurationFromConfig.ts
index 2f59e9a976..e02651084e 100644
--- a/packages/config/src/readDurationFromConfig.ts
+++ b/packages/config/src/readDurationFromConfig.ts
@@ -15,8 +15,9 @@
  */
 
 import { Config } from '@backstage/config';
-import { InputError } from '@backstage/errors';
+import { InputError, stringifyError } from '@backstage/errors';
 import { HumanDuration } from '@backstage/types';
+import ms from 'ms';
 
 export const propsOfHumanDuration = [
   'years',
@@ -30,18 +31,29 @@ export const propsOfHumanDuration = [
 ];
 
 /**
- * Reads a duration from a config object.
+ * Reads a duration from config.
  *
  * @public
  * @remarks
  *
+ * The supported formats are:
+ *
+ * - A string in the format of '1d', '2 seconds' etc. as supported by the `ms`
+ *   library.
+ * - A standard ISO formatted duration string, e.g. 'P2DT6H' or 'PT1M'.
+ * - An object with individual units (in plural) as keys, e.g. `{ days: 2, hours: 6 }`.
+ *
+ * The string forms are naturally only supported if the `options.key` argument
+ * is passed, since a `Config` argument always represents an object by its
+ * nature.
+ *
  * This does not support optionality; if you want to support optional durations,
  * you need to first check the presence of the target with `config.has(...)` and
  * then call this function.
  *
  * @param config - A configuration object
- * @param key - If specified, read the duration from the given subkey
- *        under the config object
+ * @param key - If specified, read the duration from the given subkey under the
+ *        config object
  * @returns A duration object
  */
 export function readDurationFromConfig(
@@ -49,6 +61,33 @@ export function readDurationFromConfig(
   options?: {
     key?: string;
   },
+): HumanDuration {
+  if (options?.key && typeof config.getOptional(options.key) === 'string') {
+    const value = config.getString(options.key).trim();
+    try {
+      return value.startsWith('P')
+        ? parseIsoDuration(value)
+        : parseMsDuration(value);
+    } catch (error) {
+      throw new InputError(
+        `Invalid duration '${value}' in config at '${
+          options.key
+        }', ${stringifyError(error)}`,
+      );
+    }
+  }
+
+  return parseObjectDuration(config, options);
+}
+
+/**
+ * Parses the object form of durations.
+ */
+export function parseObjectDuration(
+  config: Config,
+  options?: {
+    key?: string;
+  },
 ): HumanDuration {
   let root: Config;
   let found = false;
@@ -94,8 +133,178 @@ export function readDurationFromConfig(
     if (options?.key) {
       prefix += ` at '${options.key}'`;
     }
-    throw new InputError(`${prefix}, ${error}`);
+    throw new Error(`${prefix}, ${error}`);
   }
 
   return result as HumanDuration;
 }
+
+/**
+ * Parses friendly string durations like '1d', '2 seconds' etc using the ms
+ * library.
+ */
+export function parseMsDuration(input: string): HumanDuration {
+  if (/^\d+$/.exec(input)) {
+    // We explicitly disallow the only-digits form of the ms library, because
+    // from a configuration perspective it's just confusing to even be able to
+    // specify that
+    throw new Error(
+      `The value cannot be a plain number; try adding a unit like 'ms' or 'seconds'`,
+    );
+  }
+
+  let milliseconds = ms(input);
+  if (!Number.isFinite(milliseconds)) {
+    throw new Error(
+      `Not a valid duration string, try a number followed by a unit such as '1d' or '2 seconds'`,
+    );
+  } else if (milliseconds < 0) {
+    throw new Error('Negative durations are not allowed');
+  } else if (milliseconds === 0) {
+    return { milliseconds: 0 };
+  }
+
+  // As used by the ms library
+  const s = 1000;
+  const m = s * 60;
+  const h = m * 60;
+  const d = h * 24;
+  const w = d * 7;
+  const y = d * 365.25;
+
+  const result: HumanDuration = {};
+
+  if (milliseconds >= y) {
+    const years = Math.floor(milliseconds / y);
+    milliseconds -= years * y;
+    result.years = years;
+  }
+
+  if (milliseconds >= w) {
+    const weeks = Math.floor(milliseconds / w);
+    milliseconds -= weeks * w;
+    result.weeks = weeks;
+  }
+
+  if (milliseconds >= d) {
+    const days = Math.floor(milliseconds / d);
+    milliseconds -= days * d;
+    result.days = days;
+  }
+
+  if (milliseconds >= h) {
+    const hours = Math.floor(milliseconds / h);
+    milliseconds -= hours * h;
+    result.hours = hours;
+  }
+
+  if (milliseconds >= m) {
+    const minutes = Math.floor(milliseconds / m);
+    milliseconds -= minutes * m;
+    result.minutes = minutes;
+  }
+
+  if (milliseconds >= s) {
+    const seconds = Math.floor(milliseconds / s);
+    milliseconds -= seconds * s;
+    result.seconds = seconds;
+  }
+
+  if (milliseconds > 0) {
+    result.milliseconds = milliseconds;
+  }
+
+  return result;
+}
+
+/**
+ * Parses an ISO formatted duration string.
+ *
+ * Implementation taken from luxon's Duration.fromISO to not force that
+ * dependency on everyone.
+ */
+export function parseIsoDuration(input: string): HumanDuration {
+  const match =
+    /^-?P(?:(?:(-?\d{1,20}(?:\.\d{1,20})?)Y)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20}(?:\.\d{1,20})?)W)?(?:(-?\d{1,20}(?:\.\d{1,20})?)D)?(?:T(?:(-?\d{1,20}(?:\.\d{1,20})?)H)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,20}))?S)?)?)$/.exec(
+      input,
+    );
+  if (!match) {
+    throw new Error(
+      `Invalid ISO format, expected a value similar to 'P2DT6H' (2 days 6 hours) or 'PT1M' (1 minute)`,
+    );
+  }
+
+  const [
+    s,
+    yearStr,
+    monthStr,
+    weekStr,
+    dayStr,
+    hourStr,
+    minuteStr,
+    secondStr,
+    millisecondsStr,
+  ] = match;
+
+  const hasNegativePrefix = s[0] === '-';
+  const negativeSeconds = !!secondStr && secondStr[0] === '-';
+
+  const maybeNegate = (num: number | undefined, force = false) =>
+    num !== undefined && (force || (num && hasNegativePrefix)) ? -num : num;
+
+  const parseFloating = (value: string) => {
+    if (typeof value === 'undefined' || value === null || value === '') {
+      return undefined;
+    }
+    return parseFloat(value);
+  };
+
+  const parseMillis = (fraction: string | undefined) => {
+    // Return undefined (instead of 0) in these cases, where fraction is not set
+    if (
+      typeof fraction === 'undefined' ||
+      fraction === null ||
+      fraction === ''
+    ) {
+      return undefined;
+    }
+    const f = parseFloat(`0.${fraction}`) * 1000;
+    return Math.floor(f);
+  };
+
+  const years = maybeNegate(parseFloating(yearStr));
+  const months = maybeNegate(parseFloating(monthStr));
+  const weeks = maybeNegate(parseFloating(weekStr));
+  const days = maybeNegate(parseFloating(dayStr));
+  const hours = maybeNegate(parseFloating(hourStr));
+  const minutes = maybeNegate(parseFloating(minuteStr));
+  const seconds = maybeNegate(parseFloating(secondStr), secondStr === '-0');
+  const milliseconds = maybeNegate(
+    parseMillis(millisecondsStr),
+    negativeSeconds,
+  );
+
+  if (
+    years === undefined &&
+    months === undefined &&
+    weeks === undefined &&
+    days === undefined &&
+    hours === undefined &&
+    minutes === undefined &&
+    seconds === undefined &&
+    milliseconds === undefined
+  ) {
+    throw new Error('Invalid ISO format, no values given');
+  }
+
+  return {
+    ...(years ? { years } : {}),
+    ...(months ? { months } : {}),
+    ...(weeks ? { weeks } : {}),
+    ...(days ? { days } : {}),
+    ...(hours ? { hours } : {}),
+    ...(minutes ? { minutes } : {}),
+    ...(seconds ? { seconds } : {}),
+    ...(milliseconds ? { milliseconds } : {}),
+  };
+}
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index d5836eb341..995d8140f7 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/core-app-api
 
+## 1.15.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.15.3-next.0
+
+### Patch Changes
+
+- e5fa018: The OAuth 2 client implementations will now attempt to refresh the session when the existing session doesn't have the required scopes. The previous behavior was to only try to refresh the session of it was missing, and otherwise directly request a new session. This fixes an issue where some auth providers will not return access tokens with certain scopes unless explicitly requested, leading to an auth popup even if the underlying session already had been granted the requested scopes.
+- 2830689: Decrease OAuth2 token refresh grace period
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.15.2
+
+### Patch Changes
+
+- 44b82da: The default config loader no longer requires `process.env.APP_CONFIG` to be set, allowing config to be read from other sources instead.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
 ## 1.15.1
 
 ### Patch Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 88edc6ccfd..92bf422050 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-app-api",
-  "version": "1.15.1",
+  "version": "1.15.3-next.1",
   "description": "Core app API used by Backstage apps",
   "backstage": {
     "role": "web-library"
diff --git a/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts b/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts
index 58ffc9441b..37b50bdcbb 100644
--- a/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts
+++ b/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts
@@ -26,7 +26,7 @@ const ERROR_PREFIX = 'Invalid discovery URL pattern,';
  */
 export class UrlPatternDiscovery implements DiscoveryApi {
   /**
-   * Creates a new UrlPatternDiscovery given a template. The the only
+   * Creates a new UrlPatternDiscovery given a template. The only
    * interpolation done for the template is to replace instances of `{{pluginId}}`
    * with the ID of the plugin being requested.
    *
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
index dbad031652..4963330724 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts
@@ -148,7 +148,7 @@ export default class OAuth2
             (session.backstageIdentity.expiresAt.getTime() - Date.now()) / 1000,
           );
         }
-        return min < 60 * 5;
+        return min < 60 * 3;
       },
     });
 
diff --git a/packages/core-app-api/src/app/defaultConfigLoader.test.tsx b/packages/core-app-api/src/app/defaultConfigLoader.test.tsx
index 44d93aa625..556e4c928e 100644
--- a/packages/core-app-api/src/app/defaultConfigLoader.test.tsx
+++ b/packages/core-app-api/src/app/defaultConfigLoader.test.tsx
@@ -29,6 +29,10 @@ describe('defaultConfigLoaderSync', () => {
     delete anyWindow.__APP_CONFIG__;
   });
 
+  it('loads nothing is config is missing', () => {
+    expect(defaultConfigLoaderSync()).toEqual([]);
+  });
+
   it('loads static config', () => {
     anyEnv.APP_CONFIG = [
       { data: { my: 'config' }, context: 'a' },
@@ -95,12 +99,6 @@ describe('defaultConfigLoaderSync', () => {
     expect(ConfigReader.fromConfigs(configs).get('my')).toBe('override-config');
   });
 
-  it('fails to load invalid missing config', () => {
-    expect(() => defaultConfigLoaderSync()).toThrow(
-      'No static configuration provided',
-    );
-  });
-
   it('fails to load invalid static config', () => {
     anyEnv.APP_CONFIG = { my: 'invalid-config' };
     expect(() => defaultConfigLoaderSync()).toThrow(
diff --git a/packages/core-app-api/src/app/defaultConfigLoader.ts b/packages/core-app-api/src/app/defaultConfigLoader.ts
index bfcef390ec..0a65112041 100644
--- a/packages/core-app-api/src/app/defaultConfigLoader.ts
+++ b/packages/core-app-api/src/app/defaultConfigLoader.ts
@@ -40,14 +40,15 @@ export function defaultConfigLoaderSync(
   // It's a param so we can test it, but at runtime this will always fall back to default.
   runtimeConfigJson: string = '__APP_INJECTED_RUNTIME_CONFIG__',
 ) {
-  const appConfig = process.env.APP_CONFIG;
-  if (!appConfig) {
-    throw new Error('No static configuration provided');
+  const configs = new Array<AppConfig>();
+
+  const staticConfig = process.env.APP_CONFIG;
+  if (staticConfig) {
+    if (!Array.isArray(staticConfig)) {
+      throw new Error('Static configuration has invalid format');
+    }
+    configs.push(...staticConfig);
   }
-  if (!Array.isArray(appConfig)) {
-    throw new Error('Static configuration has invalid format');
-  }
-  const configs = appConfig.slice() as unknown as AppConfig[];
 
   // Check if we have any config script tags, otherwise fall back to injected config
   const configScripts = document.querySelectorAll(
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 e26934f393..88000638e6 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts
@@ -165,4 +165,107 @@ describe('RefreshingAuthSessionManager', () => {
     expect(removeSession).toHaveBeenCalled();
     expect(await manager.getSession({ optional: true })).toBe(undefined);
   });
+
+  it('should handle two simultaneous session refreshes with same scopes', async () => {
+    const createSession = jest.fn();
+    const refreshSession = jest.fn(async (scopes?: Set<string>) => ({
+      scopes: scopes ?? new Set(),
+      expired: false,
+    }));
+    const manager = new RefreshingAuthSessionManager({
+      connector: { createSession, refreshSession },
+      ...defaultOptions,
+    } as any);
+
+    const sessionPromise1 = manager.getSession({ scopes: new Set(['a']) });
+    const sessionPromise2 = manager.getSession({ scopes: new Set(['a']) });
+
+    const [session1, session2] = await Promise.all([
+      sessionPromise1,
+      sessionPromise2,
+    ]);
+
+    expect(session1).toEqual({ scopes: new Set(['a']), expired: false });
+    expect(session2).toEqual({ scopes: new Set(['a']), expired: false });
+    expect(refreshSession).toHaveBeenCalledTimes(1);
+  });
+
+  it('should handle two simultaneous session refreshes with different scopes', async () => {
+    const createSession = jest.fn();
+    const refreshSession = jest.fn(async (scopes?: Set<string>) => ({
+      scopes: scopes ?? new Set(),
+      expired: false,
+    }));
+    const manager = new RefreshingAuthSessionManager({
+      connector: { createSession, refreshSession },
+      ...defaultOptions,
+    } as any);
+
+    const sessionPromise1 = manager.getSession({ scopes: new Set(['a']) });
+    const sessionPromise2 = manager.getSession({ scopes: new Set(['b']) });
+
+    const [session1, session2] = await Promise.all([
+      sessionPromise1,
+      sessionPromise2,
+    ]);
+
+    expect(session1).toEqual({ scopes: new Set(['a']), expired: false });
+    expect(session2).toEqual({ scopes: new Set(['a', 'b']), expired: false });
+    expect(refreshSession).toHaveBeenCalledTimes(2);
+  });
+
+  it('should handle multiple simultaneous session refreshes with different scopes', async () => {
+    const createSession = jest.fn();
+    const refreshSession = jest.fn(async (scopes?: Set<string>) => ({
+      scopes: scopes ?? new Set(),
+      expired: false,
+    }));
+    const manager = new RefreshingAuthSessionManager({
+      connector: { createSession, refreshSession },
+      ...defaultOptions,
+    } as any);
+
+    const sessionPromise1 = manager.getSession({ scopes: new Set(['a']) });
+    const sessionPromise2 = manager.getSession({ scopes: new Set(['a', 'b']) });
+    const sessionPromise3 = manager.getSession({ scopes: new Set(['b', 'c']) });
+    const sessionPromise4 = manager.getSession({ scopes: new Set(['a', 'c']) });
+
+    const [session1, session2, session3, session4] = await Promise.all([
+      sessionPromise1,
+      sessionPromise2,
+      sessionPromise3,
+      sessionPromise4,
+    ]);
+
+    expect(session1).toEqual({ scopes: new Set(['a']), expired: false });
+    expect(session2).toEqual({ scopes: new Set(['a', 'b']), expired: false });
+    expect(session3).toEqual({
+      scopes: new Set(['a', 'b', 'c']),
+      expired: false,
+    });
+    expect(session4).toEqual({
+      scopes: new Set(['a', 'b', 'c']),
+      expired: false,
+    });
+    expect(refreshSession).toHaveBeenCalledTimes(3);
+  });
+
+  it("should fall back to create a new session if refresh doesn't provide the correct scopes", async () => {
+    const createSession = jest
+      .fn()
+      .mockResolvedValue({ scopes: new Set(['c']), expired: false });
+    const refreshSession = jest
+      .fn()
+      .mockResolvedValue({ scopes: new Set(['b']), expired: false });
+    const manager = new RefreshingAuthSessionManager({
+      connector: { createSession, refreshSession },
+      ...defaultOptions,
+    } as any);
+
+    const session = await manager.getSession({ scopes: new Set(['a']) });
+
+    expect(session).toEqual({ scopes: new Set(['c']), expired: false });
+    expect(refreshSession).toHaveBeenCalledTimes(1);
+    expect(createSession).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
index c92fe9fb20..414743ba9d 100644
--- a/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
+++ b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts
@@ -97,7 +97,7 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
     // stay in a synchronous call stack from the user interaction. The downside
     // is that the user will sometimes be requested to log in even if they
     // already had an existing session.
-    if (!this.currentSession && !options.instantPopup) {
+    if (!options.instantPopup) {
       try {
         const newSession = await this.collapsedSessionRefresh(options.scopes);
         this.currentSession = newSession;
@@ -143,6 +143,11 @@ export class RefreshingAuthSessionManager<T> implements SessionManager<T> {
 
     try {
       const session = await this.refreshPromise;
+      if (!this.helper.sessionExistsAndHasScope(session, scopes)) {
+        throw new Error(
+          'Refreshed session did not receive the required scopes',
+        );
+      }
       this.stateTracker.setIsSignedIn(true);
       return session;
     } finally {
diff --git a/packages/core-compat-api/CHANGELOG.md b/packages/core-compat-api/CHANGELOG.md
index 45be743989..e8fd9439d0 100644
--- a/packages/core-compat-api/CHANGELOG.md
+++ b/packages/core-compat-api/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/core-compat-api
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- 1f30730: Updated dependency `@oriflame/backstage-plugin-score-card` to `^0.9.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/version-bridge@1.0.10
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json
index dc053c6bee..83d0d2ee51 100644
--- a/packages/core-compat-api/package.json
+++ b/packages/core-compat-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-compat-api",
-  "version": "0.3.1",
+  "version": "0.3.4-next.2",
   "backstage": {
     "role": "web-library"
   },
@@ -46,7 +46,7 @@
     "@backstage/plugin-catalog": "workspace:^",
     "@backstage/test-utils": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@oriflame/backstage-plugin-score-card": "^0.8.0",
+    "@oriflame/backstage-plugin-score-card": "^0.9.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
     "@types/react": "^18.0.0",
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 3dcc8a5ad4..37c3b72d7e 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,129 @@
 # @backstage/core-components
 
+## 0.16.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.2-next.1
+
+### Patch Changes
+
+- e47be38: Added data-testid to placeholder rendered by Progress component to simplify assertions in tests
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.0
+
+### Minor Changes
+
+- dc409c5: The SupportButton component will now be hidden if no support config is specified in app-config
+
+### Patch Changes
+
+- 0f18340: Change core component Table tool bar search box to the a appropriate Search icon and text
+- af9097e: Adds the ability to mock a media query per break point and to change the active break point during a test. Usage example:
+
+  ```ts
+  const { set } = mockBreakpoint({
+    initialBreakpoint: 'md',
+    queryBreakpointMap: {
+      '(min-width:1500px)': 'xl',
+      '(min-width:1000px)': 'lg',
+      '(min-width:700px)': 'md',
+      '(min-width:400px)': 'sm',
+      '(min-width:0px)': 'xs',
+    },
+  });
+  // assertions for when the active break point is "md"
+  set('lg');
+  // assertions for when the active break point is "lg"
+  ```
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.0-next.2
+
+### Patch Changes
+
+- 0f18340: Change core component Table tool bar search box to the a appropriate Search icon and text
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/version-bridge@1.0.10
+
+## 0.16.0-next.0
+
+### Minor Changes
+
+- dc409c5: The SupportButton component will now be hidden if no support config is specified in app-config
+
+### Patch Changes
+
+- af9097e: Adds the ability to mock a media query per break point and to change the active break point during a test. Usage example:
+
+  ```ts
+  const { set } = mockBreakpoint({
+    initialBreakpoint: 'md',
+    queryBreakpointMap: {
+      '(min-width:1500px)': 'xl',
+      '(min-width:1000px)': 'lg',
+      '(min-width:700px)': 'md',
+      '(min-width:400px)': 'sm',
+      '(min-width:0px)': 'xs',
+    },
+  });
+  // assertions for when the active break point is "md"
+  set('lg');
+  // assertions for when the active break point is "lg"
+  ```
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.0
+  - @backstage/version-bridge@1.0.10
+
 ## 0.15.1
 
 ### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 40b31f5a8d..6405e49836 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-components",
-  "version": "0.15.1",
+  "version": "0.16.2-next.2",
   "description": "Core components used by Backstage plugins and apps",
   "backstage": {
     "role": "web-library"
@@ -65,6 +65,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@react-hookz/web": "^24.0.0",
+    "@testing-library/react": "^16.0.0",
     "@types/react-sparklines": "^1.7.0",
     "ansi-regex": "^6.0.1",
     "classnames": "^2.2.6",
@@ -98,7 +99,6 @@
     "@backstage/test-utils": "workspace:^",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/ansi-regex": "^5.0.0",
     "@types/classnames": "^2.2.9",
diff --git a/packages/core-components/report-testUtils.api.md b/packages/core-components/report-testUtils.api.md
index 93a6bb2a07..0cb4282243 100644
--- a/packages/core-components/report-testUtils.api.md
+++ b/packages/core-components/report-testUtils.api.md
@@ -3,8 +3,19 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
+
 // @public
 export function mockBreakpoint(options: { matches: boolean }): void;
 
+// @public
+export function mockBreakpoint(options: {
+  initialBreakpoint?: Breakpoint;
+  queryBreakpointMap?: Record<string, Breakpoint>;
+}): {
+  set(value: string): void;
+  remove(): void;
+};
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx
index d9d82437e4..21b576dd9f 100644
--- a/packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx
+++ b/packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx
@@ -120,6 +120,23 @@ describe('<MarkdownContent />', () => {
     );
   });
 
+  it('render MarkdownContent component with link target set to _blank', async () => {
+    await renderInTestApp(
+      <MarkdownContent
+        content="Take a look at the [README](https://github.com/backstage/backstage/blob/master/README.md) file."
+        linkTarget="_blank"
+      />,
+    );
+    const readme = screen.getByText('README', {
+      selector: 'a',
+    });
+    expect(readme).toBeInTheDocument();
+    expect(readme.getAttribute('href')).toEqual(
+      'https://github.com/backstage/backstage/blob/master/README.md',
+    );
+    expect(readme.getAttribute('target')).toEqual('_blank');
+  });
+
   it('render MarkdownContent component with headings given proper ids', async () => {
     await renderInTestApp(
       <MarkdownContent
diff --git a/packages/core-components/src/components/Progress/Progress.test.tsx b/packages/core-components/src/components/Progress/Progress.test.tsx
index d4057c1675..71e2e70f23 100644
--- a/packages/core-components/src/components/Progress/Progress.test.tsx
+++ b/packages/core-components/src/components/Progress/Progress.test.tsx
@@ -16,19 +16,12 @@
 
 import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
-import { act } from '@testing-library/react';
 
 import { Progress } from './Progress';
 
 describe('<Progress />', () => {
   it('renders without exploding', async () => {
-    jest.useFakeTimers();
-    const { getByTestId, queryByTestId } = await renderInTestApp(<Progress />);
-    expect(queryByTestId('progress')).not.toBeInTheDocument();
-    act(() => {
-      jest.advanceTimersByTime(250);
-    });
-    expect(getByTestId('progress')).toBeInTheDocument();
-    jest.useRealTimers();
+    const { queryByTestId } = await renderInTestApp(<Progress />);
+    expect(queryByTestId('progress')).toBeInTheDocument();
   });
 });
diff --git a/packages/core-components/src/components/Progress/Progress.tsx b/packages/core-components/src/components/Progress/Progress.tsx
index 6d1281edd5..865c4673b8 100644
--- a/packages/core-components/src/components/Progress/Progress.tsx
+++ b/packages/core-components/src/components/Progress/Progress.tsx
@@ -36,6 +36,6 @@ export function Progress(props: PropsWithChildren<LinearProgressProps>) {
   return isVisible ? (
     <LinearProgress {...props} data-testid="progress" />
   ) : (
-    <Box display="none" />
+    <Box display="none" data-testid="progress" />
   );
 }
diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx
index bcd411934b..1a9e716abc 100644
--- a/packages/core-components/src/components/Table/Table.tsx
+++ b/packages/core-components/src/components/Table/Table.tsx
@@ -41,6 +41,7 @@ import Clear from '@material-ui/icons/Clear';
 import DeleteOutline from '@material-ui/icons/DeleteOutline';
 import Edit from '@material-ui/icons/Edit';
 import FilterList from '@material-ui/icons/FilterList';
+import Search from '@material-ui/icons/Search';
 import FirstPage from '@material-ui/icons/FirstPage';
 import LastPage from '@material-ui/icons/LastPage';
 import Remove from '@material-ui/icons/Remove';
@@ -103,7 +104,7 @@ const tableIcons: Icons = {
     <Clear {...props} ref={ref} />
   )),
   Search: forwardRef<SVGSVGElement>((props, ref) => (
-    <FilterList {...props} ref={ref} />
+    <Search {...props} ref={ref} />
   )),
   SortArrow: forwardRef<SVGSVGElement>((props, ref) => (
     <ArrowUpward {...props} ref={ref} />
@@ -486,7 +487,7 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
         data={tableData}
         style={{ width: '100%', ...style }}
         localization={{
-          toolbar: { searchPlaceholder: 'Filter', searchTooltip: 'Filter' },
+          toolbar: { searchPlaceholder: 'Search', searchTooltip: 'Search' },
           ...localization,
         }}
         {...restProps}
diff --git a/packages/core-components/src/components/TrendLine/TrendLine.test.tsx b/packages/core-components/src/components/TrendLine/TrendLine.test.tsx
index 0d98c2dfdc..3cb54875c5 100644
--- a/packages/core-components/src/components/TrendLine/TrendLine.test.tsx
+++ b/packages/core-components/src/components/TrendLine/TrendLine.test.tsx
@@ -43,14 +43,14 @@ describe('TrendLine', () => {
     });
   });
 
-  describe.skip('when the data finishes within the the warning threshold', () => {
+  describe.skip('when the data finishes within the warning threshold', () => {
     it('renders with the correct color', async () => {
       await renderInTestApp(<TrendLine data={[0.5, 0.65]} title="sparkline" />);
       expect(screen.getByTitle('sparkline')).toBeInTheDocument();
     });
   });
 
-  describe.skip('when the data finishes within the the error threshold', () => {
+  describe.skip('when the data finishes within the error threshold', () => {
     it('renders with the correct color', async () => {
       await renderInTestApp(<TrendLine data={[0.5, 0.4]} title="sparkline" />);
       expect(screen.getByTitle('sparkline')).toBeInTheDocument();
diff --git a/packages/core-components/src/testUtils.test.ts b/packages/core-components/src/testUtils.test.ts
new file mode 100644
index 0000000000..ca1979c5d4
--- /dev/null
+++ b/packages/core-components/src/testUtils.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
+import { mockBreakpoint } from './testUtils';
+
+describe('mockBreakpoint', () => {
+  const originalMatchMedia = window.matchMedia;
+
+  afterAll(() => {
+    window.matchMedia = originalMatchMedia;
+  });
+
+  it('should remove the mock', () => {
+    const { remove } = mockBreakpoint({ initialBreakpoint: 'md' });
+    expect(originalMatchMedia).not.toBe(window.matchMedia);
+    remove();
+    expect(window.matchMedia).toBe(originalMatchMedia);
+  });
+
+  it('should mock matchMedia with initialBreakpoint', () => {
+    const { set } = mockBreakpoint({ initialBreakpoint: 'md' });
+
+    expect(window.matchMedia('(min-width:960px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:1280px)').matches).toBe(false);
+
+    set('lg');
+    expect(window.matchMedia('(min-width:1280px)').matches).toBe(true);
+  });
+
+  it('should mock matchMedia with matches option', () => {
+    mockBreakpoint({ matches: true });
+
+    expect(window.matchMedia('(min-width:1920px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:1280px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:960px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:600px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:0px)').matches).toBe(true);
+  });
+
+  it('should mock matchMedia with custom queryBreakpointMap', () => {
+    const customMap: Record<string, Breakpoint> = {
+      '(min-width:1500px)': 'xl',
+      '(min-width:1000px)': 'lg',
+      '(min-width:700px)': 'md',
+      '(min-width:400px)': 'sm',
+      '(min-width:0px)': 'xs',
+    };
+    const { set } = mockBreakpoint({
+      initialBreakpoint: 'sm',
+      queryBreakpointMap: customMap,
+    });
+
+    expect(window.matchMedia('(min-width:400px)').matches).toBe(true);
+    expect(window.matchMedia('(min-width:700px)').matches).toBe(false);
+
+    set('md');
+    expect(window.matchMedia('(min-width:700px)').matches).toBe(true);
+  });
+});
diff --git a/packages/core-components/src/testUtils.ts b/packages/core-components/src/testUtils.ts
index 17bb0db63b..92c094743a 100644
--- a/packages/core-components/src/testUtils.ts
+++ b/packages/core-components/src/testUtils.ts
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
+import { act } from '@testing-library/react';
+
+const originalMatchMedia = window.matchMedia;
+
 /**
  *  This is a mocking method suggested in the Jest docs, as it is not implemented in JSDOM yet.
  *  It can be used to mock values for the Material UI `useMediaQuery` hook if it is used in a tested component.
@@ -25,19 +30,137 @@
  *  https://mui.com/material-ui/react-use-media-query/#testing
  *
  * @public
+ *
+ * @example
+ * Match with any media query:
+ * ```ts
+ * mockBreakpoint({ matches: true });
+ * ```
  */
-export function mockBreakpoint(options: { matches: boolean }) {
+export function mockBreakpoint(options: { matches: boolean }): void;
+/**
+ *  This is a mocking method suggested in the Jest docs, as it is not implemented in JSDOM yet.
+ *  It can be used to mock values for the Material UI `useMediaQuery` hook if it is used in a tested component.
+ *
+ *  For issues checkout the documentation:
+ *  https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
+ *
+ *  If there are any updates from Material UI React on testing `useMediaQuery` this mock should be replaced
+ *  https://mui.com/material-ui/react-use-media-query/#testing
+ *
+ * @public
+ *
+ * @example
+ * Set the initial breakpoint:
+ * ```ts
+ * mockBreakpoint({ initialBreakpoint: 'md' });
+ * ```
+ *
+ * @example
+ * Map media queries to breakpoints:
+ * ```ts
+ * mockBreakpoint({ queryBreakpointMap: { '(min-width:1500px)': 'xl', '(min-width:1000px)': 'lg', '(min-width:700px)': 'md', '(min-width:400px)': 'sm', '(min-width:0px)': 'xs', } });
+ * ```
+ *
+ * @example
+ * Change the breakpoint during the test:
+ * ```ts
+ * const { set } = mockBreakpoint({ initialBreakpoint: 'md' });
+ * set('lg');
+ * ```
+ **/
+export function mockBreakpoint(options: {
+  /** Defaults to 'lg' */
+  initialBreakpoint?: Breakpoint;
+  /** Defaults to \{ '(min-width:1920px)': 'xl', '(min-width:1280px)': 'lg', '(min-width:960px)': 'md', '(min-width:600px)': 'sm', '(min-width:0px)': 'xs' \} */
+  queryBreakpointMap?: Record<string, Breakpoint>;
+}): {
+  set(value: string): void;
+  remove(): void;
+};
+export function mockBreakpoint(
+  options:
+    | {
+        matches: boolean;
+      }
+    | {
+        initialBreakpoint?: Breakpoint;
+        queryBreakpointMap?: Record<string, Breakpoint>;
+      },
+): {
+  set(value: string): void;
+  remove(): void;
+} {
+  const mediaQueries: {
+    mediaQueryString: string;
+    mediaQueryList: { matches: boolean };
+    mediaQueryListeners: Set<(event: { matches: boolean }) => void>;
+  }[] = [];
+  let breakpoint: Breakpoint = 'lg';
+  if ('initialBreakpoint' in options && options.initialBreakpoint) {
+    breakpoint = options.initialBreakpoint;
+  }
+  const breakpoints: Record<string, Breakpoint> =
+    'queryBreakpointMap' in options &&
+    typeof options.queryBreakpointMap === 'object'
+      ? options.queryBreakpointMap
+      : {
+          '(min-width:1920px)': 'xl',
+          '(min-width:1280px)': 'lg',
+          '(min-width:960px)': 'md',
+          '(min-width:600px)': 'sm',
+          '(min-width:0px)': 'xs',
+        };
   Object.defineProperty(window, 'matchMedia', {
     writable: true,
-    value: jest.fn().mockImplementation(query => ({
-      matches: options.matches ?? false,
-      media: query,
-      onchange: null,
-      addListener: jest.fn(), // deprecated
-      removeListener: jest.fn(), // deprecated
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-      dispatchEvent: jest.fn(),
-    })),
+    value: jest.fn().mockImplementation(mediaQueryString => {
+      const mediaQueryListeners = new Set<
+        (event: { matches: boolean }) => void
+      >();
+      const mediaQueryList = {
+        matches:
+          'matches' in options
+            ? options.matches
+            : breakpoints[mediaQueryString] === breakpoint,
+        media: mediaQueryString,
+        onchange: null,
+        addListener: jest.fn(listener => {
+          mediaQueryListeners.add(listener);
+        }),
+        removeListener: jest.fn(listener => {
+          mediaQueryListeners.delete(listener);
+        }),
+        addEventListener: jest.fn(),
+        removeEventListener: jest.fn(),
+        dispatchEvent: jest.fn(),
+      };
+      mediaQueries.push({
+        mediaQueryString,
+        mediaQueryList,
+        mediaQueryListeners,
+      });
+      return mediaQueryList;
+    }),
   });
+
+  return {
+    set(newBreakpoint: Breakpoint) {
+      breakpoint = newBreakpoint;
+      mediaQueries.forEach(
+        ({ mediaQueryString, mediaQueryList, mediaQueryListeners }) => {
+          act(() => {
+            const matches =
+              'matches' in options
+                ? options.matches
+                : breakpoints[mediaQueryString] === breakpoint;
+            mediaQueryList.matches = matches;
+            mediaQueryListeners.forEach(listener => listener({ matches }));
+          });
+        },
+      );
+    },
+    remove() {
+      window.matchMedia = originalMatchMedia;
+    },
+  };
 }
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 0c5c3f0780..c74fe35878 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/core-plugin-api
 
+## 1.10.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.10.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+  - @backstage/version-bridge@1.0.10
+
 ## 1.10.0
 
 ### Minor Changes
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 0e54f32ff4..717b7d7150 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-plugin-api",
-  "version": "1.10.0",
+  "version": "1.10.2-next.0",
   "description": "Core API used by Backstage plugins",
   "backstage": {
     "role": "web-library"
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index da8c887cb6..6fc8da6e3e 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/create-app
 
+## 0.5.23-next.2
+
+### Patch Changes
+
+- e913fdf: Add github backend module to create-app and improve error messages
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## 0.5.23-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## 0.5.23-next.0
+
+### Patch Changes
+
+- 5819f8d: Updated Dockerfile to include `backstage.json` file
+- 583f3d4: Updated the template to use `@backstage/cli/config/prettier` instead of `@spotify/prettier-config`.
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## 0.5.22
+
+### Patch Changes
+
+- 7907e3b: Bumped create-app version.
+- 42386c2: Bumped create-app version.
+- 702f41d: Updated engines to support Node 20 or 22
+- a917f86: This update adds the @backstage/repo-tools package to the versions.ts file, enabling proper version resolution for templates. The {{version '@backstage/repo-tools'}} placeholder now works as expected in the create-app process.
+- 5872964: Use the main entrypoint for `create-app` installs
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+
+## 0.5.22-next.3
+
+### Patch Changes
+
+- 5872964: Use the main entrypoint for `create-app` installs
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## 0.5.22-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## 0.5.22-next.1
+
+### Patch Changes
+
+- 702f41d: Updated engines to support Node 20 or 22
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+
+## 0.5.22-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
 ## 0.5.21
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index ff91ed78b3..b3dbd768cc 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/create-app",
-  "version": "0.5.21",
+  "version": "0.5.23-next.2",
   "description": "A CLI that helps you create your own Backstage app",
   "backstage": {
     "role": "cli"
@@ -49,7 +49,6 @@
     "fs-extra": "^11.2.0",
     "handlebars": "^4.7.3",
     "inquirer": "^8.2.0",
-    "node-fetch": "^2.7.0",
     "ora": "^5.3.0",
     "recursive-readdir": "^2.2.2"
   },
@@ -59,9 +58,9 @@
     "@types/command-exists": "^1.2.0",
     "@types/fs-extra": "^11.0.0",
     "@types/inquirer": "^8.1.3",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.16.0",
     "@types/recursive-readdir": "^2.2.0",
-    "msw": "^1.0.0",
+    "msw": "^2.0.0",
     "nodemon": "^3.0.1"
   }
 }
diff --git a/packages/create-app/src/lib/tasks.test.ts b/packages/create-app/src/lib/tasks.test.ts
index 41c20854be..3d5240977e 100644
--- a/packages/create-app/src/lib/tasks.test.ts
+++ b/packages/create-app/src/lib/tasks.test.ts
@@ -33,7 +33,7 @@ import {
   createMockDirectory,
   registerMswTestHooks,
 } from '@backstage/backend-test-utils';
-import { rest } from 'msw';
+import { http, HttpResponse, delay } from 'msw';
 import { setupServer } from 'msw/node';
 
 jest.spyOn(Task, 'log').mockReturnValue(undefined);
@@ -91,6 +91,7 @@ jest.mock('./versions', () => ({
     '@backstage/plugin-kubernetes-backend': '1.0.0',
     '@backstage/plugin-org': '1.0.0',
     '@backstage/plugin-scaffolder': '1.0.0',
+    '@backstage/plugin-scaffolder-backend-module-github': '1.0.0',
     '@backstage/plugin-permission-react': '1.0.0',
     '@backstage/plugin-search': '1.0.0',
     '@backstage/plugin-search-react': '1.0.0',
@@ -402,12 +403,10 @@ describe('tasks', () => {
 
     it('should fetch the yarn.lock seed file', async () => {
       worker.use(
-        rest.get(
+        http.get(
           'https://raw.githubusercontent.com/backstage/backstage/master/packages/create-app/seed-yarn.lock',
-          (_, res, ctx) =>
-            res(
-              ctx.status(200),
-              ctx.text(`# the-lockfile-header
+          () =>
+            HttpResponse.text(`# the-lockfile-header
 
 // some comments
 // in the file
@@ -418,7 +417,6 @@ describe('tasks', () => {
 "@backstage/cli@1.0.0":
   some info
 `),
-            ),
         ),
       );
 
@@ -438,9 +436,9 @@ describe('tasks', () => {
 
     it('should fail gracefully', async () => {
       worker.use(
-        rest.get(
+        http.get(
           'https://raw.githubusercontent.com/backstage/backstage/master/packages/create-app/seed-yarn.lock',
-          (_, res, ctx) => res(ctx.status(404)),
+          () => new HttpResponse(null, { status: 404 }),
         ),
       );
 
@@ -453,9 +451,9 @@ describe('tasks', () => {
 
     it('should time out if it takes too long to fetch', async () => {
       worker.use(
-        rest.get(
+        http.get(
           'https://raw.githubusercontent.com/backstage/backstage/master/packages/create-app/seed-yarn.lock',
-          (_, res, ctx) => res(ctx.delay(5000)),
+          () => delay(5000),
         ),
       );
 
diff --git a/packages/create-app/src/lib/tasks.ts b/packages/create-app/src/lib/tasks.ts
index a47f5f2cb9..51308275a6 100644
--- a/packages/create-app/src/lib/tasks.ts
+++ b/packages/create-app/src/lib/tasks.ts
@@ -25,7 +25,6 @@ import {
   resolve as resolvePath,
   relative as relativePath,
 } from 'path';
-import fetch from 'node-fetch';
 import { exec as execCb } from 'child_process';
 import { packageVersions } from './versions';
 import { promisify } from 'util';
diff --git a/packages/create-app/src/lib/versions.ts b/packages/create-app/src/lib/versions.ts
index 84fbc25450..d06912cca3 100644
--- a/packages/create-app/src/lib/versions.ts
+++ b/packages/create-app/src/lib/versions.ts
@@ -45,6 +45,7 @@ import { version as errors } from '../../../errors/package.json';
 import { version as integrationReact } from '../../../integration-react/package.json';
 import { version as testUtils } from '../../../test-utils/package.json';
 import { version as theme } from '../../../theme/package.json';
+import { version as repoTools } from '../../../repo-tools/package.json';
 
 import { version as pluginApiDocs } from '../../../../plugins/api-docs/package.json';
 import { version as pluginAppBackend } from '../../../../plugins/app-backend/package.json';
@@ -71,6 +72,7 @@ import { version as pluginPermissionNode } from '../../../../plugins/permission-
 import { version as pluginProxyBackend } from '../../../../plugins/proxy-backend/package.json';
 import { version as pluginScaffolder } from '../../../../plugins/scaffolder/package.json';
 import { version as pluginScaffolderBackend } from '../../../../plugins/scaffolder-backend/package.json';
+import { version as pluginScaffolderBackendModuleGithub } from '../../../../plugins/scaffolder-backend-module-github/package.json';
 import { version as pluginSearch } from '../../../../plugins/search/package.json';
 import { version as pluginSearchReact } from '../../../../plugins/search-react/package.json';
 import { version as pluginSearchBackend } from '../../../../plugins/search-backend/package.json';
@@ -98,6 +100,7 @@ export const packageVersions = {
   '@backstage/e2e-test-utils': e2eTestUtils,
   '@backstage/errors': errors,
   '@backstage/integration-react': integrationReact,
+  '@backstage/repo-tools': repoTools,
   '@backstage/plugin-api-docs': pluginApiDocs,
   '@backstage/plugin-app-backend': pluginAppBackend,
   '@backstage/plugin-auth-backend': pluginAuthBackend,
@@ -128,6 +131,8 @@ export const packageVersions = {
   '@backstage/plugin-proxy-backend': pluginProxyBackend,
   '@backstage/plugin-scaffolder': pluginScaffolder,
   '@backstage/plugin-scaffolder-backend': pluginScaffolderBackend,
+  '@backstage/plugin-scaffolder-backend-module-github':
+    pluginScaffolderBackendModuleGithub,
   '@backstage/plugin-search': pluginSearch,
   '@backstage/plugin-search-react': pluginSearchReact,
   '@backstage/plugin-search-backend': pluginSearchBackend,
diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 7a42fed3f8..21bdd41bdf 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "engines": {
-    "node": "18 || 20"
+    "node": "20 || 22"
   },
   "scripts": {
     "dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
@@ -34,7 +34,6 @@
     "@backstage/cli": "^{{version '@backstage/cli'}}",
     "@backstage/e2e-test-utils": "^{{version '@backstage/e2e-test-utils'}}",
     "@playwright/test": "^1.32.3",
-    "@spotify/prettier-config": "^12.0.0",
     "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
     "typescript": "~5.4.0"
@@ -43,7 +42,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
       "eslint --fix",
diff --git a/packages/create-app/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile
index 6a4c257afb..13ff70d961 100644
--- a/packages/create-app/templates/default-app/packages/backend/Dockerfile
+++ b/packages/create-app/templates/default-app/packages/backend/Dockerfile
@@ -40,6 +40,7 @@ WORKDIR /app
 # Copy files needed by Yarn
 COPY --chown=node:node .yarn ./.yarn
 COPY --chown=node:node .yarnrc.yml ./
+COPY --chown=node:node backstage.json ./
 
 # This switches many Node.js dependencies to production mode.
 ENV NODE_ENV=production
diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
index bb05beddaa..42afefd3b8 100644
--- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
@@ -33,6 +33,7 @@
     "@backstage/plugin-permission-node": "^{{version '@backstage/plugin-permission-node'}}",
     "@backstage/plugin-proxy-backend": "^{{version '@backstage/plugin-proxy-backend'}}",
     "@backstage/plugin-scaffolder-backend": "^{{version '@backstage/plugin-scaffolder-backend'}}",
+    "@backstage/plugin-scaffolder-backend-module-github": "^{{version '@backstage/plugin-scaffolder-backend-module-github'}}",
     "@backstage/plugin-search-backend": "^{{version '@backstage/plugin-search-backend'}}",
     "@backstage/plugin-search-backend-module-catalog": "^{{version '@backstage/plugin-search-backend-module-catalog'}}",
     "@backstage/plugin-search-backend-module-pg": "^{{version '@backstage/plugin-search-backend-module-pg'}}",
diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.ts b/packages/create-app/templates/default-app/packages/backend/src/index.ts
index f57d4c5f87..6d0a6f4ca5 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/index.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/index.ts
@@ -10,10 +10,11 @@ import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
+backend.add(import('@backstage/plugin-proxy-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 
 // auth plugin
 backend.add(import('@backstage/plugin-auth-backend'));
@@ -22,7 +23,7 @@ backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
 // See https://backstage.io/docs/auth/guest/provider
 
 // catalog plugin
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -31,24 +32,24 @@ backend.add(
 backend.add(import('@backstage/plugin-catalog-backend-module-logs'));
 
 // permission plugin
-backend.add(import('@backstage/plugin-permission-backend/alpha'));
+backend.add(import('@backstage/plugin-permission-backend'));
 // See https://backstage.io/docs/permissions/getting-started for how to create your own permission policy
 backend.add(
   import('@backstage/plugin-permission-backend-module-allow-all-policy'),
 );
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 // search engine
 // See https://backstage.io/docs/features/search/search-engines
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-pg'));
 
 // search collators
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 
 // kubernetes
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 
 backend.start();
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index ccf303f268..e6cd7eeb73 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,117 @@
 # @backstage/dev-utils
 
+## 1.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+
+## 1.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+
+## 1.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+
+## 1.1.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+
+## 1.1.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+
+## 1.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+
+## 1.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
 ## 1.1.2
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 73c90cdb30..c4aef9fd83 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/dev-utils",
-  "version": "1.1.2",
+  "version": "1.1.5-next.2",
   "description": "Utilities for developing Backstage plugins.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index 4a677b09d2..4feec740ca 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,77 @@
 # e2e-test
 
+## 0.2.23-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-common@0.1.15
+
+## 0.2.23-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 0.2.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.23-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+
+## 0.2.22-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.3
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## 0.2.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## 0.2.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.1
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/errors@1.2.4
+
+## 0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.22-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 24bee642b9..ca2f005a31 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-test",
-  "version": "0.2.21",
+  "version": "0.2.23-next.2",
   "description": "E2E test for verifying Backstage packages",
   "backstage": {
     "role": "cli"
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@types/fs-extra": "^11.0.0",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.16.0",
     "nodemon": "^3.0.1"
   }
 }
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index 0a9ac6368c..77e2e83c4c 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -531,7 +531,11 @@ async function testBackendStart(appDir: string, ...args: string[]) {
         !l.includes(
           'ExperimentalWarning: `globalPreload` is planned for removal in favor of `initialize`.', // Node 18
         ) &&
-        !l.includes('node --trace-warnings ...'),
+        !l.includes(
+          'DeprecationWarning: The `punycode` module is deprecated.', // Node 22
+        ) &&
+        !l.includes('node --trace-warnings ...') &&
+        !l.includes('node --trace-deprecation ...'),
     );
   };
 
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index 5cdaa834fd..33204aae4c 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/errors
 
+## 1.2.6-next.0
+
+### Patch Changes
+
+- 1d4b5b9: Trim `error.cause.stack` in addition to `error.stack` when trimming stack traces from serialized errors.
+- Updated dependencies
+  - @backstage/types@1.2.0
+
+## 1.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+
 ## 1.2.4
 
 ### Patch Changes
diff --git a/packages/errors/package.json b/packages/errors/package.json
index dcc46ac51e..fa2a600085 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/errors",
-  "version": "1.2.4",
+  "version": "1.2.6-next.0",
   "description": "Common utilities for error handling within Backstage",
   "backstage": {
     "role": "common-library"
diff --git a/packages/errors/src/serialization/error.test.ts b/packages/errors/src/serialization/error.test.ts
index a07d11749a..6418170f98 100644
--- a/packages/errors/src/serialization/error.test.ts
+++ b/packages/errors/src/serialization/error.test.ts
@@ -63,6 +63,20 @@ describe('serialization', () => {
     expect(withoutStack2.stack).not.toBeDefined();
   });
 
+  it('serializes stack traces only when allowed with error cause', () => {
+    const before = new CustomError('m');
+    before.cause = new Error('cause');
+    const withStack: any = serializeError(before, { includeStack: true });
+    const withoutStack1: any = serializeError(before, { includeStack: false });
+    const withoutStack2: any = serializeError(before);
+    expect(withStack.stack).toEqual(before.stack);
+    expect(withStack.cause.stack).toEqual(withStack.cause.stack);
+    expect(withoutStack1.stack).not.toBeDefined();
+    expect(withoutStack2.stack).not.toBeDefined();
+    expect(withoutStack1.cause.stack).not.toBeDefined();
+    expect(withoutStack2.cause.stack).not.toBeDefined();
+  });
+
   it('stringifies all supported forms', () => {
     expect(stringifyError({})).toEqual("unknown error '[object Object]'");
     expect(
diff --git a/packages/errors/src/serialization/error.ts b/packages/errors/src/serialization/error.ts
index e48309f1e7..abdd7bf3d4 100644
--- a/packages/errors/src/serialization/error.ts
+++ b/packages/errors/src/serialization/error.ts
@@ -60,6 +60,14 @@ export function serializeError(
 
   if (!options?.includeStack) {
     delete result.stack;
+
+    if (
+      result.cause &&
+      typeof result.cause === 'object' &&
+      'stack' in result.cause
+    ) {
+      delete result.cause.stack;
+    }
   }
 
   return result;
diff --git a/packages/frontend-app-api/CHANGELOG.md b/packages/frontend-app-api/CHANGELOG.md
index f6c3d2d26a..9751a9845c 100644
--- a/packages/frontend-app-api/CHANGELOG.md
+++ b/packages/frontend-app-api/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @backstage/frontend-app-api
 
+## 0.10.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-defaults@0.1.4-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-defaults@0.1.4-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-defaults@0.1.4-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/frontend-defaults@0.1.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.10.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.2-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
 ## 0.10.0
 
 ### Minor Changes
diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json
index fc36563dcd..8f2215962c 100644
--- a/packages/frontend-app-api/package.json
+++ b/packages/frontend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-app-api",
-  "version": "0.10.0",
+  "version": "0.10.3-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-defaults/CHANGELOG.md b/packages/frontend-defaults/CHANGELOG.md
index 0b2d42fda8..7bc7e229ec 100644
--- a/packages/frontend-defaults/CHANGELOG.md
+++ b/packages/frontend-defaults/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @backstage/frontend-defaults
 
+## 0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-app@0.1.4-next.2
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-app@0.1.4-next.1
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- 44b82da: The default config loader no longer requires `process.env.APP_CONFIG` to be set, allowing config to be read from other sources instead.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-app@0.1.2
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-app@0.1.2-next.2
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-app@0.1.2-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-app@0.1.2-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json
index b994c80d31..2d6c1a7a86 100644
--- a/packages/frontend-defaults/package.json
+++ b/packages/frontend-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-defaults",
-  "version": "0.1.1",
+  "version": "0.1.4-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-internal/CHANGELOG.md b/packages/frontend-internal/CHANGELOG.md
index 58f25c6299..0ac6c8558e 100644
--- a/packages/frontend-internal/CHANGELOG.md
+++ b/packages/frontend-internal/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @internal/frontend
 
+## 0.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/packages/frontend-internal/package.json b/packages/frontend-internal/package.json
index 453ddfc62b..bbe8e3df17 100644
--- a/packages/frontend-internal/package.json
+++ b/packages/frontend-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/frontend",
-  "version": "0.0.2",
+  "version": "0.0.4-next.2",
   "backstage": {
     "role": "web-library",
     "inline": true
diff --git a/packages/frontend-plugin-api/CHANGELOG.md b/packages/frontend-plugin-api/CHANGELOG.md
index ccf9ac28f8..9aacfe0485 100644
--- a/packages/frontend-plugin-api/CHANGELOG.md
+++ b/packages/frontend-plugin-api/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/frontend-plugin-api
 
+## 0.9.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.3-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
+## 0.9.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json
index f96e365725..c2a9fd8d8b 100644
--- a/packages/frontend-plugin-api/package.json
+++ b/packages/frontend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-plugin-api",
-  "version": "0.9.0",
+  "version": "0.9.3-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-plugin-api/src/blueprints/PageBlueprint.test.tsx b/packages/frontend-plugin-api/src/blueprints/PageBlueprint.test.tsx
index de1cbe211e..4d0b4f37a7 100644
--- a/packages/frontend-plugin-api/src/blueprints/PageBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/blueprints/PageBlueprint.test.tsx
@@ -98,7 +98,7 @@ describe('PageBlueprint', () => {
 
     const tester = createExtensionTester(myPage);
 
-    // TODO(blam): test for the routePath output doesn't work, due to the the way the test harness works
+    // TODO(blam): test for the routePath output doesn't work, due to the way the test harness works
     // expect(tester.data(coreExtensionData.routePath)).toBe('/test');
 
     expect(tester.get(coreExtensionData.routeRef)).toBe(mockRouteRef);
diff --git a/packages/frontend-test-utils/CHANGELOG.md b/packages/frontend-test-utils/CHANGELOG.md
index 513825e55f..40d8e62884 100644
--- a/packages/frontend-test-utils/CHANGELOG.md
+++ b/packages/frontend-test-utils/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @backstage/frontend-test-utils
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/frontend-app-api@0.10.3-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.4-next.2
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/frontend-app-api@0.10.3-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.4-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app@0.1.4-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/frontend-app-api@0.10.3-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/frontend-app-api@0.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/test-utils@1.7.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.2
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.1
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.1-next.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-app@0.1.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json
index 43dfe86b2c..8a13dda074 100644
--- a/packages/frontend-test-utils/package.json
+++ b/packages/frontend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-test-utils",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/integration-aws-node/CHANGELOG.md b/packages/integration-aws-node/CHANGELOG.md
index f9225dc3f0..66d93b93c1 100644
--- a/packages/integration-aws-node/CHANGELOG.md
+++ b/packages/integration-aws-node/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/integration-aws-node
 
+## 0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+
+## 0.1.13
+
+### Patch Changes
+
+- 52ae92d: The `getDefaultCredentialsChain` function now accepts and applies a `region` parameter, preventing it from defaulting to `us-east-1` when no region is specified.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.1.13-next.0
+
+### Patch Changes
+
+- 52ae92d: The `getDefaultCredentialsChain` function now accepts and applies a `region` parameter, preventing it from defaulting to `us-east-1` when no region is specified.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/packages/integration-aws-node/package.json b/packages/integration-aws-node/package.json
index 2ec47e1da0..e1fbcf6fac 100644
--- a/packages/integration-aws-node/package.json
+++ b/packages/integration-aws-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-aws-node",
-  "version": "0.1.12",
+  "version": "0.1.14-next.0",
   "description": "Helpers for fetching AWS account credentials",
   "backstage": {
     "role": "node-library"
diff --git a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
index 237428c3e9..d81f717a58 100644
--- a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
+++ b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
@@ -24,12 +24,20 @@ import {
 } from '@aws-sdk/client-sts';
 import { Config, ConfigReader } from '@backstage/config';
 import { promises } from 'fs';
+import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 
 const env = process.env;
 let stsMock: AwsClientStub<STSClient>;
 let config: Config;
 
 jest.mock('fs', () => ({ promises: { readFile: jest.fn() } }));
+jest.mock('@aws-sdk/credential-providers', () => {
+  const originalModule = jest.requireActual('@aws-sdk/credential-providers');
+  return {
+    ...originalModule,
+    fromNodeProviderChain: jest.fn(),
+  };
+});
 
 describe('DefaultAwsCredentialsManager', () => {
   beforeEach(() => {
@@ -127,12 +135,17 @@ describe('DefaultAwsCredentialsManager', () => {
         },
       });
 
+    const testDate = new Date('2022-01-10');
+
     process.env.AWS_ACCESS_KEY_ID = 'ACCESS_KEY_ID_10';
     process.env.AWS_SECRET_ACCESS_KEY = 'SECRET_ACCESS_KEY_10';
     process.env.AWS_SESSION_TOKEN = 'SESSION_TOKEN_10';
-    process.env.AWS_CREDENTIAL_EXPIRATION = new Date(
-      '2022-01-10',
-    ).toISOString();
+    process.env.AWS_CREDENTIAL_EXPIRATION = testDate.toISOString();
+
+    // Return creds from env
+    (fromNodeProviderChain as jest.Mock).mockImplementation(
+      jest.requireActual('@aws-sdk/credential-providers').fromNodeProviderChain,
+    );
 
     const mockProfile = `[my-profile]
     aws_access_key_id=ACCESS_KEY_ID_9
@@ -431,5 +444,49 @@ describe('DefaultAwsCredentialsManager', () => {
         provider.getCredentialProvider({ accountId: '123456789012' }),
       ).rejects.toThrow(/No credentials found/);
     });
+
+    it('passes the region to getDefaultCredentialsChain', async () => {
+      const region = 'us-west-2';
+      const configWithRegion = new ConfigReader({
+        aws: {
+          mainAccount: {
+            region,
+          },
+        },
+      });
+
+      const provider =
+        DefaultAwsCredentialsManager.fromConfig(configWithRegion);
+      const awsCredentialProvider = await provider.getCredentialProvider();
+
+      // Trigger the call to fromNodeProviderChain
+      await awsCredentialProvider.sdkCredentialProvider();
+
+      expect(fromNodeProviderChain).toHaveBeenCalledWith({
+        clientConfig: {
+          region,
+        },
+      });
+    });
+
+    it('uses default region when none is specified', async () => {
+      const configWithoutRegion = new ConfigReader({
+        aws: {
+          mainAccount: {},
+        },
+      });
+
+      const provider =
+        DefaultAwsCredentialsManager.fromConfig(configWithoutRegion);
+      const awsCredentialProvider = await provider.getCredentialProvider();
+
+      await awsCredentialProvider.sdkCredentialProvider();
+
+      expect(fromNodeProviderChain).toHaveBeenCalledWith({
+        clientConfig: {
+          region: 'us-east-1',
+        },
+      });
+    });
   });
 });
diff --git a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
index 12e1e2dffd..3048fdfe40 100644
--- a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
+++ b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
@@ -77,8 +77,15 @@ function getProfileCredentials(
   });
 }
 
-function getDefaultCredentialsChain(): AwsCredentialIdentityProvider {
-  return fromNodeProviderChain();
+/**
+ * Include the region if present, otherwise use the default region.
+ *
+ * @see https://www.npmjs.com/package/@aws-sdk/credential-provider-node
+ */
+function getDefaultCredentialsChain(
+  region = 'us-east-1',
+): AwsCredentialIdentityProvider {
+  return fromNodeProviderChain({ clientConfig: { region } });
 }
 
 /**
@@ -123,7 +130,7 @@ function getSdkCredentialProvider(
     return getProfileCredentials(config.profile!, config.region);
   }
 
-  return getDefaultCredentialsChain();
+  return getDefaultCredentialsChain(config.region);
 }
 
 /**
@@ -145,7 +152,7 @@ function getMainAccountSdkCredentialProvider(
     return getProfileCredentials(config.profile!, config.region);
   }
 
-  return getDefaultCredentialsChain();
+  return getDefaultCredentialsChain(config.region);
 }
 
 /**
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 2b686905ab..57698d9a0f 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/integration-react
 
+## 1.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 1.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 1.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.15.2
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index c524d82d31..b1c8ff60f9 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "1.2.0",
+  "version": "1.2.2-next.1",
   "description": "Frontend package for managing integrations towards external systems",
   "backstage": {
     "role": "web-library"
diff --git a/packages/integration-react/src/api/ScmAuth.ts b/packages/integration-react/src/api/ScmAuth.ts
index 1b68d56a6e..ff3e8c098d 100644
--- a/packages/integration-react/src/api/ScmAuth.ts
+++ b/packages/integration-react/src/api/ScmAuth.ts
@@ -258,7 +258,7 @@ export class ScmAuth implements ScmAuthApi {
    *
    * The default scopes are:
    *
-   * `PUBLIC_REPOS REPOS_READ`
+   * `PUBLIC_REPOS REPO_READ`
    *
    * If the additional `repoWrite` permission is requested, these scopes are added:
    *
@@ -277,10 +277,7 @@ export class ScmAuth implements ScmAuthApi {
     return this.forBitbucket(bitbucketAuthApi, {
       host: options.host,
       scopeMapping: {
-        default: options.scopeMapping?.default ?? [
-          'PUBLIC_REPOS',
-          'REPOS_READ',
-        ],
+        default: options.scopeMapping?.default ?? ['PUBLIC_REPOS', 'REPO_READ'],
         repoWrite: options.scopeMapping?.repoWrite ?? ['REPO_WRITE'],
       },
     });
diff --git a/packages/integration-react/src/api/ScmIntegrationsApi.test.ts b/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
index fb53bbdb12..0a1f1b1b8f 100644
--- a/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
+++ b/packages/integration-react/src/api/ScmIntegrationsApi.test.ts
@@ -26,6 +26,6 @@ describe('scmIntegrationsApiRef', () => {
 
   it('should be instantiated', () => {
     const i = ScmIntegrationsApi.fromConfig(new ConfigReader({}));
-    expect(i.list().length).toBe(6); // The default ones
+    expect(i.list().length).toBe(7); // The default ones
   });
 });
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index 5b5165bd53..8af904036e 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/integration
 
+## 1.16.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+
+## 1.16.0-next.0
+
+### Minor Changes
+
+- 277092a: Add the integration for Azure blob storage to read the credentials to access the storage account and provide the default credential provider.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 1.15.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
 ## 1.15.1
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index d41ffa501d..9b09adaf1b 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "1.15.1",
+  "version": "1.16.0-next.1",
   "description": "Helpers for managing integrations towards external systems",
   "backstage": {
     "role": "common-library"
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@azure/identity": "^4.0.0",
+    "@azure/storage-blob": "^12.5.0",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@octokit/auth-app": "^4.0.0",
diff --git a/packages/integration/report.api.md b/packages/integration/report.api.md
index e9b67bb6c1..5129dbb7c2 100644
--- a/packages/integration/report.api.md
+++ b/packages/integration/report.api.md
@@ -3,9 +3,12 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { AnonymousCredential } from '@azure/storage-blob';
 import { Config } from '@backstage/config';
 import { ConsumedResponse } from '@backstage/errors';
 import { RestEndpointMethodTypes } from '@octokit/rest';
+import { StorageSharedKeyCredential } from '@azure/storage-blob';
+import { TokenCredential } from '@azure/identity';
 
 // @public
 export class AwsCodeCommitIntegration implements ScmIntegration {
@@ -70,6 +73,43 @@ export type AwsS3IntegrationConfig = {
   externalId?: string;
 };
 
+// @public
+export type AzureBlobStorageIntegrationConfig = {
+  accountName?: string;
+  accountKey?: string;
+  sasToken?: string;
+  connectionString?: string;
+  endpointSuffix?: string;
+  host: string;
+  endpoint?: string;
+  aadCredential?: {
+    clientId: string;
+    tenantId: string;
+    clientSecret: string;
+  };
+};
+
+// @public
+export class AzureBlobStorageIntergation implements ScmIntegration {
+  constructor(integrationConfig: AzureBlobStorageIntegrationConfig);
+  // (undocumented)
+  get config(): AzureBlobStorageIntegrationConfig;
+  // (undocumented)
+  static factory: ScmIntegrationsFactory<AzureBlobStorageIntergation>;
+  // (undocumented)
+  resolveEditUrl(url: string): string;
+  // (undocumented)
+  resolveUrl(options: {
+    url: string;
+    base: string;
+    lineNumber?: number | undefined;
+  }): string;
+  // (undocumented)
+  get title(): string;
+  // (undocumented)
+  get type(): string;
+}
+
 // @public
 export type AzureClientSecretCredential = AzureCredentialBase & {
   kind: 'ClientSecret';
@@ -84,6 +124,16 @@ export type AzureCredentialBase = {
   organizations?: string[];
 };
 
+// @public
+export interface AzureCredentialsManager {
+  // (undocumented)
+  getCredentials(
+    accountName: string,
+  ): Promise<
+    TokenCredential | StorageSharedKeyCredential | AnonymousCredential
+  >;
+}
+
 // @public
 export type AzureDevOpsCredential =
   | AzureClientSecretCredential
@@ -257,6 +307,15 @@ export function buildGerritGitilesArchiveUrl(
   filePath: string,
 ): string;
 
+// @public
+export class DefaultAzureCredentialsManager implements AzureCredentialsManager {
+  static fromIntegrations(
+    integrations: ScmIntegrationRegistry,
+  ): DefaultAzureCredentialsManager;
+  // (undocumented)
+  getCredentials(accountName: string): Promise<TokenCredential>;
+}
+
 // @public
 export class DefaultAzureDevOpsCredentialsProvider
   implements AzureDevOpsCredentialsProvider
@@ -723,6 +782,8 @@ export interface IntegrationsByType {
   awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   // (undocumented)
   azure: ScmIntegrationsGroup<AzureIntegration>;
+  // (undocumented)
+  azureBlobStorage: ScmIntegrationsGroup<AzureBlobStorageIntergation>;
   // @deprecated (undocumented)
   bitbucket: ScmIntegrationsGroup<BitbucketIntegration>;
   // (undocumented)
@@ -826,6 +887,16 @@ export function readAwsS3IntegrationConfigs(
   configs: Config[],
 ): AwsS3IntegrationConfig[];
 
+// @public
+export function readAzureBlobStorageIntegrationConfig(
+  config: Config,
+): AzureBlobStorageIntegrationConfig;
+
+// @public
+export function readAzureBlobStorageIntegrationConfigs(
+  configs: Config[],
+): AzureBlobStorageIntegrationConfig[];
+
 // @public
 export function readAzureIntegrationConfig(
   config: Config,
@@ -940,6 +1011,8 @@ export interface ScmIntegrationRegistry
   awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   // (undocumented)
   azure: ScmIntegrationsGroup<AzureIntegration>;
+  // (undocumented)
+  azureBlobStorage: ScmIntegrationsGroup<AzureBlobStorageIntergation>;
   // @deprecated (undocumented)
   bitbucket: ScmIntegrationsGroup<BitbucketIntegration>;
   // (undocumented)
@@ -973,6 +1046,8 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
   get awsS3(): ScmIntegrationsGroup<AwsS3Integration>;
   // (undocumented)
   get azure(): ScmIntegrationsGroup<AzureIntegration>;
+  // (undocumented)
+  get azureBlobStorage(): ScmIntegrationsGroup<AzureBlobStorageIntergation>;
   // @deprecated (undocumented)
   get bitbucket(): ScmIntegrationsGroup<BitbucketIntegration>;
   // (undocumented)
diff --git a/packages/integration/src/ScmIntegrations.test.ts b/packages/integration/src/ScmIntegrations.test.ts
index c758816c03..0e0c181861 100644
--- a/packages/integration/src/ScmIntegrations.test.ts
+++ b/packages/integration/src/ScmIntegrations.test.ts
@@ -39,6 +39,10 @@ import { GiteaIntegration, GiteaIntegrationConfig } from './gitea';
 import { AwsCodeCommitIntegration } from './awsCodeCommit/AwsCodeCommitIntegration';
 import { AwsCodeCommitIntegrationConfig } from './awsCodeCommit';
 import { HarnessIntegration, HarnessIntegrationConfig } from './harness';
+import {
+  AzureBlobStorageIntegrationConfig,
+  AzureBlobStorageIntergation,
+} from './azureBlobStorage';
 
 describe('ScmIntegrations', () => {
   const awsS3 = new AwsS3Integration({
@@ -53,6 +57,10 @@ describe('ScmIntegrations', () => {
     host: 'azure.local',
   } as AzureIntegrationConfig);
 
+  const azureBlob = new AzureBlobStorageIntergation({
+    host: 'azureblobstorage.local',
+  } as AzureBlobStorageIntegrationConfig);
+
   const bitbucket = new BitbucketIntegration({
     host: 'bitbucket.local',
   } as BitbucketIntegrationConfig);
@@ -89,6 +97,7 @@ describe('ScmIntegrations', () => {
     awsS3: basicIntegrations([awsS3], item => item.config.host),
     awsCodeCommit: basicIntegrations([awsCodeCommit], item => item.config.host),
     azure: basicIntegrations([azure], item => item.config.host),
+    azureBlobStorage: basicIntegrations([azureBlob], item => item.config.host),
     bitbucket: basicIntegrations([bitbucket], item => item.config.host),
     bitbucketCloud: basicIntegrations([bitbucketCloud], item => item.title),
     bitbucketServer: basicIntegrations(
@@ -108,6 +117,9 @@ describe('ScmIntegrations', () => {
       awsCodeCommit,
     );
     expect(i.azure.byUrl('https://azure.local')).toBe(azure);
+    expect(i.azureBlobStorage.byUrl('https://azureblobstorage.local')).toBe(
+      azureBlob,
+    );
     expect(i.bitbucket.byUrl('https://bitbucket.local')).toBe(bitbucket);
     expect(i.bitbucketCloud.byUrl('https://bitbucket.org')).toBe(
       bitbucketCloud,
@@ -128,6 +140,7 @@ describe('ScmIntegrations', () => {
         awsS3,
         awsCodeCommit,
         azure,
+        azureBlob,
         bitbucket,
         bitbucketCloud,
         bitbucketServer,
@@ -144,6 +157,9 @@ describe('ScmIntegrations', () => {
     expect(i.byUrl('https://awss3.local')).toBe(awsS3);
     expect(i.byUrl('https://awscodecommit.local')).toBe(awsCodeCommit);
     expect(i.byUrl('https://azure.local')).toBe(azure);
+    expect(i.azureBlobStorage.byUrl('https://azureblobstorage.local')).toBe(
+      azureBlob,
+    );
     expect(i.byUrl('https://bitbucket.local')).toBe(bitbucket);
     expect(i.byUrl('https://bitbucket.org')).toBe(bitbucketCloud);
     expect(i.byUrl('https://bitbucket-server.local')).toBe(bitbucketServer);
@@ -156,6 +172,7 @@ describe('ScmIntegrations', () => {
     expect(i.byHost('awss3.local')).toBe(awsS3);
     expect(i.byHost('awscodecommit.local')).toBe(awsCodeCommit);
     expect(i.byHost('azure.local')).toBe(azure);
+    expect(i.byHost('azureblobstorage.local')).toBe(azureBlob);
     expect(i.byHost('bitbucket.local')).toBe(bitbucket);
     expect(i.byHost('bitbucket.org')).toBe(bitbucketCloud);
     expect(i.byHost('bitbucket-server.local')).toBe(bitbucketServer);
diff --git a/packages/integration/src/ScmIntegrations.ts b/packages/integration/src/ScmIntegrations.ts
index e0d430d834..f11cb3c17e 100644
--- a/packages/integration/src/ScmIntegrations.ts
+++ b/packages/integration/src/ScmIntegrations.ts
@@ -29,6 +29,7 @@ import { ScmIntegration, ScmIntegrationsGroup } from './types';
 import { ScmIntegrationRegistry } from './registry';
 import { GiteaIntegration } from './gitea';
 import { HarnessIntegration } from './harness/HarnessIntegration';
+import { AzureBlobStorageIntergation } from './azureBlobStorage';
 
 /**
  * The set of supported integrations.
@@ -38,6 +39,7 @@ import { HarnessIntegration } from './harness/HarnessIntegration';
 export interface IntegrationsByType {
   awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   awsCodeCommit: ScmIntegrationsGroup<AwsCodeCommitIntegration>;
+  azureBlobStorage: ScmIntegrationsGroup<AzureBlobStorageIntergation>;
   azure: ScmIntegrationsGroup<AzureIntegration>;
   /**
    * @deprecated in favor of `bitbucketCloud` and `bitbucketServer`
@@ -64,6 +66,7 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
     return new ScmIntegrations({
       awsS3: AwsS3Integration.factory({ config }),
       awsCodeCommit: AwsCodeCommitIntegration.factory({ config }),
+      azureBlobStorage: AzureBlobStorageIntergation.factory({ config }),
       azure: AzureIntegration.factory({ config }),
       bitbucket: BitbucketIntegration.factory({ config }),
       bitbucketCloud: BitbucketCloudIntegration.factory({ config }),
@@ -88,6 +91,10 @@ export class ScmIntegrations implements ScmIntegrationRegistry {
     return this.byType.awsCodeCommit;
   }
 
+  get azureBlobStorage(): ScmIntegrationsGroup<AzureBlobStorageIntergation> {
+    return this.byType.azureBlobStorage;
+  }
+
   get azure(): ScmIntegrationsGroup<AzureIntegration> {
     return this.byType.azure;
   }
diff --git a/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.test.ts b/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.test.ts
new file mode 100644
index 0000000000..e7f7703be9
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.test.ts
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import { AzureBlobStorageIntergation } from './AzureBlobStorageIntegration';
+
+describe('AzureBlobStorageIntegration', () => {
+  it('has a working factory', () => {
+    const integrations = AzureBlobStorageIntergation.factory({
+      config: new ConfigReader({
+        integrations: {
+          azureBlobStorage: [
+            {
+              endpoint: 'https://myaccount.blob.core.windows.net',
+              accountName: 'myaccount',
+              accountKey: 'someAccountKey',
+            },
+          ],
+        },
+      }),
+    });
+    expect(integrations.list().length).toBe(2); // including default
+    expect(integrations.list()[0].config.host).toBe(
+      'myaccount.blob.core.windows.net',
+    );
+    expect(integrations.list()[1].config.host).toBe('blob.core.windows.net'); // default integration
+  });
+
+  it('returns the basics', () => {
+    const integration = new AzureBlobStorageIntergation({
+      host: 'myaccount.blob.core.windows.net',
+    } as any);
+    expect(integration.type).toBe('azureBlobStorage');
+    expect(integration.title).toBe('myaccount.blob.core.windows.net');
+  });
+
+  describe('resolveUrl', () => {
+    it('works for valid URLs', () => {
+      const integration = new AzureBlobStorageIntergation({
+        host: 'blob.core.windows.net',
+      } as any);
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://myaccount.blob.core.windows.net/container/file.yaml',
+          base: 'https://myaccount.blob.core.windows.net/container/file.yaml',
+        }),
+      ).toBe('https://myaccount.blob.core.windows.net/container/file.yaml');
+    });
+  });
+
+  it('resolve edit URL', () => {
+    const integration = new AzureBlobStorageIntergation({
+      host: 'myaccount.blob.core.windows.net',
+    } as any);
+
+    // TODO: The Azure Blob Storage integration doesn't support resolving an edit URL,
+    // instead we keep the input URL.
+    expect(
+      integration.resolveEditUrl(
+        'https://myaccount.blob.core.windows.net/container/file.yaml',
+      ),
+    ).toBe('https://myaccount.blob.core.windows.net/container/file.yaml');
+  });
+});
diff --git a/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.ts b/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.ts
new file mode 100644
index 0000000000..27061f7d9d
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/AzureBlobStorageIntegration.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { basicIntegrations, defaultScmResolveUrl } from '../helpers';
+import { ScmIntegration, ScmIntegrationsFactory } from '../types';
+import {
+  AzureBlobStorageIntegrationConfig,
+  readAzureBlobStorageIntegrationConfigs,
+} from './config';
+
+/**
+ * Microsoft Azure Blob storage based integration.
+ *
+ * @public
+ */
+export class AzureBlobStorageIntergation implements ScmIntegration {
+  static factory: ScmIntegrationsFactory<AzureBlobStorageIntergation> = ({
+    config,
+  }) => {
+    const configs = readAzureBlobStorageIntegrationConfigs(
+      config.getOptionalConfigArray('integrations.azureBlobStorage') ?? [],
+    );
+    return basicIntegrations(
+      configs.map(c => new AzureBlobStorageIntergation(c)),
+      i => i.config.host,
+    );
+  };
+
+  get type(): string {
+    return 'azureBlobStorage';
+  }
+
+  get title(): string {
+    return this.integrationConfig.host;
+  }
+
+  get config(): AzureBlobStorageIntegrationConfig {
+    return this.integrationConfig;
+  }
+
+  constructor(
+    private readonly integrationConfig: AzureBlobStorageIntegrationConfig,
+  ) {}
+
+  resolveUrl(options: {
+    url: string;
+    base: string;
+    lineNumber?: number | undefined;
+  }): string {
+    const resolved = defaultScmResolveUrl(options);
+    return resolved;
+  }
+
+  resolveEditUrl(url: string): string {
+    // TODO: Implement edit URL for azureBlobStorage
+    return url;
+  }
+}
diff --git a/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsManager.test.ts b/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsManager.test.ts
new file mode 100644
index 0000000000..d8e8be2919
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsManager.test.ts
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  AccessToken,
+  ClientSecretCredential,
+  DefaultAzureCredential,
+} from '@azure/identity';
+import { ScmIntegrationRegistry } from '../registry';
+import { ConfigReader } from '@backstage/config';
+import { DefaultAzureCredentialsManager } from './DefaultAzureCredentialsProvider';
+import { ScmIntegrations } from '../ScmIntegrations';
+import { DateTime } from 'luxon';
+
+const MockedClientSecretCredential = ClientSecretCredential as jest.MockedClass<
+  typeof ClientSecretCredential
+>;
+
+jest.mock('@azure/identity');
+
+describe('DefaultAzureCredentialsManager', () => {
+  let mockIntegration: ScmIntegrationRegistry;
+
+  const buildProvider = (azureIntegrations: any[]) =>
+    DefaultAzureCredentialsManager.fromIntegrations(
+      ScmIntegrations.fromConfig(
+        new ConfigReader({
+          integrations: {
+            azureBlobStorage: azureIntegrations,
+          },
+        }),
+      ),
+    );
+
+  beforeEach(() => {
+    mockIntegration = {
+      azureBlobStorage: {
+        list: jest.fn().mockReturnValue([
+          {
+            config: {
+              accountName: 'testaccount',
+              aadCredential: {
+                clientId: 'someClientId',
+                tenantId: 'someTenantId',
+                clientSecret: 'someClientSecret',
+              },
+            },
+          },
+        ]),
+      },
+    } as unknown as ScmIntegrationRegistry;
+
+    MockedClientSecretCredential.prototype.getToken.mockImplementation(() =>
+      Promise.resolve({
+        expiresOnTimestamp: DateTime.local().plus({ days: 1 }).toSeconds(),
+        token: 'fake-client-secret-token',
+      } as AccessToken),
+    );
+  });
+
+  it('should create an instance from ScmIntegrationRegistry', () => {
+    const manager =
+      DefaultAzureCredentialsManager.fromIntegrations(mockIntegration);
+    expect(manager).toBeInstanceOf(DefaultAzureCredentialsManager);
+  });
+
+  it('should return cached credentials if available', async () => {
+    const manager = buildProvider([
+      {
+        accountName: 'testaccount',
+        aadCredential: {
+          clientId: 'someClientId',
+          tenantId: 'someTenantId',
+          clientSecret: 'someClientSecret',
+        },
+      },
+    ]);
+
+    const mockCredential = new MockedClientSecretCredential(
+      'someTenantId',
+      'someClientId',
+      'someClientSecret',
+    );
+
+    const credential = await manager.getCredentials('testaccount');
+
+    const scopes = ['https://storage.azure.com/.default'];
+
+    const expectedToken = await mockCredential.getToken(scopes);
+    const receivedToken = await credential.getToken(scopes);
+
+    expect(receivedToken?.token).toEqual(expectedToken.token);
+  });
+
+  it('should use Azure AD credentials if aadCredential is provided', async () => {
+    const manager = buildProvider([
+      {
+        accountName: 'testaccount',
+        aadCredential: {
+          clientId: 'someClientId',
+          tenantId: 'someTenantId',
+          clientSecret: 'someClientSecret',
+        },
+      },
+    ]);
+
+    const credential = await manager.getCredentials('testaccount');
+
+    expect(credential).toBeInstanceOf(ClientSecretCredential);
+  });
+
+  it('should use DefaultAzureCredential if no aadCredential is provided', async () => {
+    const manager = buildProvider([
+      {
+        accountName: 'testaccount',
+      },
+    ]);
+
+    const credential = await manager.getCredentials('testaccount');
+
+    expect(credential).toBeInstanceOf(DefaultAzureCredential);
+  });
+
+  it('should cache credentials after first retrieval', async () => {
+    const manager = buildProvider([
+      {
+        accountName: 'testaccount',
+      },
+    ]);
+
+    const credential = await manager.getCredentials('testaccount');
+
+    const cachedCredential = await manager.getCredentials('testaccount');
+    expect(cachedCredential).toBe(credential);
+  });
+});
diff --git a/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsProvider.ts b/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsProvider.ts
new file mode 100644
index 0000000000..3861329300
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/DefaultAzureCredentialsProvider.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  DefaultAzureCredential,
+  ClientSecretCredential,
+  TokenCredential,
+} from '@azure/identity';
+import { AzureBlobStorageIntegrationConfig } from './config';
+import { AzureCredentialsManager } from './types';
+import { ScmIntegrationRegistry } from '../registry';
+
+/**
+ * Default implementation of AzureCredentialsManager that supports multiple Azure Blob Storage integrations.
+ * @public
+ */
+export class DefaultAzureCredentialsManager implements AzureCredentialsManager {
+  private cachedCredentials: Map<string, TokenCredential>;
+
+  private constructor(
+    private readonly configProviders: Map<
+      string,
+      AzureBlobStorageIntegrationConfig
+    >,
+  ) {
+    this.cachedCredentials = new Map<string, TokenCredential>();
+  }
+
+  /**
+   * Creates an instance of DefaultAzureCredentialsManager from a Backstage integration registry.
+   */
+  static fromIntegrations(
+    integrations: ScmIntegrationRegistry,
+  ): DefaultAzureCredentialsManager {
+    const configProviders = integrations.azureBlobStorage
+      .list()
+      .reduce((acc, integration) => {
+        acc.set(
+          integration.config.accountName || 'default',
+          integration.config,
+        );
+        return acc;
+      }, new Map<string, AzureBlobStorageIntegrationConfig>());
+
+    return new DefaultAzureCredentialsManager(configProviders);
+  }
+
+  private createCredential(
+    config: AzureBlobStorageIntegrationConfig,
+  ): TokenCredential {
+    if (
+      config.aadCredential &&
+      config.aadCredential.clientId &&
+      config.aadCredential.clientSecret &&
+      config.aadCredential.tenantId
+    ) {
+      return new ClientSecretCredential(
+        config.aadCredential.tenantId,
+        config.aadCredential.clientId,
+        config.aadCredential.clientSecret,
+      );
+    }
+
+    return new DefaultAzureCredential();
+  }
+
+  async getCredentials(accountName: string): Promise<TokenCredential> {
+    if (this.cachedCredentials.has(accountName)) {
+      return this.cachedCredentials.get(accountName)!;
+    }
+
+    const config = this.configProviders.get(accountName);
+    if (!config) {
+      throw new Error(`No configuration found for account: ${accountName}`);
+    }
+
+    const credential = this.createCredential(config);
+
+    // Cache the credentials for future use
+    this.cachedCredentials.set(accountName, credential);
+
+    return credential;
+  }
+}
diff --git a/packages/integration/src/azureBlobStorage/config.test.ts b/packages/integration/src/azureBlobStorage/config.test.ts
new file mode 100644
index 0000000000..f17bdf3efb
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/config.test.ts
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Config, ConfigReader } from '@backstage/config';
+import {
+  AzureBlobStorageIntegrationConfig,
+  readAzureBlobStorageIntegrationConfig,
+  readAzureBlobStorageIntegrationConfigs,
+} from './config';
+
+describe('readAzureBlobStorageIntegrationConfig', () => {
+  function buildConfig(
+    data: Partial<AzureBlobStorageIntegrationConfig>,
+  ): Config {
+    return new ConfigReader(data);
+  }
+
+  it('reads valid configuration with accountKey', () => {
+    const output = readAzureBlobStorageIntegrationConfig(
+      buildConfig({
+        accountName: 'mystorageaccount',
+        accountKey: 'someAccountKey',
+      }),
+    );
+    expect(output).toEqual({
+      host: 'blob.core.windows.net',
+      endpoint: undefined,
+      accountName: 'mystorageaccount',
+      accountKey: 'someAccountKey',
+      sasToken: undefined,
+      connectionString: undefined,
+      endpointSuffix: undefined,
+      aadCredential: undefined,
+    });
+  });
+
+  it('reads valid configuration with sasToken', () => {
+    const output = readAzureBlobStorageIntegrationConfig(
+      buildConfig({
+        endpoint: 'https://blob.core.windows.net',
+        accountName: 'mystorageaccount',
+        sasToken: 'someSASToken',
+      }),
+    );
+    expect(output).toEqual({
+      host: 'blob.core.windows.net',
+      endpoint: 'https://blob.core.windows.net',
+      accountName: 'mystorageaccount',
+      accountKey: undefined,
+      sasToken: 'someSASToken',
+      connectionString: undefined,
+      endpointSuffix: undefined,
+      aadCredential: undefined,
+    });
+  });
+
+  it('reads valid configuration with Azure AD credentials', () => {
+    const output = readAzureBlobStorageIntegrationConfig(
+      buildConfig({
+        accountName: 'mystorageaccount',
+        aadCredential: {
+          clientId: 'someClientId',
+          tenantId: 'someTenantId',
+          clientSecret: 'someClientSecret',
+        },
+      }),
+    );
+    expect(output).toEqual({
+      host: 'blob.core.windows.net',
+      endpoint: undefined,
+      accountName: 'mystorageaccount',
+      accountKey: undefined,
+      sasToken: undefined,
+      connectionString: undefined,
+      endpointSuffix: undefined,
+      aadCredential: {
+        clientId: 'someClientId',
+        tenantId: 'someTenantId',
+        clientSecret: 'someClientSecret',
+      },
+    });
+  });
+
+  it('reads valid configuration with a custom endpoint', () => {
+    const output = readAzureBlobStorageIntegrationConfig(
+      buildConfig({
+        endpoint: 'https://custom.blob.core.windows.net',
+        accountName: 'customaccount',
+      }),
+    );
+    expect(output).toEqual({
+      host: 'custom.blob.core.windows.net',
+      endpoint: 'https://custom.blob.core.windows.net',
+      accountName: 'customaccount',
+      accountKey: undefined,
+      sasToken: undefined,
+      connectionString: undefined,
+      endpointSuffix: undefined,
+      aadCredential: undefined,
+    });
+  });
+
+  it('throws error for invalid endpoint URL', () => {
+    const config = buildConfig({
+      endpoint: 'invalid-url',
+      accountName: 'invalidaccount',
+    });
+
+    expect(() => readAzureBlobStorageIntegrationConfig(config)).toThrow(
+      `invalid azureBlobStorage integration config, endpoint 'invalid-url' is not a valid URL`,
+    );
+  });
+
+  it('throws error if endpoint has a path', () => {
+    const config = buildConfig({
+      endpoint: 'https://blob.core.windows.net/path',
+      accountName: 'accountwithpath',
+    });
+
+    expect(() => readAzureBlobStorageIntegrationConfig(config)).toThrow(
+      `invalid azureBlobStorage integration config, endpoints cannot contain path, got 'https://blob.core.windows.net/path'`,
+    );
+  });
+
+  it('throws error if both accountKey and sasToken are provided', () => {
+    const config = buildConfig({
+      accountName: 'mystorageaccount',
+      accountKey: 'someAccountKey',
+      sasToken: 'someSASToken',
+    });
+
+    expect(() => readAzureBlobStorageIntegrationConfig(config)).toThrow(
+      `Invalid Azure Blob Storage config for mystorageaccount: Both account key and SAS token cannot be used simultaneously.`,
+    );
+  });
+
+  it('throws error if both aadCredential and accountKey/sasToken are provided', () => {
+    const config = buildConfig({
+      accountName: 'mystorageaccount',
+      accountKey: 'someAccountKey',
+      aadCredential: {
+        clientId: 'someClientId',
+        tenantId: 'someTenantId',
+        clientSecret: 'someClientSecret',
+      },
+    });
+
+    expect(() => readAzureBlobStorageIntegrationConfig(config)).toThrow(
+      `Invalid Azure Blob Storage config for mystorageaccount: Cannot use both Azure AD credentials and account keys/SAS tokens for the same account.`,
+    );
+  });
+});
+
+describe('readAzureBlobStorageIntegrationConfigs', () => {
+  function buildConfigs(
+    data: Partial<AzureBlobStorageIntegrationConfig>[],
+  ): Config[] {
+    return data.map(item => new ConfigReader(item));
+  }
+
+  it('reads all provided configurations', () => {
+    const output = readAzureBlobStorageIntegrationConfigs(
+      buildConfigs([
+        {
+          host: 'blob.core.windows.net',
+          accountName: 'account1',
+          accountKey: 'someAccountKey',
+        },
+        {
+          endpoint: 'https://custom.blob.core.windows.net',
+          accountName: 'account2',
+        },
+      ]),
+    );
+    expect(output).toEqual([
+      {
+        host: 'blob.core.windows.net',
+        endpoint: undefined,
+        accountName: 'account1',
+        accountKey: 'someAccountKey',
+        sasToken: undefined,
+        connectionString: undefined,
+        endpointSuffix: undefined,
+        aadCredential: undefined,
+      },
+      {
+        host: 'custom.blob.core.windows.net',
+        endpoint: 'https://custom.blob.core.windows.net',
+        accountName: 'account2',
+        accountKey: undefined,
+        sasToken: undefined,
+        connectionString: undefined,
+        endpointSuffix: undefined,
+        aadCredential: undefined,
+      },
+    ]);
+  });
+
+  it('adds default integration for blob.core.windows.net when missing', () => {
+    const output = readAzureBlobStorageIntegrationConfigs(
+      buildConfigs([
+        {
+          endpoint: 'https://custom.blob.core.windows.net',
+          accountName: 'account2',
+        },
+      ]),
+    );
+
+    expect(output).toEqual([
+      {
+        host: 'custom.blob.core.windows.net',
+        endpoint: 'https://custom.blob.core.windows.net',
+        accountName: 'account2',
+        accountKey: undefined,
+        sasToken: undefined,
+        connectionString: undefined,
+        endpointSuffix: undefined,
+        aadCredential: undefined,
+      },
+      {
+        host: 'blob.core.windows.net',
+        endpoint: undefined,
+        accountName: undefined,
+        accountKey: undefined,
+        sasToken: undefined,
+        connectionString: undefined,
+        endpointSuffix: undefined,
+        aadCredential: undefined,
+      },
+    ]);
+  });
+
+  it('does not add default integration if blob.core.windows.net already exists', () => {
+    const output = readAzureBlobStorageIntegrationConfigs(
+      buildConfigs([
+        { host: 'blob.core.windows.net', accountName: 'account1' },
+      ]),
+    );
+    expect(output).toEqual([
+      {
+        host: 'blob.core.windows.net',
+        endpoint: undefined,
+        accountName: 'account1',
+        accountKey: undefined,
+        sasToken: undefined,
+        connectionString: undefined,
+        endpointSuffix: undefined,
+        aadCredential: undefined,
+      },
+    ]);
+  });
+});
diff --git a/packages/integration/src/azureBlobStorage/config.ts b/packages/integration/src/azureBlobStorage/config.ts
new file mode 100644
index 0000000000..10eccc252c
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/config.ts
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Config } from '@backstage/config';
+
+const AZURE_HOST = 'blob.core.windows.net';
+
+/**
+ * The configuration parameters for a single Azure Blob Storage account.
+ *
+ * @public
+ */
+export type AzureBlobStorageIntegrationConfig = {
+  /**
+   * The name of the Azure Storage Account, e.g., "mystorageaccount".
+   */
+  accountName?: string;
+
+  /**
+   * The primary or secondary key for the Azure Storage Account.
+   * Only required if connectionString or SAS token are not specified.
+   */
+  accountKey?: string;
+
+  /**
+   * A Shared Access Signature (SAS) token for limited access to resources.
+   */
+  sasToken?: string;
+
+  /**
+   * A full connection string for the Azure Storage Account.
+   * This includes the account name, key, and endpoint details.
+   */
+  connectionString?: string;
+
+  /**
+   * Optional endpoint suffix for custom domains or sovereign clouds.
+   * e.g., "core.windows.net" for public Azure or "core.usgovcloudapi.net" for US Government cloud.
+   */
+  endpointSuffix?: string;
+
+  /**
+   * The host of the target that this matches on, e.g., "blob.core.windows.net".
+   */
+  host: string;
+
+  endpoint?: string;
+  /**
+   * Optional credential to use for Azure Active Directory authentication.
+   */
+  aadCredential?: {
+    /**
+     * The client ID of the Azure AD application.
+     */
+    clientId: string;
+
+    /**
+     * The tenant ID for Azure AD.
+     */
+    tenantId: string;
+
+    /**
+     * The client secret for the Azure AD application.
+     */
+    clientSecret: string;
+  };
+};
+
+/**
+ * Reads a single Azure Blob Storage integration config.
+ *
+ * @param config - The config object of a single integration.
+ * @public
+ */
+export function readAzureBlobStorageIntegrationConfig(
+  config: Config,
+): AzureBlobStorageIntegrationConfig {
+  const endpoint = config.getOptionalString('endpoint');
+  const accountName = config.getString('accountName');
+  const accountKey = config.getOptionalString('accountKey')?.trim();
+  const sasToken = config.getOptionalString('sasToken')?.trim();
+  const connectionString = config.getOptionalString('connectionString')?.trim();
+  const endpointSuffix = config.getOptionalString('endpointSuffix')?.trim();
+
+  let host;
+  let pathname;
+  if (endpoint) {
+    try {
+      const url = new URL(endpoint);
+      host = url.host;
+      pathname = url.pathname;
+    } catch {
+      throw new Error(
+        `invalid azureBlobStorage integration config, endpoint '${endpoint}' is not a valid URL`,
+      );
+    }
+    if (pathname !== '/') {
+      throw new Error(
+        `invalid azureBlobStorage integration config, endpoints cannot contain path, got '${endpoint}'`,
+      );
+    }
+  } else {
+    host = AZURE_HOST;
+  }
+  const aadCredential = config.has('aadCredential')
+    ? {
+        clientId: config.getString('aadCredential.clientId'),
+        tenantId: config.getString('aadCredential.tenantId'),
+        clientSecret: config.getString('aadCredential.clientSecret')?.trim(),
+      }
+    : undefined;
+
+  if (accountKey && sasToken) {
+    throw new Error(
+      `Invalid Azure Blob Storage config for ${accountName}: Both account key and SAS token cannot be used simultaneously.`,
+    );
+  }
+
+  if (aadCredential && (accountKey || sasToken)) {
+    throw new Error(
+      `Invalid Azure Blob Storage config for ${accountName}: Cannot use both Azure AD credentials and account keys/SAS tokens for the same account.`,
+    );
+  }
+
+  return {
+    host,
+    endpoint,
+    accountName,
+    accountKey,
+    sasToken,
+    connectionString,
+    endpointSuffix,
+    aadCredential,
+  };
+}
+
+/**
+ * Reads a set of Azure Blob Storage integration configs.
+ *
+ * @param configs - All of the integration config objects.
+ * @public
+ */
+export function readAzureBlobStorageIntegrationConfigs(
+  configs: Config[],
+): AzureBlobStorageIntegrationConfig[] {
+  // First read all the explicit integrations
+  const result = configs.map(readAzureBlobStorageIntegrationConfig);
+
+  // If no explicit blob.core.windows.net integration was added, put one in the list as
+  // a convenience
+  if (!result.some(c => c.host === AZURE_HOST)) {
+    result.push({
+      host: AZURE_HOST,
+    });
+  }
+  return result;
+}
diff --git a/packages/backend-legacy/src/plugins/devtools.ts b/packages/integration/src/azureBlobStorage/index.ts
similarity index 56%
rename from packages/backend-legacy/src/plugins/devtools.ts
rename to packages/integration/src/azureBlobStorage/index.ts
index bfa29cd72e..f55e9aaa79 100644
--- a/packages/backend-legacy/src/plugins/devtools.ts
+++ b/packages/integration/src/azureBlobStorage/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Backstage Authors
+ * 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.
@@ -13,18 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import { createRouter } from '@backstage/plugin-devtools-backend';
-import { Router } from 'express';
-import type { PluginEnvironment } from '../types';
-
-export default async function createPlugin(
-  env: PluginEnvironment,
-): Promise<Router> {
-  return createRouter({
-    logger: env.logger,
-    config: env.config,
-    permissions: env.permissions,
-    discovery: env.discovery,
-  });
-}
+export { AzureBlobStorageIntergation } from './AzureBlobStorageIntegration';
+export {
+  readAzureBlobStorageIntegrationConfig,
+  readAzureBlobStorageIntegrationConfigs,
+} from './config';
+export type { AzureBlobStorageIntegrationConfig } from './config';
+export { DefaultAzureCredentialsManager } from './DefaultAzureCredentialsProvider';
+export type { AzureCredentialsManager } from './types';
diff --git a/packages/integration/src/azureBlobStorage/types.ts b/packages/integration/src/azureBlobStorage/types.ts
new file mode 100644
index 0000000000..90c2725d05
--- /dev/null
+++ b/packages/integration/src/azureBlobStorage/types.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TokenCredential } from '@azure/identity';
+import {
+  StorageSharedKeyCredential,
+  AnonymousCredential,
+} from '@azure/storage-blob';
+
+/**
+ * This allows implementations to be provided to retrieve Azure Storage accounts credentials.
+ *
+ * @public
+ *
+ */
+export interface AzureCredentialsManager {
+  getCredentials(
+    accountName: string,
+  ): Promise<
+    TokenCredential | StorageSharedKeyCredential | AnonymousCredential
+  >;
+}
diff --git a/packages/integration/src/index.ts b/packages/integration/src/index.ts
index 32c573abef..a625f5d83c 100644
--- a/packages/integration/src/index.ts
+++ b/packages/integration/src/index.ts
@@ -22,6 +22,7 @@
 
 export * from './awsS3';
 export * from './awsCodeCommit';
+export * from './azureBlobStorage';
 export * from './azure';
 export * from './bitbucket';
 export * from './bitbucketCloud';
diff --git a/packages/integration/src/registry.ts b/packages/integration/src/registry.ts
index 7e4b34cc34..2e8111903b 100644
--- a/packages/integration/src/registry.ts
+++ b/packages/integration/src/registry.ts
@@ -26,6 +26,7 @@ import { GithubIntegration } from './github/GithubIntegration';
 import { GitLabIntegration } from './gitlab/GitLabIntegration';
 import { GiteaIntegration } from './gitea/GiteaIntegration';
 import { HarnessIntegration } from './harness/HarnessIntegration';
+import { AzureBlobStorageIntergation } from './azureBlobStorage';
 
 /**
  * Holds all registered SCM integrations, of all types.
@@ -36,6 +37,7 @@ export interface ScmIntegrationRegistry
   extends ScmIntegrationsGroup<ScmIntegration> {
   awsS3: ScmIntegrationsGroup<AwsS3Integration>;
   awsCodeCommit: ScmIntegrationsGroup<AwsCodeCommitIntegration>;
+  azureBlobStorage: ScmIntegrationsGroup<AzureBlobStorageIntergation>;
   azure: ScmIntegrationsGroup<AzureIntegration>;
   /**
    * @deprecated in favor of `bitbucketCloud` and `bitbucketServer`
diff --git a/packages/release-manifests/CHANGELOG.md b/packages/release-manifests/CHANGELOG.md
index 2176118ea2..33042e37e8 100644
--- a/packages/release-manifests/CHANGELOG.md
+++ b/packages/release-manifests/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/release-manifests
 
+## 0.0.12-next.1
+
+### Patch Changes
+
+- b29eaea: Allow overriding the fetch function used inside getManifestByVersion
+
+## 0.0.12-next.0
+
+### Patch Changes
+
+- 2e140dc: Switch to native fetch for loading release manifests
+
 ## 0.0.11
 
 ### Patch Changes
diff --git a/packages/release-manifests/package.json b/packages/release-manifests/package.json
index 0b0e7e1591..b888d68e41 100644
--- a/packages/release-manifests/package.json
+++ b/packages/release-manifests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/release-manifests",
-  "version": "0.0.11",
+  "version": "0.0.12-next.1",
   "description": "Helper library for receiving release manifests",
   "backstage": {
     "role": "common-library"
@@ -35,9 +35,6 @@
     "postpack": "backstage-cli package postpack",
     "test": "backstage-cli package test"
   },
-  "dependencies": {
-    "cross-fetch": "^4.0.0"
-  },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@backstage/test-utils": "workspace:^",
diff --git a/packages/release-manifests/report.api.md b/packages/release-manifests/report.api.md
index 1ffa35838b..2d2cc00767 100644
--- a/packages/release-manifests/report.api.md
+++ b/packages/release-manifests/report.api.md
@@ -21,6 +21,12 @@ export function getManifestByVersion(
 // @public
 export type GetManifestByVersionOptions = {
   version: string;
+  fetch?: (
+    url: string,
+    options?: {
+      signal?: AbortSignal;
+    },
+  ) => Promise<Pick<Response, 'status' | 'json' | 'url'>>;
 };
 
 // @public
diff --git a/packages/release-manifests/src/manifest.test.ts b/packages/release-manifests/src/manifest.test.ts
index 3c7657a83f..ad5bf13496 100644
--- a/packages/release-manifests/src/manifest.test.ts
+++ b/packages/release-manifests/src/manifest.test.ts
@@ -55,6 +55,37 @@ describe('Release Manifests', () => {
         getManifestByVersion({ version: '999.0.1' }),
       ).rejects.toThrow('No release found for 999.0.1 version');
     });
+
+    it('should allow overriding the fetch implementation', async () => {
+      const mockFetch = jest.fn().mockImplementation(async url => ({
+        status: 200,
+        url,
+        json: () => ({
+          packages: [{ name: '@backstage/core', version: '2.3.4' }],
+        }),
+      }));
+
+      const pkgs = await getManifestByVersion({
+        version: '0.0.0',
+        fetch: mockFetch,
+      });
+
+      expect(pkgs.packages).toEqual([
+        {
+          name: '@backstage/core',
+          version: '2.3.4',
+        },
+      ]);
+
+      mockFetch.mockImplementation(async url => ({
+        status: 404,
+        url,
+      }));
+
+      await expect(
+        getManifestByVersion({ version: '0.0.0', fetch: mockFetch }),
+      ).rejects.toThrow('No release found for 0.0.0 version');
+    });
   });
 
   describe('getManifestByReleaseLine', () => {
diff --git a/packages/release-manifests/src/manifest.ts b/packages/release-manifests/src/manifest.ts
index 004ccfc77c..66a5f62151 100644
--- a/packages/release-manifests/src/manifest.ts
+++ b/packages/release-manifests/src/manifest.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import fetch from 'cross-fetch';
-
 const VERSIONS_BASE_URL = 'https://versions.backstage.io';
 const GITHUB_RAW_BASE_URL =
   'https://raw.githubusercontent.com/backstage/versions/main';
@@ -35,6 +33,10 @@ export type ReleaseManifest = {
  */
 export type GetManifestByVersionOptions = {
   version: string;
+  fetch?: (
+    url: string,
+    options?: { signal?: AbortSignal },
+  ) => Promise<Pick<Response, 'status' | 'json' | 'url'>>;
 };
 
 // Wait for waitMs, or until signal is aborted.
@@ -84,15 +86,21 @@ export async function getManifestByVersion(
   options: GetManifestByVersionOptions,
 ): Promise<ReleaseManifest> {
   const versionEnc = encodeURIComponent(options.version);
+
+  const fetchFn = options.fetch ?? fetch;
+
   const res = await withFallback(
     signal =>
-      fetch(`${VERSIONS_BASE_URL}/v1/releases/${versionEnc}/manifest.json`, {
+      fetchFn(`${VERSIONS_BASE_URL}/v1/releases/${versionEnc}/manifest.json`, {
         signal,
       }),
     signal =>
-      fetch(`${GITHUB_RAW_BASE_URL}/v1/releases/${versionEnc}/manifest.json`, {
-        signal,
-      }),
+      fetchFn(
+        `${GITHUB_RAW_BASE_URL}/v1/releases/${versionEnc}/manifest.json`,
+        {
+          signal,
+        },
+      ),
     500,
   );
   if (res.status === 404) {
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 98bef3998b..8756efb2d9 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,131 @@
 # @backstage/repo-tools
 
+## 0.12.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/cli-node@0.2.11-next.1
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+
+## 0.12.0-next.1
+
+### Patch Changes
+
+- 860e3b5: Generated OpenAPI clients now support paths with tags.
+- 00058d0: The `generate-patch` command will now add a single resolution entry for all versions of the patched package, rather than separate entries for each version query.
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/errors@1.2.5
+
+## 0.12.0-next.0
+
+### Minor Changes
+
+- c1eccd6: Fix invalid path and malformed flags bugs in api-reports.ts
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/cli-node@0.2.11-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+
+## 0.11.0
+
+### Minor Changes
+
+- 1440232: `backstage-repo-tools package schema openapi generate --server` now generates complete TS interfaces for all request/response objects in your OpenAPI schema. This fixes an edge case around recursive schemas and standardizes both the generated client and server to have similar generated types.
+- 47fdbb4: Adds a `--watch` mode to the `schema openapi generate` command for a better local schema writing experience.
+
+### Patch Changes
+
+- 95401a8: The `generate-patch` command now properly includes newly created files in the patch.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- 3f1fb21: The `generate-patch` command will now fall back to always adding a `resolutions` entry, even if no matching descriptors are found.
+- dde85ee: Added a new `generate-patch` command that can be used to generate patches for current changes in a source workspace to be installed it a target workspace.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-node@0.2.10
+  - @backstage/errors@1.2.5
+
+## 0.11.0-next.3
+
+### Patch Changes
+
+- 95401a8: The `generate-patch` command now properly includes newly created files in the patch.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- 3f1fb21: The `generate-patch` command will now fall back to always adding a `resolutions` entry, even if no matching descriptors are found.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## 0.11.0-next.2
+
+### Minor Changes
+
+- 1440232: `backstage-repo-tools package schema openapi generate --server` now generates complete TS interfaces for all request/response objects in your OpenAPI schema. This fixes an edge case around recursive schemas and standardizes both the generated client and server to have similar generated types.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## 0.11.0-next.1
+
+### Patch Changes
+
+- dde85ee: Added a new `generate-patch` command that can be used to generate patches for current changes in a source workspace to be installed it a target workspace.
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
+## 0.11.0-next.0
+
+### Minor Changes
+
+- 47fdbb4: Adds a `--watch` mode to the `schema openapi generate` command for a better local schema writing experience.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.9
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+
 ## 0.10.0
 
 ### Minor Changes
diff --git a/packages/repo-tools/cli-report.md b/packages/repo-tools/cli-report.md
index 9266957886..da483fe016 100644
--- a/packages/repo-tools/cli-report.md
+++ b/packages/repo-tools/cli-report.md
@@ -16,6 +16,7 @@ Commands:
   type-deps
   peer-deps [options]
   generate-catalog-info [options]
+  generate-patch [options] <package>
   knip-reports [options] [paths...]
   package [command]
   repo [command]
@@ -52,6 +53,20 @@ Options:
   -h, --help
 ```
 
+### `backstage-repo-tools generate-patch`
+
+```
+Usage: backstage-repo-tools generate-patch [options] <package>
+
+Options:
+  --target <target-repo>
+  --registry-url <registry-url>
+  --base-version <version>
+  --query <query>
+  --skip-install
+  -h, --help
+```
+
 ### `backstage-repo-tools knip-reports`
 
 ```
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 620456443d..c42a49109e 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.10.0",
+  "version": "0.12.0-next.2",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -74,7 +74,8 @@
     "minimatch": "^9.0.0",
     "p-limit": "^3.0.2",
     "portfinder": "^1.0.32",
-    "ts-morph": "^23.0.0",
+    "tar": "^6.1.12",
+    "ts-morph": "^24.0.0",
     "yaml-diff-patch": "^2.0.0"
   },
   "devDependencies": {
@@ -82,7 +83,7 @@
     "@backstage/cli": "workspace:^",
     "@backstage/types": "workspace:^",
     "@types/is-glob": "^4.0.2",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.16.0",
     "@types/prettier": "^2.0.0"
   },
   "peerDependencies": {
diff --git a/packages/repo-tools/src/commands/api-reports/api-reports.test.ts b/packages/repo-tools/src/commands/api-reports/api-reports.test.ts
index 955720c52e..94ae42d715 100644
--- a/packages/repo-tools/src/commands/api-reports/api-reports.test.ts
+++ b/packages/repo-tools/src/commands/api-reports/api-reports.test.ts
@@ -323,6 +323,24 @@ describe('buildApiReports', () => {
 
       expect(buildDocs).not.toHaveBeenCalled();
     });
+    it('should throw an error if a path does not exist', async () => {
+      const paths = ['packages/package-a', 'packages/package-c'];
+      const opts = {};
+
+      await expect(buildApiReports(paths, opts)).rejects.toThrow(
+        'Invalid paths provided: packages/package-c',
+      );
+    });
+    it('should throw an error if an option is malformed', async () => {
+      const paths = ['ae-undocumented'];
+      const opts = {
+        omitMessages: 'ae-wrong-input-file-type,',
+      };
+
+      await expect(buildApiReports(paths, opts)).rejects.toThrow(
+        'Invalid paths provided: ae-undocumented',
+      );
+    });
   });
   describe('allowWarnings', () => {
     it('should accept single path value', async () => {
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 637cd86671..4e568102d9 100644
--- a/packages/repo-tools/src/commands/api-reports/api-reports.ts
+++ b/packages/repo-tools/src/commands/api-reports/api-reports.ts
@@ -48,6 +48,7 @@ export const buildApiReports = async (paths: string[] = [], opts: Options) => {
   const omitMessages = parseArrayOption(opts.omitMessages);
 
   const isAllPackages = !paths?.length;
+
   const selectedPackageDirs = await resolvePackagePaths({
     paths,
     include: opts.include,
@@ -130,5 +131,10 @@ export const buildApiReports = async (paths: string[] = [], opts: Options) => {
  * // returns []
  */
 function parseArrayOption(value: string | undefined) {
-  return value ? value.split(',').map(s => s.trim()) : [];
+  return value
+    ? value
+        .split(',')
+        .map(s => s.trim())
+        .filter(Boolean)
+    : [];
 }
diff --git a/packages/repo-tools/src/commands/generate-patch/generate-patch.ts b/packages/repo-tools/src/commands/generate-patch/generate-patch.ts
new file mode 100644
index 0000000000..224b7ae4e6
--- /dev/null
+++ b/packages/repo-tools/src/commands/generate-patch/generate-patch.ts
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { getPackages, Package, Packages } from '@manypkg/get-packages';
+import os from 'os';
+import fs from 'fs-extra';
+import {
+  relative as relativePath,
+  join as joinPath,
+  resolve as resolvePath,
+  posix,
+} from 'path';
+import { exec } from '../../lib/exec';
+import { ForwardedError } from '@backstage/errors';
+import { Readable } from 'stream';
+import { finished } from 'stream/promises';
+import { ReadableStream } from 'stream/web';
+import tar from 'tar';
+
+// TODO: add option for this
+const DEFAULT_REGISTRY_URL = 'https://registry.npmjs.org';
+
+const PATCH_GITIGNORE = [
+  // Avoid generating patches for source maps
+  '*.map',
+  // Patching package.json has no effect, so exclude
+  'package.json',
+  // No point patching docs
+  '/*.md',
+  '/docs',
+];
+
+// More predictable git behavior, see https://github.com/yarnpkg/berry/blob/f59bbf9f3828865c14b06a3e5cc3ae284a0db78d/packages/plugin-patch/sources/patchUtils.ts#L291
+const GIT_ENV = {
+  GIT_CONFIG_NOSYSTEM: '1',
+  HOME: '',
+  XDG_CONFIG_HOME: '',
+  USERPROFILE: '',
+};
+
+interface PatchContext {
+  sourceRepo: Packages;
+  targetRepo: Packages;
+  sourcePkg: Package;
+  packageName: string;
+  targetRoot: string;
+  workDir: string;
+  registryUrl: string;
+}
+
+export default async (
+  packageArg: string,
+  opts: {
+    target: string;
+    query?: string;
+    registryUrl?: string;
+    baseVersion?: string;
+    skipInstall?: boolean;
+  },
+) => {
+  const sourceRepo = await getPackages(process.cwd());
+  const targetRepo = await getPackages(opts.target);
+  const registryUrl = opts.registryUrl || DEFAULT_REGISTRY_URL;
+
+  if (targetRepo.tool !== 'yarn') {
+    throw new Error(
+      `Unable to generate patch for target repo, tool is not supported: ${targetRepo.tool}`,
+    );
+  }
+  if (sourceRepo.root.dir === targetRepo.root.dir) {
+    throw new Error(
+      `Unexpected workspace roots, source and target repo are the same: ${sourceRepo.root.dir}`,
+    );
+  }
+
+  await verifyYarnVersion(sourceRepo.root.dir);
+  await verifyYarnVersion(targetRepo.root.dir);
+
+  const sourcePkg = sourceRepo.packages.find(
+    pkg =>
+      pkg.packageJson.name === packageArg ||
+      relativePath(sourceRepo.root.dir, pkg.dir) === packageArg,
+  );
+  if (!sourcePkg) {
+    throw new Error(`Could not find package ${packageArg} in source repo`);
+  }
+
+  const tmpDir = await fs.mkdtemp(os.tmpdir());
+  const ctx: PatchContext = {
+    sourceRepo,
+    targetRepo,
+    sourcePkg,
+    packageName: sourcePkg.packageJson.name,
+    targetRoot: targetRepo.root.dir,
+    registryUrl,
+    workDir: tmpDir,
+  };
+
+  // Create a new temporary directory where we put archives and generate patches
+  try {
+    const updateTargetRootPkg = await loadTrimmedRootPkg(ctx, opts.query);
+
+    console.log(
+      `Building and packaging target package ${sourcePkg.packageJson.name}`,
+    );
+    const targetArchive = await buildTargetArchive(ctx);
+
+    console.log(`Generating patch from ${sourcePkg.packageJson.version}`);
+    const patchEntry = await generatePatch(
+      ctx,
+      targetArchive,
+      opts.baseVersion || sourcePkg.packageJson.version,
+    );
+
+    await updateTargetRootPkg(patchEntry);
+
+    if (!opts.skipInstall) {
+      console.log("Running 'yarn install' in target workspace");
+      await exec('yarn', ['install'], {
+        cwd: ctx.targetRoot,
+      }).catch(() => {
+        throw new Error(
+          "Failed to run 'yarn install' in target workspace, please run it manually to troubleshoot",
+        );
+      });
+    } else {
+      console.log("Skipped running 'yarn install'");
+    }
+  } finally {
+    fs.rmSync(tmpDir, { force: true, recursive: true, maxRetries: 3 });
+  }
+};
+
+// Load the root package.json from the target repo, and trim out any existing
+// resolution entries and patches. The changes can be saved along with the new
+// patch entry by calling the returned function.
+async function loadTrimmedRootPkg(ctx: PatchContext, query?: string) {
+  const newPkgJson = JSON.parse(
+    JSON.stringify(ctx.targetRepo.root.packageJson),
+  );
+  const resolutionsObj =
+    newPkgJson.resolutions || (newPkgJson.resolutions = {});
+
+  const searchEntry = query ? `${ctx.packageName}@${query}` : ctx.packageName;
+
+  // Check if there is a resolution for all versions of the source package, in
+  // that case we just replace that, rather than patching each version
+  if (query || resolutionsObj[searchEntry]) {
+    const existingPatchFile = tryParsePatchResolution(
+      resolutionsObj[searchEntry],
+    );
+
+    if (existingPatchFile) {
+      await fs.rm(resolvePath(ctx.targetRoot, existingPatchFile), {
+        force: true,
+      });
+    }
+
+    return async (patchEntry?: string) => {
+      resolutionsObj[searchEntry] = patchEntry;
+
+      await fs.writeJson(
+        resolvePath(ctx.targetRoot, 'package.json'),
+        newPkgJson,
+        {
+          spaces: 2,
+        },
+      );
+    };
+  }
+
+  // Any existing resolution entries for the package are removed
+  const entriesToRemove = Object.entries(resolutionsObj).filter(([key]) =>
+    key.startsWith(`${ctx.packageName}@`),
+  ) as Array<[string, string]>;
+
+  for (const [key, value] of entriesToRemove) {
+    delete resolutionsObj[key];
+
+    // Existing patch files are also removed
+    const existingPatchFile = tryParsePatchResolution(value);
+    if (existingPatchFile) {
+      await fs.rm(resolvePath(ctx.targetRoot, existingPatchFile), {
+        force: true,
+      });
+    }
+  }
+
+  return async (patchEntry?: string) => {
+    resolutionsObj[ctx.packageName] = patchEntry;
+
+    // We use the same patch for all versions of the package, if they don't
+    // apply it might require manual intervention using the --query option
+    await fs.writeJson(
+      resolvePath(ctx.targetRoot, 'package.json'),
+      newPkgJson,
+      {
+        spaces: 2,
+      },
+    );
+  };
+}
+
+// Verify that a repo is using a supported Yarn version
+async function verifyYarnVersion(cwd: string) {
+  const exists = await fs.pathExists(joinPath(cwd, '.yarnrc.yml'));
+  if (!exists) {
+    throw new Error(
+      `Missing .yarnrc.yml in ${cwd}, Yarn v1 (classic) is not support by this command`,
+    );
+  }
+}
+
+// Generate a new patch and return the path to the generated patch file. Will
+// instead return undefined if the patch is empty.
+async function generatePatch(
+  ctx: PatchContext,
+  targetArchive: string,
+  version: string,
+): Promise<string | undefined> {
+  const baseArchive = await downloadArchive(ctx, version);
+  const patch = await generatePatchForArchives(ctx, baseArchive, targetArchive);
+  if (!patch) {
+    console.warn(`Generated patch for ${ctx.packageName} is empty`);
+    return undefined;
+  }
+  const cleanPackageName = ctx.packageName.replace('/', '-');
+  const describeResult = await exec(
+    'git',
+    ['describe', '--always', '--dirty', "--exclude='*'"],
+    {
+      cwd: ctx.sourceRepo.root.dir,
+      env: { ...process.env, ...GIT_ENV },
+    },
+  );
+  const describe = describeResult.stdout.toString('utf8').trim();
+  const name = `${cleanPackageName}-${version}-${describe}.patch`;
+  const patchDir = joinPath(ctx.targetRepo.root.dir, '.yarn', 'patches');
+
+  await fs.ensureDir(patchDir);
+  await fs.writeFile(joinPath(patchDir, name), patch, 'utf8');
+
+  const locator = `${ctx.sourcePkg.packageJson.name}@npm:${version}`;
+  return `patch:${encodeURIComponent(locator)}#${posix.join(
+    '.',
+    '.yarn',
+    'patches',
+    name,
+  )}`;
+}
+
+// Check if an existing resolution entry is a patch, and in that case return the
+// path to the patch file.
+function tryParsePatchResolution(value?: string): string | undefined {
+  if (!value) {
+    return undefined;
+  }
+  if (!value.startsWith('patch:')) {
+    return undefined;
+  }
+  const patchFilePath = value.split('#')[1];
+  return patchFilePath;
+}
+
+// Build and pack the source package to an archive in the work directory
+async function buildTargetArchive(ctx: PatchContext): Promise<string> {
+  await exec('yarn', ['build'], {
+    cwd: ctx.sourcePkg.dir,
+  });
+
+  const archiveName = 'target.tgz';
+
+  await exec('yarn', ['pack', '--out', joinPath(ctx.workDir, archiveName)], {
+    cwd: ctx.sourcePkg.dir,
+  });
+
+  return archiveName;
+}
+
+// Downloads a tar archive for the source package at the specified version
+async function downloadArchive(
+  ctx: PatchContext,
+  version: string,
+): Promise<string> {
+  const nameWithoutScope = ctx.packageName.replace(/^@.+\//, '');
+  const tarName = `${nameWithoutScope}-${version}.tgz`;
+
+  if (await fs.pathExists(joinPath(ctx.workDir, tarName))) {
+    return tarName;
+  }
+
+  try {
+    const url = `${ctx.registryUrl}/${ctx.packageName}/-/${tarName}`;
+    const res = await fetch(url);
+    if (!res.ok) {
+      throw new Error(
+        `Request to ${url} failed with status ${res.status} ${res.statusText}`,
+      );
+    }
+    if (!res.body) {
+      throw new Error('Missing response body');
+    }
+    const write = fs.createWriteStream(joinPath(ctx.workDir, tarName));
+
+    await finished(Readable.fromWeb(res.body as ReadableStream).pipe(write));
+
+    return tarName;
+  } catch (error) {
+    throw new ForwardedError(
+      `Failed to fetch tarball for ${ctx.packageName}@${version}`,
+      error,
+    );
+  }
+}
+
+// Given two archives, generate a git diff patch for the differences between
+async function generatePatchForArchives(
+  ctx: PatchContext,
+  baseArchive: string,
+  headArchive: string,
+): Promise<string> {
+  const basePath = joinPath(ctx.workDir, baseArchive);
+  const headPath = joinPath(ctx.workDir, headArchive);
+
+  const patchDir = await fs.mkdtemp(joinPath(ctx.workDir, 'patch-'));
+
+  // Extract base archive contents to use as base for patch
+  // Strip 1 level as the root of the archive is a package/ directory
+  await tar.extract({ file: basePath, cwd: patchDir, strip: 1 });
+
+  // Write .gitignore to avoid generating patches for certain files
+  await fs.writeFile(
+    joinPath(patchDir, '.gitignore'),
+    PATCH_GITIGNORE.join(os.EOL),
+  );
+
+  // Init git and populate index
+  await exec('git', ['init'], {
+    cwd: patchDir,
+    env: { ...process.env, ...GIT_ENV },
+  });
+  await exec('git', ['add', '.'], {
+    cwd: patchDir,
+    env: { ...process.env, ...GIT_ENV },
+  });
+  // Commit the base archive contents, so that we can later add all files and diff against the index
+  await exec(
+    'git',
+    [
+      '-c',
+      'user.name="patcher"',
+      '-c',
+      'user.email="patcher@acme.org"',
+      'commit',
+      '-m',
+      'base',
+    ],
+    {
+      cwd: patchDir,
+      env: { ...process.env, ...GIT_ENV },
+    },
+  );
+
+  // Remove all existing files
+  for (const path of await fs.readdir(patchDir)) {
+    if (path !== '.git' && path !== '.gitignore') {
+      await fs.rm(joinPath(patchDir, path), {
+        recursive: true,
+        maxRetries: 3,
+        force: true,
+      });
+    }
+  }
+
+  // Extract the target archive to use a target for the patch
+  await tar.extract({ file: headPath, cwd: patchDir, strip: 1 });
+
+  // Add and diff against index, to make sure we include untracked files
+  await exec('git', ['add', '.'], {
+    cwd: patchDir,
+    env: { ...process.env, ...GIT_ENV },
+  });
+  const { stdout: patch } = await exec(
+    'git',
+    [
+      '-c',
+      'core.safecrlf=false',
+      'diff',
+      '--cached',
+      '--src-prefix=a/',
+      '--dst-prefix=b/',
+      '--ignore-cr-at-eol',
+      '--full-index',
+      '--no-renames',
+      '--text',
+    ],
+    {
+      cwd: patchDir,
+      env: { ...process.env, ...GIT_ENV },
+    },
+  );
+  return patch.toString('utf8');
+}
diff --git a/packages/repo-tools/src/commands/index.ts b/packages/repo-tools/src/commands/index.ts
index abe55356ef..e3c4c9e41f 100644
--- a/packages/repo-tools/src/commands/index.ts
+++ b/packages/repo-tools/src/commands/index.ts
@@ -253,6 +253,37 @@ export function registerCommands(program: Command) {
       ),
     );
 
+  program
+    .command('generate-patch <package>')
+    .requiredOption(
+      '--target <target-repo>',
+      'The target repository to generate patches for',
+    )
+    .option(
+      '--registry-url <registry-url>',
+      'The registry to use for downloading artifacts (default: https://registry.npmjs.org)',
+    )
+    .option(
+      '--base-version <version>',
+      'Override the base version to generate the patch towards instead',
+    )
+    .option(
+      '--query <query>',
+      'Only apply the patch for a specific version query in the target repository',
+    )
+    .option(
+      '--skip-install',
+      'Skip dependency installation in the target repository after applying the patch',
+    )
+    .description(
+      'Generate a patch for the selected package in the target repository',
+    )
+    .action(
+      lazy(() =>
+        import('./generate-patch/generate-patch').then(m => m.default),
+      ),
+    );
+
   program
     .command('knip-reports [paths...]')
     .option('--ci', 'CI run checks that there is no changes on knip reports')
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
index 742f303f51..edcb49a9be 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
@@ -21,11 +21,13 @@ import {
   OUTPUT_PATH,
 } from '../../../../../lib/openapi/constants';
 import { paths as cliPaths } from '../../../../../lib/paths';
-import { mkdirpSync } from 'fs-extra';
 import fs from 'fs-extra';
 import { exec } from '../../../../../lib/exec';
 import { resolvePackagePath } from '@backstage/backend-plugin-api';
-import { getPathToCurrentOpenApiSpec } from '../../../../../lib/openapi/helpers';
+import {
+  getPathToCurrentOpenApiSpec,
+  toGeneratorAdditionalProperties,
+} from '../../../../../lib/openapi/helpers';
 
 async function generate(
   outputDirectory: string,
@@ -37,12 +39,11 @@ async function generate(
     outputDirectory,
     OUTPUT_PATH,
   );
-  const additionalProperties = clientAdditionalProperties
-    ? `--additional-properties=${clientAdditionalProperties}`
-    : '';
-  mkdirpSync(resolvedOutputDirectory);
+  const additionalProperties = toGeneratorAdditionalProperties({
+    initialValue: clientAdditionalProperties,
+  });
 
-  await fs.mkdirp(resolvedOutputDirectory);
+  await fs.emptyDir(resolvedOutputDirectory);
 
   await fs.writeFile(
     resolve(resolvedOutputDirectory, '.openapi-generator-ignore'),
@@ -63,11 +64,13 @@ async function generate(
       '-c',
       resolvePackagePath(
         '@backstage/repo-tools',
-        'templates/typescript-backstage.yaml',
+        'templates/typescript-backstage-client.yaml',
       ),
       '--generator-key',
       'v3.0',
-      additionalProperties,
+      additionalProperties
+        ? `--additional-properties=${additionalProperties}`
+        : '',
     ],
     {
       signal: abortSignal?.signal,
@@ -79,15 +82,21 @@ async function generate(
     },
   );
 
-  await exec(
-    `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
-    [],
-    { signal: abortSignal?.signal },
+  const parentDirectory = resolve(resolvedOutputDirectory, '..');
+
+  await fs.writeFile(
+    resolve(parentDirectory, 'index.ts'),
+    `// 
+    export * from './generated';`,
   );
 
+  await exec(`yarn backstage-cli package lint --fix ${parentDirectory}`, [], {
+    signal: abortSignal?.signal,
+  });
+
   const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
   if (prettier) {
-    await exec(`${prettier} --write ${resolvedOutputDirectory}`, [], {
+    await exec(`${prettier} --write ${parentDirectory}`, [], {
       signal: abortSignal?.signal,
     });
   }
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
index 1ef6fd10d2..8c342b0a68 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
@@ -14,23 +14,39 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
-import YAML from 'js-yaml';
 import chalk from 'chalk';
+import { resolve, dirname, join } from 'path';
+import YAML from 'js-yaml';
+import {
+  OLD_SCHEMA_PATH,
+  OPENAPI_IGNORE_FILES,
+  OUTPUT_PATH,
+  TS_SCHEMA_PATH,
+} from '../../../../../lib/openapi/constants';
 import { paths as cliPaths } from '../../../../../lib/paths';
-import { TS_SCHEMA_PATH } from '../../../../../lib/openapi/constants';
-import { promisify } from 'util';
-import { exec as execCb } from 'child_process';
-import { getPathToCurrentOpenApiSpec } from '../../../../../lib/openapi/helpers';
+import fs from 'fs-extra';
+import { exec } from '../../../../../lib/exec';
+import { resolvePackagePath } from '@backstage/backend-plugin-api';
+import {
+  getPathToCurrentOpenApiSpec,
+  getRelativePathToFile,
+} from '../../../../../lib/openapi/helpers';
 
-const exec = promisify(execCb);
-
-async function generate(abortSignal?: AbortController) {
+async function generateSpecFile() {
   const openapiPath = await getPathToCurrentOpenApiSpec();
   const yaml = YAML.load(await fs.readFile(openapiPath, 'utf8'));
 
   const tsPath = cliPaths.resolveTarget(TS_SCHEMA_PATH);
 
+  const schemaDir = dirname(tsPath);
+  await fs.mkdirp(schemaDir);
+
+  const oldTsPath = cliPaths.resolveTarget(OLD_SCHEMA_PATH);
+  if (fs.existsSync(oldTsPath)) {
+    console.warn(`Removing old schema file at ${oldTsPath}`);
+    fs.removeSync(oldTsPath);
+  }
+
   // The first set of comment slashes allow for the eslint notice plugin to run
   // with onNonMatchingHeader: 'replace', as is the case in the open source
   // Backstage repo. Otherwise the auto-generated comment will be removed by the
@@ -42,23 +58,93 @@ async function generate(abortSignal?: AbortController) {
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import {createValidatedOpenApiRouter} from '@backstage/backend-openapi-utils';
+import {createValidatedOpenApiRouterFromGeneratedEndpointMap} from '@backstage/backend-openapi-utils';
+import {EndpointMap} from './';
 export const spec = ${JSON.stringify(yaml, null, 2)} as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<typeof createValidatedOpenApiRouterFromGeneratedEndpointMap>['1'],
+) => createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(spec, options);
 `,
   );
 
-  await exec(`yarn backstage-cli package lint --fix ${tsPath}`, {
-    signal: abortSignal?.signal,
-  });
+  const indexFile = join(schemaDir, '..', 'index.ts');
+  await fs.writeFile(
+    indexFile,
+    `// 
+    export * from './generated';`,
+  );
+
+  await exec(`yarn backstage-cli package lint`, ['--fix', tsPath, indexFile]);
   if (await cliPaths.resolveTargetRoot('node_modules/.bin/prettier')) {
-    await exec(`yarn prettier --write ${tsPath}`, {
+    await exec(`yarn prettier`, ['--write', tsPath, indexFile], {
       cwd: cliPaths.targetRoot,
+    });
+  }
+}
+
+async function generate(abortSignal?: AbortController) {
+  const resolvedOpenapiPath = await getPathToCurrentOpenApiSpec();
+  const resolvedOutputDirectory = await getRelativePathToFile(OUTPUT_PATH);
+
+  await fs.emptyDir(resolvedOutputDirectory);
+
+  await fs.writeFile(
+    resolve(resolvedOutputDirectory, '.openapi-generator-ignore'),
+    OPENAPI_IGNORE_FILES.join('\n'),
+  );
+
+  await exec(
+    'node',
+    [
+      resolvePackagePath('@openapitools/openapi-generator-cli', 'main.js'),
+      'generate',
+      '-i',
+      resolvedOpenapiPath,
+      '-o',
+      resolvedOutputDirectory,
+      '-g',
+      'typescript',
+      '-c',
+      resolvePackagePath(
+        '@backstage/repo-tools',
+        'templates/typescript-backstage-server.yaml',
+      ),
+      '--generator-key',
+      'v3.0',
+    ],
+    {
+      maxBuffer: Number.MAX_VALUE,
+      cwd: resolvePackagePath('@backstage/repo-tools'),
+      env: {
+        ...process.env,
+      },
+      signal: abortSignal?.signal,
+    },
+  );
+
+  await exec(
+    `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
+    [],
+    {
+      signal: abortSignal?.signal,
+    },
+  );
+
+  const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
+  if (prettier) {
+    await exec(`${prettier} --write ${resolvedOutputDirectory}`, [], {
       signal: abortSignal?.signal,
     });
   }
+
+  fs.removeSync(resolve(resolvedOutputDirectory, '.openapi-generator-ignore'));
+
+  fs.rmSync(resolve(resolvedOutputDirectory, '.openapi-generator'), {
+    recursive: true,
+    force: true,
+  });
+
+  await generateSpecFile();
 }
 
 export async function command({
diff --git a/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts b/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
index 35dd3e1702..61aadc5d0c 100644
--- a/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
+++ b/packages/repo-tools/src/commands/repo/schema/openapi/verify.ts
@@ -22,7 +22,7 @@ import { relative as relativePath, resolve as resolvePath } from 'path';
 import { runner } from '../../../../lib/runner';
 import { paths as cliPaths } from '../../../../lib/paths';
 import {
-  TS_MODULE,
+  OLD_SCHEMA_PATH,
   TS_SCHEMA_PATH,
   YAML_SCHEMA_PATH,
 } from '../../../../lib/openapi/constants';
@@ -41,12 +41,20 @@ async function verify(directoryPath: string) {
   }
   const yaml = await loadAndValidateOpenApiYaml(openapiPath);
 
-  const schemaPath = join(directoryPath, TS_SCHEMA_PATH);
-  if (!(await fs.pathExists(schemaPath))) {
+  let schemaPath = join(directoryPath, TS_SCHEMA_PATH);
+  if (
+    !(await fs.pathExists(schemaPath)) &&
+    !(await fs.pathExists(join(directoryPath, OLD_SCHEMA_PATH)))
+  ) {
     throw new Error(`No \`${TS_SCHEMA_PATH}\` file found.`);
+  } else if (await fs.pathExists(join(directoryPath, OLD_SCHEMA_PATH))) {
+    console.warn(
+      `\`${OLD_SCHEMA_PATH}\` is deprecated. Please re-run \`yarn backstage-repo-tools package schema openapi generate\` to update it.`,
+    );
+    schemaPath = join(directoryPath, OLD_SCHEMA_PATH);
   }
 
-  const schema = await import(resolvePath(join(directoryPath, TS_MODULE)));
+  const schema = await import(resolvePath(schemaPath));
 
   if (!schema.spec) {
     throw new Error(`\`${TS_SCHEMA_PATH}\` needs to have a 'spec' export.`);
diff --git a/packages/repo-tools/src/lib/openapi/constants.ts b/packages/repo-tools/src/lib/openapi/constants.ts
index 4936a5aee7..22f52e75a9 100644
--- a/packages/repo-tools/src/lib/openapi/constants.ts
+++ b/packages/repo-tools/src/lib/openapi/constants.ts
@@ -16,7 +16,11 @@
 
 export const YAML_SCHEMA_PATH = 'src/schema/openapi.yaml';
 
-export const TS_MODULE = 'src/schema/openapi.generated';
+export const OUTPUT_PATH = 'src/schema/openapi/generated';
+
+export const TS_MODULE = `${OUTPUT_PATH}/router`;
+
+export const OLD_SCHEMA_PATH = `src/schema/openapi.generated.ts`;
 
 export const TS_SCHEMA_PATH = `${TS_MODULE}.ts`;
 
@@ -24,8 +28,6 @@ export const GENERATOR_VERSION = `1.0.0`;
 export const GENERATOR_NAME = 'typescript-backstage';
 export const GENERATOR_FILE = `packages/template-openapi-plugin-client/generator/target/${GENERATOR_NAME}-openapi-generator-${GENERATOR_VERSION}.jar`;
 
-export const OUTPUT_PATH = 'src/generated';
-
 export const OPENAPI_IGNORE_FILES = [
   // Get rid of the default files.
   '*.md',
@@ -45,6 +47,7 @@ export const OPENAPI_IGNORE_FILES = [
   // Override the created version.
   'apis/*.ts',
   '!apis/*.client.ts',
+  '!apis/*.server.ts',
   'models/*.ts',
   '!models/*.model.ts',
 
diff --git a/packages/repo-tools/src/lib/openapi/helpers.ts b/packages/repo-tools/src/lib/openapi/helpers.ts
index 2359a1bbb0..868623b874 100644
--- a/packages/repo-tools/src/lib/openapi/helpers.ts
+++ b/packages/repo-tools/src/lib/openapi/helpers.ts
@@ -51,3 +51,23 @@ export async function loadAndValidateOpenApiYaml(path: string) {
   await Parser.validate(cloneDeep(yaml) as any);
   return yaml;
 }
+
+export function toGeneratorAdditionalProperties({
+  initialValue,
+  defaultValue,
+}: {
+  initialValue?: string;
+  defaultValue?: Record<string, any>;
+}) {
+  const items = initialValue?.split(',') ?? [];
+  const parsed = items.reduce(
+    (acc, item) => {
+      const [key, value] = item.split('=');
+      return { ...acc, [key]: value };
+    },
+    { ...defaultValue },
+  );
+  return Object.entries(parsed)
+    .map(([key, value]) => `${key}=${value}`)
+    .join(',');
+}
diff --git a/packages/repo-tools/src/lib/paths.ts b/packages/repo-tools/src/lib/paths.ts
index 96fc92f035..0dcec32ff1 100644
--- a/packages/repo-tools/src/lib/paths.ts
+++ b/packages/repo-tools/src/lib/paths.ts
@@ -36,6 +36,23 @@ export async function resolvePackagePaths(
   const { paths: providedPaths, include, exclude } = options;
   let packages = await PackageGraph.listTargetPackages();
 
+  if (providedPaths && providedPaths.length > 0) {
+    const invalidPaths: string[] = [];
+    for (const path of providedPaths) {
+      const matches = packages.some(
+        ({ dir }) =>
+          new Minimatch(path).match(relativePath(paths.targetRoot, dir)) ||
+          isChildPath(dir, path),
+      );
+      if (!matches) {
+        invalidPaths.push(path);
+      }
+    }
+    if (invalidPaths.length > 0) {
+      throw new Error(`Invalid paths provided: ${invalidPaths.join(', ')}`);
+    }
+  }
+
   if (providedPaths && providedPaths.length > 0) {
     packages = packages.filter(({ dir }) =>
       providedPaths.some(
diff --git a/packages/repo-tools/templates/typescript-backstage.yaml b/packages/repo-tools/templates/typescript-backstage-client.yaml
similarity index 69%
rename from packages/repo-tools/templates/typescript-backstage.yaml
rename to packages/repo-tools/templates/typescript-backstage-client.yaml
index a2cb61c121..dc3220f2cd 100644
--- a/packages/repo-tools/templates/typescript-backstage.yaml
+++ b/packages/repo-tools/templates/typescript-backstage-client.yaml
@@ -1,10 +1,6 @@
-templateDir: templates/typescript-backstage
+templateDir: templates/typescript-backstage-client
 
 files:
-  api.mustache:
-    templateType: API
-    # For some reason, they check for destinationFilename differences. We have to change the ending to override the file.
-    destinationFilename: .client.ts
   model.mustache:
     templateType: Model
     destinationFilename: .model.ts
@@ -25,11 +21,19 @@ files:
   models/models_all.mustache:
     templateType: SupportingFiles
     destinationFilename: models/index.ts
-  types/fetch.ts: {}
-  types/discovery.ts: {}
+  types/fetch.ts:
+    destinationFilename: types/fetch.ts
+  types/discovery.ts:
+    destinationFilename: types/discovery.ts
   apis/index.mustache:
     templateType: SupportingFiles
     destinationFilename: apis/index.ts
+  apis/api-all.mustache:
+    templateType: SupportingFiles
+    destinationFilename: apis/Api.client.ts
   pluginId.mustache:
     templateType: SupportingFiles
     destinationFilename: pluginId.ts
+  index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: index.ts
diff --git a/packages/repo-tools/templates/typescript-backstage/api.mustache b/packages/repo-tools/templates/typescript-backstage-client/apis/api-all.mustache
similarity index 68%
rename from packages/repo-tools/templates/typescript-backstage/api.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/apis/api-all.mustache
index 8043d6e2f4..edf2e55a36 100644
--- a/packages/repo-tools/templates/typescript-backstage/api.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/apis/api-all.mustache
@@ -4,10 +4,12 @@ import { FetchApi } from '../types/fetch';
 import crossFetch from 'cross-fetch';
 import {pluginId} from '../pluginId';
 import * as parser from 'uri-template';
-
+{{#apiInfo}}
+{{#apis}}
 {{#imports}}
 import { {{classname}} } from '{{filename}}.model{{importFileExtension}}';
 {{/imports}}
+{{/apis}}
 
 /**
  * Wraps the Response type to convey a type on the json call.
@@ -18,8 +20,6 @@ export type TypedResponse<T> = Omit<Response, 'json'> & {
   json: () => Promise<T>;
 };
 
-{{#operations}}
-
 /**
  * Options you can pass into a request for additional information.
  *
@@ -28,11 +28,48 @@ export type TypedResponse<T> = Omit<Response, 'json'> & {
 export interface RequestOptions {
   token?: string;
 }
+{{#apis}}
+{{#operations}}
+{{#operation}}
+/**
+  * @public
+  */
+export type {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}} = {
+    {{#hasPathParams}}
+    path: {
+        {{#pathParams}}
+            {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/pathParams}}
+    },
+    {{/hasPathParams}}
+    {{#hasBodyParam}}
+        {{#bodyParam}}
+        body: {{{dataType}}},
+        {{/bodyParam}}
+    {{/hasBodyParam}}
+    {{#hasQueryParams}}
+    query: {
+        {{#queryParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/queryParams}}
+    },
+    {{/hasQueryParams}}
+    {{#hasHeaderParams}}
+    header: {
+        {{#headerParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/headerParams}}
+    },
+    {{/hasHeaderParams}}
+}
+{{/operation}}
+{{/operations}}
+{{/apis}}
 
 /**
- * {{{description}}}{{^description}}no description{{/description}}
+ * @public
  */
-export class {{classname}}Client {
+export class DefaultApiClient {
     private readonly discoveryApi: DiscoveryApi;
     private readonly fetchApi: FetchApi;
 
@@ -44,6 +81,9 @@ export class {{classname}}Client {
         this.fetchApi = options.fetchApi || { fetch: crossFetch };
     }
 
+    {{#apis}}
+    {{#operations}}
+
     {{#operation}}
     /**
      {{#notes}}
@@ -53,39 +93,12 @@ export class {{classname}}Client {
      * {{&summary}}
      {{/summary}}
      {{#allParams}}
-     * @param {{paramName}} {{description}}
+     * @param {{paramName}} - {{description}}
      {{/allParams}}
      */
     public async {{nickname}}(
         // @ts-ignore
-        request: {
-            {{#hasPathParams}}
-            path: {
-                {{#pathParams}}
-                    {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/pathParams}}
-            },
-            {{/hasPathParams}}
-            {{#hasBodyParam}}
-                {{#bodyParam}}
-                body: {{{dataType}}},
-                {{/bodyParam}}
-            {{/hasBodyParam}}
-            {{#hasQueryParams}}
-            query: {
-                {{#queryParams}}
-                {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/queryParams}}
-            },
-            {{/hasQueryParams}}
-            {{#hasHeaderParams}}
-            header: {
-                {{#headerParams}}
-                {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
-                {{/headerParams}}
-            },
-            {{/hasHeaderParams}}
-        },
+        request: {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}},
         options?: RequestOptions
     ): Promise<TypedResponse<{{{returnType}}} {{^returnType}}void{{/returnType}}>> {
         const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
@@ -115,5 +128,7 @@ export class {{classname}}Client {
     }
 
     {{/operation}}
+    {{/operations}}
+    {{/apis}}
 }
-{{/operations}}
+{{/apiInfo}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-client/apis/index.mustache b/packages/repo-tools/templates/typescript-backstage-client/apis/index.mustache
new file mode 100644
index 0000000000..ec61c280a8
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-client/apis/index.mustache
@@ -0,0 +1,3 @@
+//
+
+export * from './Api.client';
diff --git a/packages/repo-tools/templates/typescript-backstage/index.mustache b/packages/repo-tools/templates/typescript-backstage-client/index.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/index.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/index.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache b/packages/repo-tools/templates/typescript-backstage-client/licenseInfo.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/licenseInfo.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/model.mustache b/packages/repo-tools/templates/typescript-backstage-client/model.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/model.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/model.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/modelAlias.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
similarity index 92%
rename from packages/repo-tools/templates/typescript-backstage/modelAlias.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
index 351dc37c78..8358be805f 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelAlias.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelAlias.mustache
@@ -1,3 +1,6 @@
 {{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelAlias.mustache }}
 
+/**
+  * @public
+  */
 export type {{classname}} = {{dataType}};
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage/modelEnum.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
similarity index 91%
rename from packages/repo-tools/templates/typescript-backstage/modelEnum.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
index 0deab70f02..3a1b5ce86d 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelEnum.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelEnum.mustache
@@ -1,6 +1,9 @@
 {{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelEnum.mustache }}
 
 {{#stringEnums}}
+/**
+  * @public
+  */
 export enum {{classname}} {
 {{#allowableValues}}
 {{#enumVars}}
@@ -10,8 +13,14 @@ export enum {{classname}} {
 }
 {{/stringEnums}}
 {{^stringEnums}}
+/**
+  * @public
+  */
 export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
 
+/**
+  * @public
+  */
 export const {{classname}} = {
 {{#allowableValues}}
 {{#enumVars}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
similarity index 81%
rename from packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
index d51eeaed80..d01ea29260 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelGeneric.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelGeneric.mustache
@@ -3,13 +3,14 @@
 {{#models}}
 {{#model}}
 
-{{#description}}
 /**
+{{#description}}
 * {{{.}}}
-*/
 {{/description}}
+* @public
+*/
 {{^isEnum}}
-export interface {{classname}} {
+export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}} {{classname}} {{#isNullable}}={{/isNullable}} {
 {{>modelGenericAdditionalProperties}}
 {{#vars}}
 {{#description}}
@@ -19,12 +20,15 @@ export interface {{classname}} {
 {{/description}}
     '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
 {{/vars}}
-}
+}{{#isNullable}} | null{{/isNullable}}
 
 {{#hasEnums}}
 
 {{#vars}}
 {{#isEnum}}
+/**
+  * @public
+  */
 export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
 {{/isEnum}}
 {{/vars}}
@@ -32,6 +36,9 @@ export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {
 {{/hasEnums}}
 {{/isEnum}}
 {{#isEnum}}
+/**
+  * @public
+  */
 export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
 {{/isEnum}}
 {{/model}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGenericAdditionalProperties.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGenericAdditionalProperties.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
similarity index 90%
rename from packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
index 8d7b49c9c3..acfcc23959 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelGenericEnums.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelGenericEnums.mustache
@@ -3,11 +3,17 @@
 {{#hasEnums}}
 
 {{^stringEnums}}
+/**
+  * @public
+  */
 export namespace {{classname}} {
 {{/stringEnums}}
 {{#vars}}
     {{#isEnum}}
 {{#stringEnums}}
+/**
+  * @public
+  */
 export enum {{classname}}{{enumName}} {
 {{#allowableValues}}
 {{#enumVars}}
@@ -17,7 +23,14 @@ export enum {{classname}}{{enumName}} {
 };
 {{/stringEnums}}
 {{^stringEnums}}
+    /**
+    * @public
+    */
     export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+    /**
+    * @public
+    */
     export const {{enumName}} = {
     {{#allowableValues}}
     {{#enumVars}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
similarity index 96%
rename from packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
index b261789c3d..038025b651 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelOneOf.mustache
+++ b/packages/repo-tools/templates/typescript-backstage-client/modelOneOf.mustache
@@ -8,9 +8,10 @@ import {
 } from './';
 
 {{/hasImports}}
-{{#description}}
     /**
+{{#description}}
     * {{{.}}}
-    */
 {{/description}}
+    * @public
+    */
 export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};
diff --git a/packages/repo-tools/templates/typescript-backstage/modelTaggedUnion.mustache b/packages/repo-tools/templates/typescript-backstage-client/modelTaggedUnion.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/modelTaggedUnion.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/modelTaggedUnion.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/models/models_all.mustache b/packages/repo-tools/templates/typescript-backstage-client/models/models_all.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/models/models_all.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/models/models_all.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/pluginId.mustache b/packages/repo-tools/templates/typescript-backstage-client/pluginId.mustache
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/pluginId.mustache
rename to packages/repo-tools/templates/typescript-backstage-client/pluginId.mustache
diff --git a/packages/repo-tools/templates/typescript-backstage/types/discovery.ts b/packages/repo-tools/templates/typescript-backstage-client/types/discovery.ts
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/types/discovery.ts
rename to packages/repo-tools/templates/typescript-backstage-client/types/discovery.ts
diff --git a/packages/repo-tools/templates/typescript-backstage/types/fetch.ts b/packages/repo-tools/templates/typescript-backstage-client/types/fetch.ts
similarity index 100%
rename from packages/repo-tools/templates/typescript-backstage/types/fetch.ts
rename to packages/repo-tools/templates/typescript-backstage-client/types/fetch.ts
diff --git a/packages/repo-tools/templates/typescript-backstage-server.yaml b/packages/repo-tools/templates/typescript-backstage-server.yaml
new file mode 100644
index 0000000000..59d6c07c10
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server.yaml
@@ -0,0 +1,32 @@
+templateDir: templates/typescript-backstage-server
+
+files:
+  apis/index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: apis/index.ts
+  apis/api-all.mustache:
+    templateType: SupportingFiles
+    destinationFilename: apis/Api.server.ts
+  index.mustache:
+    templateType: SupportingFiles
+    destinationFilename: index.ts
+  model.mustache:
+    templateType: Model
+    destinationFilename: .model.ts
+  modelGeneric.mustache:
+    templateType: SupportingFiles
+  modelOneOf.mustache:
+    templateType: SupportingFiles
+  modelGenericAdditionalProperties.mustache:
+    templateType: SupportingFiles
+  modelGenericEnums.mustache:
+    templateType: SupportingFiles
+  modelAlias.mustache:
+    templateType: SupportingFiles
+  modelEnum.mustache:
+    templateType: SupportingFiles
+  modelTaggedUnion.mustache:
+    templateType: SupportingFiles
+  models/models_all.mustache:
+    templateType: SupportingFiles
+    destinationFilename: models/index.ts
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/apis/api-all.mustache b/packages/repo-tools/templates/typescript-backstage-server/apis/api-all.mustache
new file mode 100644
index 0000000000..30770d6481
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/apis/api-all.mustache
@@ -0,0 +1,60 @@
+//
+{{>licenseInfo}}
+{{#apiInfo}}
+{{#apis}}
+{{#imports}}
+import { {{classname}} } from '{{filename}}.model{{importFileExtension}}';
+{{/imports}}
+
+{{#operations}}
+
+{{#operation}}
+/**
+  * @public
+  */
+export type {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}} = {
+    {{#hasPathParams}}
+    path: {
+        {{#pathParams}}
+            {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/pathParams}}
+    },
+    {{/hasPathParams}}
+    {{#hasBodyParam}}
+        {{#bodyParam}}
+        body: {{{dataType}}},
+        {{/bodyParam}}
+    {{/hasBodyParam}}
+    {{#hasQueryParams}}
+    query: {
+        {{#queryParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/queryParams}}
+    },
+    {{/hasQueryParams}}
+    {{#hasHeaderParams}}
+    header: {
+        {{#headerParams}}
+        {{paramName}}{{^required}}?{{/required}}: {{{dataType}}},
+        {{/headerParams}}
+    },
+    {{/hasHeaderParams}}
+    response: {{#responses}} {{{dataType}}}{{^dataType}}void{{/dataType}} {{^-last}} | {{/-last}} {{/responses}}
+}
+{{/operation}}
+{{/operations}}
+{{/apis}}
+
+export type EndpointMap = {
+    {{#apis}}
+    {{#operations}}
+    {{#operation}}
+    
+    '#{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}|{{path}}': {{#lambda.pascalcase}}{{nickname}}{{/lambda.pascalcase}},
+    
+    {{/operation}}
+    {{/operations}}
+    {{/apis}}
+}
+
+{{/apiInfo}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache b/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache
new file mode 100644
index 0000000000..fb39a63a46
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/apis/index.mustache
@@ -0,0 +1,4 @@
+//
+{{>licenseInfo}}
+
+export * from './Api.server'
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/index.mustache b/packages/repo-tools/templates/typescript-backstage-server/index.mustache
new file mode 100644
index 0000000000..3e7a88faa4
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/index.mustache
@@ -0,0 +1,4 @@
+// 
+
+export * from './apis';
+export * from './router';
diff --git a/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache b/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache
new file mode 100644
index 0000000000..7a1b10e780
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/licenseInfo.mustache
@@ -0,0 +1,5 @@
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/model.mustache b/packages/repo-tools/templates/typescript-backstage-server/model.mustache
new file mode 100644
index 0000000000..565eecb4e8
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/model.mustache
@@ -0,0 +1,11 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/model.mustache#L17. }}
+{{>licenseInfo}}
+{{#models}}
+{{#model}}
+{{#tsImports}}
+import { {{classname}} } from '{{filename}}.model';
+{{/tsImports}}
+
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache
new file mode 100644
index 0000000000..8358be805f
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelAlias.mustache
@@ -0,0 +1,6 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelAlias.mustache }}
+
+/**
+  * @public
+  */
+export type {{classname}} = {{dataType}};
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache
new file mode 100644
index 0000000000..3a1b5ce86d
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelEnum.mustache
@@ -0,0 +1,31 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelEnum.mustache }}
+
+{{#stringEnums}}
+/**
+  * @public
+  */
+export enum {{classname}} {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+}
+{{/stringEnums}}
+{{^stringEnums}}
+/**
+  * @public
+  */
+export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+/**
+  * @public
+  */
+export const {{classname}} = {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+};
+{{/stringEnums}}
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache
new file mode 100644
index 0000000000..d01ea29260
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGeneric.mustache
@@ -0,0 +1,45 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache }}
+
+{{#models}}
+{{#model}}
+
+/**
+{{#description}}
+* {{{.}}}
+{{/description}}
+* @public
+*/
+{{^isEnum}}
+export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}} {{classname}} {{#isNullable}}={{/isNullable}} {
+{{>modelGenericAdditionalProperties}}
+{{#vars}}
+{{#description}}
+    /**
+    * {{{.}}}
+    */
+{{/description}}
+    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
+{{/vars}}
+}{{#isNullable}} | null{{/isNullable}}
+
+{{#hasEnums}}
+
+{{#vars}}
+{{#isEnum}}
+/**
+  * @public
+  */
+export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
+{{/vars}}
+
+{{/hasEnums}}
+{{/isEnum}}
+{{#isEnum}}
+/**
+  * @public
+  */
+export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache
new file mode 100644
index 0000000000..e1e94cea80
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGenericAdditionalProperties.mustache
@@ -0,0 +1,5 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGenericAdditionalProperties.mustache }}
+
+{{#additionalPropertiesType}}
+  [key: string]: {{{additionalPropertiesType}}};
+{{/additionalPropertiesType}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache
new file mode 100644
index 0000000000..acfcc23959
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelGenericEnums.mustache
@@ -0,0 +1,45 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGenericEnums.mustache }}
+
+{{#hasEnums}}
+
+{{^stringEnums}}
+/**
+  * @public
+  */
+export namespace {{classname}} {
+{{/stringEnums}}
+{{#vars}}
+    {{#isEnum}}
+{{#stringEnums}}
+/**
+  * @public
+  */
+export enum {{classname}}{{enumName}} {
+{{#allowableValues}}
+{{#enumVars}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
+{{/enumVars}}
+{{/allowableValues}}
+};
+{{/stringEnums}}
+{{^stringEnums}}
+    /**
+    * @public
+    */
+    export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
+
+    /**
+    * @public
+    */
+    export const {{enumName}} = {
+    {{#allowableValues}}
+    {{#enumVars}}
+        {{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
+    };
+{{/stringEnums}}
+    {{/isEnum}}
+{{/vars}}
+{{^stringEnums}}}{{/stringEnums}}
+{{/hasEnums}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache
new file mode 100644
index 0000000000..038025b651
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelOneOf.mustache
@@ -0,0 +1,17 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelOneOf.mustache }}
+
+{{#hasImports}}
+import {
+    {{#imports}}
+    {{{.}}},
+    {{/imports}}
+} from './';
+
+{{/hasImports}}
+    /**
+{{#description}}
+    * {{{.}}}
+{{/description}}
+    * @public
+    */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};
diff --git a/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache b/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache
new file mode 100644
index 0000000000..a3f5e00904
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/modelTaggedUnion.mustache
@@ -0,0 +1,23 @@
+{{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache }}
+
+{{#discriminator}}
+export type {{classname}} = {{#children}}{{^-first}} | {{/-first}}{{classname}}{{/children}};
+{{/discriminator}}
+{{^discriminator}}
+{{#parent}}
+export interface {{classname}} { {{>modelGenericAdditionalProperties}}
+{{#allVars}}
+    {{#description}}
+    /**
+    * {{{.}}}
+    */
+    {{/description}}
+    {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
+{{/allVars}}
+}
+{{>modelGenericEnums}}
+{{/parent}}
+{{^parent}}
+{{>modelGeneric}}
+{{/parent}}
+{{/discriminator}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache b/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache
new file mode 100644
index 0000000000..d076cfb3ff
--- /dev/null
+++ b/packages/repo-tools/templates/typescript-backstage-server/models/models_all.mustache
@@ -0,0 +1,7 @@
+//
+
+{{#models}}
+{{#model}}
+export * from '{{{ importPath }}}.model{{importFileExtension}}'
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage/apis/index.mustache b/packages/repo-tools/templates/typescript-backstage/apis/index.mustache
deleted file mode 100644
index 4c8996c5ee..0000000000
--- a/packages/repo-tools/templates/typescript-backstage/apis/index.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-
-export * from './DefaultApi.client';
diff --git a/packages/scaffolder-internal/CHANGELOG.md b/packages/scaffolder-internal/CHANGELOG.md
index f15ec07190..8a2df052a6 100644
--- a/packages/scaffolder-internal/CHANGELOG.md
+++ b/packages/scaffolder-internal/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @internal/scaffolder
 
+## 0.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## 0.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## 0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.0
+
+## 0.0.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+
+## 0.0.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+
+## 0.0.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+
+## 0.0.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/packages/scaffolder-internal/package.json b/packages/scaffolder-internal/package.json
index 0d4f180caf..cf458bd536 100644
--- a/packages/scaffolder-internal/package.json
+++ b/packages/scaffolder-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/scaffolder",
-  "version": "0.0.2",
+  "version": "0.0.4-next.2",
   "backstage": {
     "role": "web-library",
     "inline": true
@@ -23,6 +23,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
+    "@backstage/frontend-plugin-api": "workspace:^",
     "@backstage/plugin-scaffolder-react": "workspace:^",
     "zod": "^3.22.4"
   },
diff --git a/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts b/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts
new file mode 100644
index 0000000000..7942544acb
--- /dev/null
+++ b/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { OpaqueType } from '@internal/opaque';
+import { z } from 'zod';
+
+import {
+  ScaffolderFormDecorator,
+  ScaffolderFormDecoratorContext,
+} from '@backstage/plugin-scaffolder-react/alpha';
+import { AnyApiRef } from '@backstage/frontend-plugin-api';
+
+/** @alpha */
+export const OpaqueFormDecorator = OpaqueType.create<{
+  public: ScaffolderFormDecorator;
+  versions: {
+    readonly version: 'v1';
+    readonly id: string;
+    readonly schema?: {
+      input?: {
+        [key in string]: (zImpl: typeof z) => z.ZodType;
+      };
+    };
+    readonly deps?: { [key in string]: AnyApiRef };
+    readonly decorator: (
+      ctx: ScaffolderFormDecoratorContext,
+      deps: { [depName in string]: AnyApiRef['T'] },
+    ) => Promise<void>;
+  };
+}>({ type: '@backstage/scaffolder/FormDecorator', versions: ['v1'] });
diff --git a/packages/scaffolder-internal/src/wiring/index.ts b/packages/scaffolder-internal/src/wiring/index.ts
index c85755bccf..37c8bd09cb 100644
--- a/packages/scaffolder-internal/src/wiring/index.ts
+++ b/packages/scaffolder-internal/src/wiring/index.ts
@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export { OpaqueFormField, type FormField } from './InternalFormField';
+export { OpaqueFormDecorator } from './InternalFormDecorator';
diff --git a/packages/techdocs-cli-embedded-app/.eslintrc.js b/packages/techdocs-cli-embedded-app/.eslintrc.js
index e2a53a6ad2..e487f765b2 100644
--- a/packages/techdocs-cli-embedded-app/.eslintrc.js
+++ b/packages/techdocs-cli-embedded-app/.eslintrc.js
@@ -1 +1,5 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: {
+    '@backstage/no-top-level-material-ui-4-imports': 'error',
+  },
+});
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index bccc8e0a04..bee2276582 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,157 @@
 # techdocs-cli-embedded-app
 
+## 0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/cli@0.29.3-next.2
+  - @backstage/app-defaults@1.5.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 0.2.103-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/app-defaults@1.5.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 0.2.103-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.3-next.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/app-defaults@1.5.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## 0.2.102
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/app-defaults@1.5.13
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/test-utils@1.7.1
+
+## 0.2.102-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/cli@0.29.0-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/app-defaults@1.5.13-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 0.2.102-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.2
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 0.2.102-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/app-defaults@1.5.13-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 0.2.102-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.29.0-next.0
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/app-defaults@1.5.13-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+
 ## 0.2.101
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index 0afee67f6a..5d3add528a 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "techdocs-cli-embedded-app",
-  "version": "0.2.101",
+  "version": "0.2.103-next.2",
   "backstage": {
     "role": "frontend"
   },
@@ -30,7 +30,7 @@
       "last 1 safari version"
     ]
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "dependencies": {
     "@backstage/app-defaults": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx b/packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx
index c7b1c846c4..da6911bb17 100644
--- a/packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx
+++ b/packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx b/packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx
index 073cf6edad..ff4b5132b0 100644
--- a/packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx
+++ b/packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles({
   svg: {
diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx b/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx
index 81e3d12d9d..b2fac4081f 100644
--- a/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx
+++ b/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx
@@ -16,7 +16,7 @@
 
 import React, { PropsWithChildren } from 'react';
 
-import { makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
 import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
diff --git a/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx b/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
index cc20081198..5dc635e023 100644
--- a/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
+++ b/packages/techdocs-cli-embedded-app/src/components/TechDocsPage/TechDocsPage.tsx
@@ -16,9 +16,12 @@
 
 import React, { useState } from 'react';
 
-import { Theme, makeStyles } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
+import { Theme } from '@material-ui/core/styles/createTheme';
 
-import { Box, Tooltip, IconButton } from '@material-ui/core';
+import Box from '@material-ui/core/Box';
+import Tooltip from '@material-ui/core/Tooltip';
+import IconButton from '@material-ui/core/IconButton';
 import LightIcon from '@material-ui/icons/Brightness7';
 import DarkIcon from '@material-ui/icons/Brightness4';
 
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index 5ec0d0de86..95b03dab88 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,95 @@
 # @techdocs/cli
 
+## 1.8.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+
+## 1.8.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## 1.8.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+
+## 1.8.22
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/cli-common@0.1.15
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## 1.8.22-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## 1.8.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## 1.8.22-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## 1.8.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
 ## 1.8.20
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 186c42d2c2..da16a96f22 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@techdocs/cli",
-  "version": "1.8.20",
+  "version": "1.8.24-next.2",
   "description": "Utility CLI for managing TechDocs sites in Backstage.",
   "backstage": {
     "role": "cli"
@@ -62,7 +62,7 @@
     "@types/commander": "^2.12.2",
     "@types/fs-extra": "^11.0.0",
     "@types/http-proxy": "^1.17.4",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.16.0",
     "@types/serve-handler": "^6.1.0",
     "@types/webpack-env": "^1.15.3",
     "find-process": "^1.4.5",
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index 64816e59a6..acce745e15 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,57 @@
 # @backstage/test-utils
 
+## 1.7.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 1.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.7.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 1.7.0
 
 ### Minor Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 4a478aada8..dc3a688026 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/test-utils",
-  "version": "1.7.0",
+  "version": "1.7.3-next.1",
   "description": "Utilities to test Backstage plugins and apps.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/theme/.eslintrc.js b/packages/theme/.eslintrc.js
index e2a53a6ad2..e487f765b2 100644
--- a/packages/theme/.eslintrc.js
+++ b/packages/theme/.eslintrc.js
@@ -1 +1,5 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
+  rules: {
+    '@backstage/no-top-level-material-ui-4-imports': 'error',
+  },
+});
diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md
index fcdb81d7df..bf58f00548 100644
--- a/packages/theme/CHANGELOG.md
+++ b/packages/theme/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/theme
 
+## 0.6.3-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+
+## 0.6.1
+
+### Patch Changes
+
+- ea75c37: Internal refactor to avoid top-level imports from MUI.
+
+## 0.6.1-next.0
+
+### Patch Changes
+
+- ea75c37: Internal refactor to avoid top-level imports from MUI.
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/theme/package.json b/packages/theme/package.json
index d5859b64b7..f30561bf91 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/theme",
-  "version": "0.6.0",
+  "version": "0.6.3-next.0",
   "description": "material-ui theme for use with Backstage.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/theme/report.api.md b/packages/theme/report.api.md
index 4462bb4de7..ebdae12a05 100644
--- a/packages/theme/report.api.md
+++ b/packages/theme/report.api.md
@@ -12,9 +12,10 @@ import { ReactNode } from 'react';
 import { Theme } from '@mui/material/styles';
 import { Theme as Theme_2 } from '@material-ui/core/styles';
 import { Theme as Theme_3 } from '@material-ui/core';
+import type { Theme as Theme_4 } from '@material-ui/core/styles/createTheme';
 import { ThemeOptions } from '@mui/material/styles';
 import { ThemeOptions as ThemeOptions_2 } from '@material-ui/core/styles';
-import type { ThemeOptions as ThemeOptions_3 } from '@material-ui/core';
+import type { ThemeOptions as ThemeOptions_3 } from '@material-ui/core/styles/createTheme';
 import { UnifiedTheme as UnifiedTheme_2 } from '@backstage/theme';
 
 // @public @deprecated
@@ -91,7 +92,7 @@ export type BackstagePaletteOptions = PaletteOptions &
   BackstagePaletteAdditions;
 
 // @public @deprecated
-export interface BackstageTheme extends Theme_3 {
+export interface BackstageTheme extends Theme_4 {
   // (undocumented)
   getPageTheme: (selector: PageThemeSelector) => PageTheme;
   // (undocumented)
@@ -188,13 +189,13 @@ export function createBaseThemeOptions<PaletteOptions>(
 };
 
 // @public @deprecated
-export function createTheme(options: SimpleThemeOptions): Theme_3;
+export function createTheme(options: SimpleThemeOptions): Theme_4;
 
 // @public @deprecated
 export function createThemeOptions(options: SimpleThemeOptions): ThemeOptions_3;
 
 // @public @deprecated
-export function createThemeOverrides(theme: Theme_3): Overrides;
+export function createThemeOverrides(theme: Theme_4): Overrides;
 
 // @public
 export function createUnifiedTheme(options: UnifiedThemeOptions): UnifiedTheme;
diff --git a/packages/theme/src/unified/UnifiedThemeProvider.tsx b/packages/theme/src/unified/UnifiedThemeProvider.tsx
index 465a4dda24..e44e5502f3 100644
--- a/packages/theme/src/unified/UnifiedThemeProvider.tsx
+++ b/packages/theme/src/unified/UnifiedThemeProvider.tsx
@@ -15,7 +15,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { CssBaseline } from '@material-ui/core';
+import CssBaseline from '@material-ui/core/CssBaseline';
 import {
   ThemeProvider,
   StylesProvider,
diff --git a/packages/theme/src/v4/baseTheme.ts b/packages/theme/src/v4/baseTheme.ts
index ef63e2a5fa..9f994c6b94 100644
--- a/packages/theme/src/v4/baseTheme.ts
+++ b/packages/theme/src/v4/baseTheme.ts
@@ -16,12 +16,10 @@
 
 import { Theme as Mui5Theme } from '@mui/material/styles';
 import { createTheme as createMuiTheme } from '@material-ui/core/styles';
-import type {
-  GridProps,
-  SwitchProps,
-  Theme,
-  ThemeOptions,
-} from '@material-ui/core';
+import type { Theme, ThemeOptions } from '@material-ui/core/styles/createTheme';
+import type { GridProps } from '@material-ui/core/Grid';
+import type { SwitchProps } from '@material-ui/core/Switch';
+
 import { Overrides } from '@material-ui/core/styles/overrides';
 import { SimpleThemeOptions } from './types';
 import { createBaseThemeOptions } from '../base';
diff --git a/packages/theme/src/v4/types.ts b/packages/theme/src/v4/types.ts
index c5100dab8f..16b18e14bc 100644
--- a/packages/theme/src/v4/types.ts
+++ b/packages/theme/src/v4/types.ts
@@ -17,7 +17,7 @@
 import type {
   Theme as MuiTheme,
   ThemeOptions as MuiThemeOptions,
-} from '@material-ui/core';
+} from '@material-ui/core/styles/createTheme';
 import type {
   PaletteOptions as MuiPaletteOptions,
   Palette as MuiPalette,
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index c8b9243adb..c7980abd94 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/types
 
+## 1.2.0
+
+### Minor Changes
+
+- c5e39e7: Introduce `createDeferred` and `DeferredPromise`.
+
 ## 1.1.1
 
 ### Patch Changes
diff --git a/packages/types/package.json b/packages/types/package.json
index 2402dc84fa..efbc62a9a2 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/types",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Common TypeScript types used within Backstage",
   "backstage": {
     "role": "common-library"
diff --git a/packages/types/report.api.md b/packages/types/report.api.md
index 9f33bef012..8169a506ef 100644
--- a/packages/types/report.api.md
+++ b/packages/types/report.api.md
@@ -3,6 +3,21 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+// @public
+export function createDeferred<
+  TResolved = void,
+  TRejected = Error,
+>(): DeferredPromise<TResolved, TRejected>;
+
+// @public
+export type DeferredPromise<
+  TResolved = void,
+  TRejected = Error,
+> = Promise<TResolved> & {
+  resolve(value: TResolved | PromiseLike<TResolved>): void;
+  reject(reason?: TRejected): void;
+};
+
 // @public
 export function durationToMilliseconds(duration: HumanDuration): number;
 
diff --git a/packages/types/src/deferred.test.ts b/packages/types/src/deferred.test.ts
new file mode 100644
index 0000000000..5180711024
--- /dev/null
+++ b/packages/types/src/deferred.test.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createDeferred } from './deferred';
+
+describe('createDeferred', () => {
+  it('can both resolve and reject', async () => {
+    const d1 = createDeferred<number>();
+    const d2 = createDeferred<string>();
+    const d3 = createDeferred<object>();
+    const d4 = createDeferred(); // test the implicit void
+
+    const d1resolved = jest.fn<void, [number]>();
+    const d1rejected = jest.fn();
+    d1.then(d1resolved, d1rejected);
+
+    const d2resolved = jest.fn<void, [string]>();
+    const d2rejected = jest.fn();
+    d2.then(d2resolved, d2rejected);
+
+    const d3resolved = jest.fn<void, [number]>();
+    const d3rejected = jest.fn();
+    // @ts-expect-error wrong argument type for resolved
+    d3.then(d3resolved, d3rejected);
+
+    const d4resolved = jest.fn<void, [number]>();
+    const d4rejected = jest.fn();
+    // @ts-expect-error resolver should not take arguments for void deferred
+    d4.then(d4resolved, d4rejected);
+
+    d1.resolve(1);
+    d1.resolve(2); // should have no effect
+
+    // @ts-expect-error wrong argument type for resolve
+    d2.resolve(1);
+    d2.reject(new Error('boom')); // should have no effect
+
+    d3.reject(new Error('boom'));
+
+    // @ts-expect-error void deferred does not take arguments
+    d4.resolve(1);
+
+    await 'a tick';
+
+    expect(d1resolved).toHaveBeenCalledTimes(1);
+    expect(d1resolved).toHaveBeenCalledWith(1);
+    expect(d1rejected).not.toHaveBeenCalled();
+
+    expect(d1resolved).toHaveBeenCalledTimes(1);
+    expect(d2resolved).toHaveBeenCalledWith(1);
+    expect(d1rejected).not.toHaveBeenCalled();
+
+    expect(d3resolved).not.toHaveBeenCalled();
+    expect(d3rejected).toHaveBeenCalledTimes(1);
+    expect(d3rejected).toHaveBeenCalledWith(
+      expect.objectContaining({ message: 'boom' }),
+    );
+
+    expect(`${d1}`).toBe('[object DeferredPromise]');
+  });
+});
diff --git a/packages/types/src/deferred.ts b/packages/types/src/deferred.ts
new file mode 100644
index 0000000000..de17e509a1
--- /dev/null
+++ b/packages/types/src/deferred.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A deferred promise that can be resolved or rejected later.
+ *
+ * @public
+ */
+export type DeferredPromise<
+  TResolved = void,
+  TRejected = Error,
+> = Promise<TResolved> & {
+  resolve(value: TResolved | PromiseLike<TResolved>): void;
+  reject(reason?: TRejected): void;
+};
+
+class Deferred<TResolved, TRejected>
+  implements DeferredPromise<TResolved, TRejected>
+{
+  #resolve?: (value: TResolved | PromiseLike<TResolved>) => void;
+  #reject?: (reason?: TRejected) => void;
+
+  public get resolve() {
+    return this.#resolve!;
+  }
+  public get reject() {
+    return this.#reject!;
+  }
+
+  public then: Promise<TResolved>['then'];
+  public catch: Promise<TResolved>['catch'];
+  public finally: Promise<TResolved>['finally'];
+
+  public constructor() {
+    const promise = new Promise<TResolved>((resolve, reject) => {
+      this.#resolve = resolve;
+      this.#reject = reject;
+    });
+
+    this.then = promise.then.bind(promise);
+    this.catch = promise.catch.bind(promise);
+    this.finally = promise.finally.bind(promise);
+  }
+
+  [Symbol.toStringTag]: 'DeferredPromise' = 'DeferredPromise';
+}
+
+/**
+ * Creates a deferred promise that can be resolved or rejected later.
+ *
+ * @public
+ */
+export function createDeferred<
+  TResolved = void,
+  TRejected = Error,
+>(): DeferredPromise<TResolved, TRejected> {
+  return new Deferred();
+}
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 29ba114037..480c85818a 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { createDeferred, type DeferredPromise } from './deferred';
 export type { JsonArray, JsonObject, JsonPrimitive, JsonValue } from './json';
 export type { Observable, Observer, Subscription } from './observable';
 export { type HumanDuration, durationToMilliseconds } from './time';
diff --git a/packages/yarn-plugin/CHANGELOG.md b/packages/yarn-plugin/CHANGELOG.md
index d32b0d3f4e..24f0a41354 100644
--- a/packages/yarn-plugin/CHANGELOG.md
+++ b/packages/yarn-plugin/CHANGELOG.md
@@ -1,9 +1,52 @@
 # yarn-plugin-backstage
 
+## 0.0.4-next.1
+
+### Patch Changes
+
+- 48cc7c5: Use yarn's built-in http utilities for fetching release manifests
+- Updated dependencies
+  - @backstage/release-manifests@0.0.12-next.1
+  - @backstage/cli-common@0.1.15
+
+## 0.0.4-next.0
+
+### Patch Changes
+
+- 27600c2: Verify type of `beforeWorkspacePacking` hook signature
+- d8bd6f5: Cherry-pick lodash method to reduce bundle size
+- 344c591: Use native `Array.some` instead of lodash to reduce bundle size
+- 9296a33: Remove dependency on `chalk` to reduce bundle size
+- 9017481: Move Backstage version to parameter in bound descriptor for better
+  compatibility with third-party lockfile parsing tools
+- Updated dependencies
+  - @backstage/release-manifests@0.0.12-next.0
+  - @backstage/cli-common@0.1.15
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15
+  - @backstage/release-manifests@0.0.11
+
+## 0.0.3-next.0
+
+### Patch Changes
+
+- aba538d: Do not throw when descriptors are already bound in bindDescriptor
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/release-manifests@0.0.11
+
 ## 0.0.2
 
 ### Patch Changes
 
+- a8bd401: Validate version of yarn in plugin to ensure compatibility
+- b207f69: Memoize fetching of release manifest
+- 9e29186: Ensure plugin works correctly when running yarn dedupe
 - bd32d5a: Add additional check before packing workspace to verify that all backstage:^ versions have been removed.
 - Updated dependencies
   - @backstage/cli-common@0.1.14
@@ -21,6 +64,7 @@
 
 ### Patch Changes
 
+- Initial release
 - Updated dependencies
   - @backstage/cli-common@0.1.14-next.0
   - @backstage/release-manifests@0.0.11
diff --git a/packages/yarn-plugin/package.json b/packages/yarn-plugin/package.json
index be24774dee..bca6fed42f 100644
--- a/packages/yarn-plugin/package.json
+++ b/packages/yarn-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yarn-plugin-backstage",
-  "version": "0.0.2",
+  "version": "0.0.4-next.1",
   "description": "Yarn plugin for working with Backstage monorepos",
   "backstage": {
     "role": "node-library"
@@ -34,8 +34,7 @@
     "@backstage/release-manifests": "workspace:^",
     "@yarnpkg/core": "^4.0.3",
     "@yarnpkg/fslib": "^3.0.2",
-    "chalk": "^4.0.0",
-    "lodash": "^4.17.21",
+    "@yarnpkg/plugin-pack": "^4.0.0",
     "semver": "^7.6.0"
   },
   "devDependencies": {
diff --git a/packages/yarn-plugin/report.api.md b/packages/yarn-plugin/report.api.md
index f0300ec9a1..928703ed3e 100644
--- a/packages/yarn-plugin/report.api.md
+++ b/packages/yarn-plugin/report.api.md
@@ -3,9 +3,10 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { Hooks } from '@yarnpkg/plugin-pack';
 import { Plugin as Plugin_2 } from '@yarnpkg/core';
 
 // @public (undocumented)
-const plugin: Plugin_2;
+const plugin: Plugin_2<Hooks>;
 export default plugin;
 ```
diff --git a/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.test.ts b/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.test.ts
index d156182923..ee4af2c4f6 100644
--- a/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.test.ts
+++ b/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.test.ts
@@ -14,35 +14,24 @@
  * limitations under the License.
  */
 
-import { Manifest, Workspace } from '@yarnpkg/core';
+import {
+  Configuration,
+  Manifest,
+  Project,
+  Workspace,
+  httpUtils,
+} from '@yarnpkg/core';
 import { npath, ppath } from '@yarnpkg/fslib';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 
 import { beforeWorkspacePacking } from './beforeWorkspacePacking';
 
-jest.mock('@backstage/release-manifests', () => ({
-  getManifestByVersion: jest.fn().mockResolvedValue({
-    releaseVersion: '1.23.45',
-    packages: [
-      {
-        name: '@backstage/core',
-        version: '3.2.1',
-      },
-      {
-        name: '@backstage/plugin-1',
-        version: '6.5.4',
-      },
-      {
-        name: '@backstage/plugin-2',
-        version: '9.8.7',
-      },
-    ],
-  }),
-}));
-
 const makeWorkspace = (manifest: object) => {
   return {
     manifest: Manifest.fromText(JSON.stringify(manifest)),
+    project: new Project(ppath.cwd(), {
+      configuration: Configuration.create(ppath.cwd()),
+    }),
   } as Workspace;
 };
 
@@ -58,6 +47,24 @@ describe('beforeWorkspacePacking', () => {
       .spyOn(process, 'cwd')
       .mockReturnValue(npath.toPortablePath(mockDir.path));
 
+    jest.spyOn(httpUtils, 'get').mockResolvedValue({
+      releaseVersion: '1.23.45',
+      packages: [
+        {
+          name: '@backstage/core',
+          version: '3.2.1',
+        },
+        {
+          name: '@backstage/plugin-1',
+          version: '6.5.4',
+        },
+        {
+          name: '@backstage/plugin-2',
+          version: '9.8.7',
+        },
+      ],
+    });
+
     mockDir.setContent({
       'backstage.json': JSON.stringify({
         version: '1.23.45',
diff --git a/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.ts b/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.ts
index 41014a55a6..e5823607e3 100644
--- a/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.ts
+++ b/packages/yarn-plugin/src/handlers/beforeWorkspacePacking.ts
@@ -15,8 +15,11 @@
  */
 
 import { Descriptor, Workspace, structUtils } from '@yarnpkg/core';
-import { some } from 'lodash';
-import { getCurrentBackstageVersion, getPackageVersion } from '../util';
+import {
+  bindBackstageVersion,
+  getCurrentBackstageVersion,
+  getPackageVersion,
+} from '../util';
 import { PROTOCOL } from '../constants';
 
 const hasBackstageVersion = (range: string) =>
@@ -66,18 +69,18 @@ export const beforeWorkspacePacking = async (
       );
 
       rawManifest[finalDependencyType][ident] = `^${await getPackageVersion(
-        structUtils.makeDescriptor(
-          descriptor,
-          `${PROTOCOL}${backstageVersion}`,
-        ),
+        bindBackstageVersion(descriptor, backstageVersion),
+        workspace.project.configuration,
       )}`;
     }
   }
 
   if (
-    some(
-      ['dependencies', 'devDependencies', 'optionalDependencies'],
-      dependencyType => some(rawManifest[dependencyType], hasBackstageVersion),
+    ['dependencies', 'devDependencies', 'optionalDependencies'].some(
+      dependencyType =>
+        Object.values<string>(rawManifest[dependencyType] ?? {}).some(
+          hasBackstageVersion,
+        ),
     )
   ) {
     throw new Error(
diff --git a/packages/yarn-plugin/src/index.ts b/packages/yarn-plugin/src/index.ts
index f548463829..9c20e9a45c 100644
--- a/packages/yarn-plugin/src/index.ts
+++ b/packages/yarn-plugin/src/index.ts
@@ -22,16 +22,21 @@
  */
 
 import { Plugin, semverUtils, YarnVersion } from '@yarnpkg/core';
-import chalk from 'chalk';
+import { Hooks } from '@yarnpkg/plugin-pack';
 import { beforeWorkspacePacking } from './handlers/beforeWorkspacePacking';
 import { BackstageResolver } from './resolver/BackstageResolver';
 
+// All dependencies of the yarn plugin are bundled during the build. Chalk
+// triples the size of the plugin bundle when included, so we avoid the
+// dependency by hard-coding the ANSI escape codes for the one bit of formatting
+// we need.
+const RED_BOLD = `\u001B[31;1m`;
+const RESET = '\u001B[0m';
+
 if (!semverUtils.satisfiesWithPrereleases(YarnVersion, '^4.1.1')) {
   console.error();
   console.error(
-    `${chalk.bold.red(
-      'Unsupported yarn version.',
-    )}: The Backstage yarn plugin only works with yarn ^4.1.1. Please upgrade yarn, or remove this plugin with "yarn plugin remove @yarnpkg/plugin-backstage".`,
+    `${RED_BOLD}Unsupported yarn version${RESET}: The Backstage yarn plugin only works with yarn ^4.1.1. Please upgrade yarn, or remove this plugin with "yarn plugin remove @yarnpkg/plugin-backstage".`,
   );
   console.error();
 }
@@ -39,7 +44,7 @@ if (!semverUtils.satisfiesWithPrereleases(YarnVersion, '^4.1.1')) {
 /**
  * @public
  */
-const plugin: Plugin = {
+const plugin: Plugin<Hooks> = {
   hooks: {
     beforeWorkspacePacking,
   },
diff --git a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
index d7d9126923..8cba189cb8 100644
--- a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
+++ b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
@@ -14,31 +14,22 @@
  * limitations under the License.
  */
 
-import { structUtils } from '@yarnpkg/core';
+import {
+  Configuration,
+  Project,
+  ResolveOptions,
+  structUtils,
+  ThrowReport,
+  httpUtils,
+} from '@yarnpkg/core';
 import { npath, ppath } from '@yarnpkg/fslib';
-import { getManifestByVersion } from '@backstage/release-manifests';
 import { BackstageResolver } from './BackstageResolver';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 
-jest.mock('@backstage/release-manifests', () => ({
-  getManifestByVersion: jest.fn().mockResolvedValue({
-    releaseVersion: '1.23.45',
-    packages: [
-      {
-        name: '@backstage/core',
-        version: '6.7.8',
-      },
-    ],
-  }),
-}));
-
-const getManifestByVersionMock = getManifestByVersion as jest.MockedFunction<
-  typeof getManifestByVersion
->;
-
 describe('BackstageResolver', () => {
   const mockDir = createMockDirectory();
   let backstageResolver: BackstageResolver;
+  let resolveOptions: ResolveOptions;
 
   beforeEach(() => {
     jest
@@ -49,6 +40,16 @@ describe('BackstageResolver', () => {
       .spyOn(process, 'cwd')
       .mockReturnValue(npath.toPortablePath(mockDir.path));
 
+    jest.spyOn(httpUtils, 'get').mockResolvedValue({
+      releaseVersion: '1.23.45',
+      packages: [
+        {
+          name: '@backstage/core',
+          version: '6.7.8',
+        },
+      ],
+    });
+
     mockDir.setContent({
       'backstage.json': JSON.stringify({
         version: '1.23.45',
@@ -71,6 +72,14 @@ describe('BackstageResolver', () => {
     });
 
     backstageResolver = new BackstageResolver();
+
+    resolveOptions = {
+      resolver: backstageResolver,
+      project: new Project(ppath.cwd(), {
+        configuration: Configuration.create(ppath.cwd()),
+      }),
+      report: new ThrowReport(),
+    };
   });
 
   afterEach(() => {
@@ -96,7 +105,7 @@ describe('BackstageResolver', () => {
 
   describe('bindDescriptor', () => {
     describe('with range "backstage:^"', () => {
-      it('returns a descriptor basedwith a version range for the current Backstage version', () => {
+      it('returns a descriptor with a version range for the current Backstage version', () => {
         expect(
           backstageResolver.bindDescriptor(
             structUtils.makeDescriptor(
@@ -107,25 +116,25 @@ describe('BackstageResolver', () => {
         ).toEqual(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
-            'backstage:1.23.45',
+            'backstage:^::v=1.23.45',
           ),
         );
       });
     });
 
-    describe('with range "backstage:1.23.45"', () => {
+    describe('with range "backstage:^::v=1.23.45"', () => {
       it('returns the correct descriptor', () => {
         expect(
           backstageResolver.bindDescriptor(
             structUtils.makeDescriptor(
               structUtils.makeIdent('backstage', 'core'),
-              'backstage:1.23.45',
+              'backstage:^::v=1.23.45',
             ),
           ),
         ).toEqual(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
-            'backstage:1.23.45',
+            'backstage:^::v=1.23.45',
           ),
         );
       });
@@ -136,11 +145,11 @@ describe('BackstageResolver', () => {
     it('returns an npm: descriptor based on the manifest for the appropriate backstage version', async () => {
       const descriptor = structUtils.makeDescriptor(
         structUtils.makeIdent('backstage', 'core'),
-        'backstage:1.23.45',
+        'backstage:^::v=1.23.45',
       );
 
       await expect(
-        backstageResolver.getCandidates(descriptor),
+        backstageResolver.getCandidates(descriptor, {}, resolveOptions),
       ).resolves.toEqual([structUtils.makeLocator(descriptor, 'npm:6.7.8')]);
     });
 
@@ -151,66 +160,57 @@ describe('BackstageResolver', () => {
             structUtils.makeIdent('backstage', 'core'),
             'npm:1.2.3',
           ),
+          {},
+          resolveOptions,
         ),
       ).rejects.toThrow(/unsupported version protocol/i);
     });
 
-    it('rejects backstage: ranges with a ^ shorthand version', async () => {
+    it('rejects backstage: ranges missing a version parameter', async () => {
       await expect(
         backstageResolver.getCandidates(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
             'backstage:^',
           ),
+          {},
+          resolveOptions,
         ),
-      ).rejects.toThrow(/invalid backstage version/i);
+      ).rejects.toThrow(/missing Backstage version/i);
     });
 
-    it('rejects backstage: ranges with a * shorthand version', async () => {
+    it('rejects backstage: ranges with multiple version parameters', async () => {
       await expect(
         backstageResolver.getCandidates(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
-            'backstage:*',
+            'backstage:^::v=1&v=2',
           ),
+          {},
+          resolveOptions,
         ),
-      ).rejects.toThrow(/invalid backstage version/i);
+      ).rejects.toThrow(/multiple Backstage versions/i);
     });
 
-    it('rejects backstage: ranges with an invalid version specified', async () => {
-      await expect(
-        backstageResolver.getCandidates(
-          structUtils.makeDescriptor(
-            structUtils.makeIdent('backstage', 'core'),
-            'backstage:latest',
+    it.each`
+      selector
+      ${'*'}
+      ${'latest'}
+    `(
+      'rejects backstage: ranges with invalid selector "$selector"',
+      async ({ selector }) => {
+        await expect(
+          backstageResolver.getCandidates(
+            structUtils.makeDescriptor(
+              structUtils.makeIdent('backstage', 'core'),
+              `backstage:${selector}`,
+            ),
+            {},
+            resolveOptions,
           ),
-        ),
-      ).rejects.toThrow(/invalid backstage version/i);
-    });
-
-    it('memoizes manifest retrieval', async () => {
-      const descriptor1 = structUtils.makeDescriptor(
-        structUtils.makeIdent('backstage', 'core'),
-        'backstage:1.23.45',
-      );
-
-      for (let i = 0; i < 5; i++) {
-        await backstageResolver.getCandidates(descriptor1);
-      }
-
-      expect(getManifestByVersionMock).toHaveBeenCalledTimes(1);
-
-      const descriptor2 = structUtils.makeDescriptor(
-        structUtils.makeIdent('backstage', 'core'),
-        'backstage:6.78.90',
-      );
-
-      for (let i = 0; i < 5; i++) {
-        await backstageResolver.getCandidates(descriptor2);
-      }
-
-      expect(getManifestByVersionMock).toHaveBeenCalledTimes(2);
-    });
+        ).rejects.toThrow(/unexpected version selector/i);
+      },
+    );
   });
 
   describe('getSatisfying', () => {
@@ -219,7 +219,7 @@ describe('BackstageResolver', () => {
         backstageResolver.getSatisfying(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
-            'backstage:1.23.45',
+            'backstage:^::v=1.23.45',
           ),
           {},
           [
@@ -236,6 +236,7 @@ describe('BackstageResolver', () => {
               'npm:1.2.3',
             ),
           ],
+          resolveOptions,
         ),
       ).resolves.toEqual({
         locators: [
@@ -253,7 +254,7 @@ describe('BackstageResolver', () => {
         backstageResolver.getSatisfying(
           structUtils.makeDescriptor(
             structUtils.makeIdent('backstage', 'core'),
-            'backstage:1.23.45',
+            'backstage:^::v=1.23.45',
           ),
           {},
           [
@@ -270,6 +271,7 @@ describe('BackstageResolver', () => {
               'npm:7.8.9',
             ),
           ],
+          resolveOptions,
         ),
       ).resolves.toEqual({
         locators: [
@@ -291,8 +293,9 @@ describe('BackstageResolver', () => {
           ),
           {},
           [],
+          resolveOptions,
         ),
-      ).rejects.toThrow(/unexpected npm: range/i);
+      ).rejects.toThrow(/unsupported version protocol/i);
     });
   });
 });
diff --git a/packages/yarn-plugin/src/resolver/BackstageResolver.ts b/packages/yarn-plugin/src/resolver/BackstageResolver.ts
index 7e794f5693..d2d0c98d1e 100644
--- a/packages/yarn-plugin/src/resolver/BackstageResolver.ts
+++ b/packages/yarn-plugin/src/resolver/BackstageResolver.ts
@@ -20,10 +20,14 @@ import {
   Locator,
   Package,
   Resolver,
+  ResolveOptions,
 } from '@yarnpkg/core';
-import semver from 'semver';
 import { PROTOCOL } from '../constants';
-import { getCurrentBackstageVersion, getPackageVersion } from '../util';
+import {
+  bindBackstageVersion,
+  getCurrentBackstageVersion,
+  getPackageVersion,
+} from '../util';
 
 export class BackstageResolver implements Resolver {
   static protocol = PROTOCOL;
@@ -45,10 +49,7 @@ export class BackstageResolver implements Resolver {
    */
   bindDescriptor(descriptor: Descriptor): Descriptor {
     if (descriptor.range === 'backstage:^') {
-      return structUtils.makeDescriptor(
-        descriptor,
-        `${PROTOCOL}${getCurrentBackstageVersion()}`,
-      );
+      return bindBackstageVersion(descriptor, getCurrentBackstageVersion());
     }
 
     return descriptor;
@@ -60,28 +61,18 @@ export class BackstageResolver implements Resolver {
    * concrete version into the appropriate concrete npm version for that
    * backstage release.
    */
-  async getCandidates(descriptor: Descriptor): Promise<Locator[]> {
-    const range = structUtils.parseRange(descriptor.range);
-    if (range.protocol !== BackstageResolver.protocol) {
-      throw new Error(
-        `Unsupported version protocol in version range "${
-          descriptor.range
-        }" for package ${structUtils.stringifyIdent(descriptor)}`,
-      );
-    }
-
-    if (!semver.valid(range.selector)) {
-      throw new Error(
-        `Invalid Backstage version string when resolving version for ${structUtils.stringifyIdent(
-          descriptor,
-        )}`,
-      );
-    }
-
+  async getCandidates(
+    descriptor: Descriptor,
+    _dependencies: Record<string, Package>,
+    opts: ResolveOptions,
+  ): Promise<Locator[]> {
     return [
       structUtils.makeLocator(
         descriptor,
-        `npm:${await getPackageVersion(descriptor)}`,
+        `npm:${await getPackageVersion(
+          descriptor,
+          opts.project.configuration,
+        )}`,
       ),
     ];
   }
@@ -96,8 +87,12 @@ export class BackstageResolver implements Resolver {
     descriptor: Descriptor,
     _dependencies: Record<string, Package>,
     locators: Array<Locator>,
+    opts: ResolveOptions,
   ): Promise<{ locators: Locator[]; sorted: boolean }> {
-    const packageVersion = await getPackageVersion(descriptor);
+    const packageVersion = await getPackageVersion(
+      descriptor,
+      opts.project.configuration,
+    );
 
     return {
       locators: locators.filter(
diff --git a/packages/yarn-plugin/src/util.ts b/packages/yarn-plugin/src/util.ts
index 0b613a477c..ee89a647e3 100644
--- a/packages/yarn-plugin/src/util.ts
+++ b/packages/yarn-plugin/src/util.ts
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
+import {
+  Configuration,
+  Descriptor,
+  httpUtils,
+  structUtils,
+} from '@yarnpkg/core';
 import { ppath, xfs } from '@yarnpkg/fslib';
 import { valid as semverValid } from 'semver';
-import { memoize } from 'lodash';
-import { getManifestByVersion as getManifestByVersionBase } from '@backstage/release-manifests';
 import { BACKSTAGE_JSON, findPaths } from '@backstage/cli-common';
-import { Descriptor, structUtils } from '@yarnpkg/core';
-import { PROTOCOL } from './constants';
+import { getManifestByVersion } from '@backstage/release-manifests';
 
-const getManifestByVersion = memoize(
-  getManifestByVersionBase,
-  ({ version }) => version,
-);
+import { PROTOCOL } from './constants';
 
 export const getCurrentBackstageVersion = () => {
   const workspaceRoot = ppath.resolve(findPaths(ppath.cwd()).targetRoot);
@@ -43,20 +43,76 @@ export const getCurrentBackstageVersion = () => {
   return backstageVersion;
 };
 
-export const getPackageVersion = async (descriptor: Descriptor) => {
+export const bindBackstageVersion = (
+  descriptor: Descriptor,
+  backstageVersion: string,
+) => {
+  return structUtils.bindDescriptor(descriptor, { v: backstageVersion });
+};
+
+export const getPackageVersion = async (
+  descriptor: Descriptor,
+  configuration: Configuration,
+) => {
   const ident = structUtils.stringifyIdent(descriptor);
   const range = structUtils.parseRange(descriptor.range);
 
   if (range.protocol !== PROTOCOL) {
-    throw new Error(`Unexpected ${range.protocol} range when packing`);
+    throw new Error(
+      `Unsupported version protocol in version range "${descriptor.range}" for package ${ident}`,
+    );
   }
 
-  if (!semverValid(range.selector)) {
-    throw new Error(`Missing backstage version in range ${descriptor.range}`);
+  if (range.selector !== '^') {
+    throw new Error(
+      `Unexpected version selector "${range.selector}" for package ${ident}`,
+    );
+  }
+
+  if (!range.params?.v) {
+    throw new Error(
+      `Missing Backstage version parameter in range "${descriptor.range}" for package ${ident}`,
+    );
+  }
+
+  if (Array.isArray(range.params.v)) {
+    throw new Error(
+      `Multiple Backstage versions specified in range "${descriptor.range}" for package ${ident}`,
+    );
   }
 
   const manifest = await getManifestByVersion({
-    version: range.selector,
+    version: range.params.v,
+    // We override the fetch function used inside getManifestByVersion with a
+    // custom implementation that calls yarn's built-in `httpUtils` method
+    // instead. This has a couple of benefits:
+    //
+    // 1. This means that the fetch should leverage yarn's built-in cache, so we
+    //    don't need to explicitly memoize the fetch.
+    // 2. The request should automatically take account of any proxy settings
+    //    configured in yarn.
+    fetch: async (url: string) => {
+      const response = await httpUtils.get(url, {
+        configuration,
+        jsonResponse: true,
+      });
+
+      // The release-manifests package expects fetchFn to resolve with a subset
+      // of the native HTTP Response object, but yarn's httpUtils implementation
+      // keeps most of the details hidden. This means we need to construct an
+      // object which quacks like a Response in the appropriate ways.
+      return {
+        // The function has some custom handling for non-200 errors. Yarn
+        // doesn't provide the status code, but if we've got to this point
+        // without throwing, we can assume the request has been successful.
+        status: 200,
+        // The requested URL, used to correctly report errors
+        url,
+        // Yarn automatically parses the response as JSON, so our implementation
+        // can simply return it.
+        json: () => response,
+      };
+    },
   });
 
   const manifestEntry = manifest.packages.find(
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 3876db67a8..bf6ed35b30 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,134 @@
 # @backstage/plugin-api-docs
 
+## 0.12.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 0.12.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.12.2-next.0
+
+### Patch Changes
+
+- 11babd9: Fix link styling in ProvidedApisCard component so it aligns with other card components.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.12.0
+
+### Minor Changes
+
+- 6836522: Added support for pagination in api-docs plugin - DefaultApiExplorerPage
+
+### Patch Changes
+
+- 11f57de: bump `@asyncapi/react-component` to latest `2.x`
+- 3cd1dee: Uses theme values to style the API definition schema so that theme overrides apply.
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.11.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.11.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.11.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.11.12-next.0
+
+### Patch Changes
+
+- 11f57de: bump `@asyncapi/react-component` to latest `2.x`
+- 3cd1dee: Uses theme values to style the API definition schema so that theme overrides apply.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 0.11.11
 
 ### Patch Changes
diff --git a/plugins/api-docs/README.md b/plugins/api-docs/README.md
index 2738cc09ae..139a97d4c8 100644
--- a/plugins/api-docs/README.md
+++ b/plugins/api-docs/README.md
@@ -371,6 +371,23 @@ export const apis: AnyApiFactory[] = [
 ]
 ```
 
+### Pagination
+
+You can add pagination support to `ApiExplorerPage` extension.
+
+This is an example:
+
+```tsx
+// In packages/app/src/App.tsx
+
+import { ApiExplorerPage } from '@backstage/plugin-api-docs';
+
+<Route
+  path="/api-docs"
+  element={<ApiExplorerPage pagination={{ mode: 'offset', limit: 20 }} />}
+/>;
+```
+
 ## Links
 
 - [The Backstage homepage](https://backstage.io)
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index a5213ba89b..b4372097f2 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.11.11",
+  "version": "0.12.2-next.2",
   "description": "A Backstage plugin that helps represent API entities in the frontend",
   "backstage": {
     "role": "frontend-plugin",
@@ -53,7 +53,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@asyncapi/react-component": "1.3.1",
+    "@asyncapi/react-component": "^2.3.3",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/core-compat-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
diff --git a/plugins/api-docs/report.api.md b/plugins/api-docs/report.api.md
index 3c3f245a3c..0249479ef9 100644
--- a/plugins/api-docs/report.api.md
+++ b/plugins/api-docs/report.api.md
@@ -10,6 +10,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogTableRow } from '@backstage/plugin-catalog';
 import { ComponentEntity } from '@backstage/catalog-model';
+import { EntityListPagination } from '@backstage/plugin-catalog-react';
 import { EntityOwnerPickerProps } from '@backstage/plugin-catalog-react';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
@@ -121,6 +122,7 @@ export type DefaultApiExplorerPageProps = {
   columns?: TableColumn<CatalogTableRow>[];
   actions?: TableProps<CatalogTableRow>['actions'];
   ownerPickerMode?: EntityOwnerPickerProps['mode'];
+  pagination?: EntityListPagination;
 };
 
 // @public (undocumented)
diff --git a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.tsx b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.tsx
index 6b5917c52d..b5a02b2f9e 100644
--- a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.tsx
+++ b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.tsx
@@ -29,6 +29,7 @@ import {
   EntityKindPicker,
   EntityLifecyclePicker,
   EntityListProvider,
+  EntityListPagination,
   EntityOwnerPicker,
   EntityTagPicker,
   EntityTypePicker,
@@ -62,6 +63,7 @@ export type DefaultApiExplorerPageProps = {
   columns?: TableColumn<CatalogTableRow>[];
   actions?: TableProps<CatalogTableRow>['actions'];
   ownerPickerMode?: EntityOwnerPickerProps['mode'];
+  pagination?: EntityListPagination;
 };
 
 /**
@@ -74,6 +76,7 @@ export const DefaultApiExplorerPage = (props: DefaultApiExplorerPageProps) => {
     columns,
     actions,
     ownerPickerMode,
+    pagination,
   } = props;
 
   const configApi = useApi(configApiRef);
@@ -102,7 +105,7 @@ export const DefaultApiExplorerPage = (props: DefaultApiExplorerPageProps) => {
           )}
           <SupportButton>All your APIs</SupportButton>
         </ContentHeader>
-        <EntityListProvider>
+        <EntityListProvider pagination={pagination}>
           <CatalogFilterLayout>
             <CatalogFilterLayout.Filters>
               <EntityKindPicker initialFilter="api" hidden />
diff --git a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx
index f89f411488..95236aa21a 100644
--- a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx
+++ b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx
@@ -84,12 +84,14 @@ export const ProvidedApisCard = (props: {
             This {entity.kind.toLocaleLowerCase('en-US')} does not provide any
             APIs.
           </Typography>
-          <Link
-            to="https://backstage.io/docs/features/software-catalog/descriptor-format#specprovidesapis-optional"
-            externalLinkIcon
-          >
-            Learn how to change this
-          </Link>
+          <Typography variant="body2">
+            <Link
+              to="https://backstage.io/docs/features/software-catalog/descriptor-format#specprovidesapis-optional"
+              externalLinkIcon
+            >
+              Learn how to change this
+            </Link>
+          </Typography>
         </div>
       }
       columns={columns}
diff --git a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.test.tsx b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.test.tsx
index ed3a3e98ce..c9f979edad 100644
--- a/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.test.tsx
+++ b/plugins/api-docs/src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.test.tsx
@@ -54,7 +54,7 @@ components:
 
     expect(getByText(/Account Service/i)).toBeInTheDocument();
     expect(getByText(/user\/signedup/i)).toBeInTheDocument();
-    expect(getAllByText(/UserSignedUp/i)).toHaveLength(4);
+    expect(getAllByText(/UserSignedUp/i)).toHaveLength(2);
     expect(getAllByText(/displayName/i)).toHaveLength(3);
   });
 });
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index ef1358d680..03c8163960 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,104 @@
 # @backstage/plugin-app-backend
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-app-node@0.1.28-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- 74c3f2a: Fixed a bug where config would not be injected on the `/` and `/index.html` paths.
+- d66fa80: Fix root route handling when query parameters are present
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-app-node@0.1.28-next.0
+
+## 0.4.0
+
+### Minor Changes
+
+- 815b702: Configuration is no longer injected into static assets if a `index.html.tmpl` file is present.
+
+### Patch Changes
+
+- 815b702: The `index.html` templating is now done and served from memory rather than written to the filesystem. This means that you can now use config injection with a read-only filesystem, and you no longer need to use the `app.disableConfigInjection` flag.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-app-node@0.1.27
+
+## 0.3.77-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.2
+
+## 0.3.77-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.77-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.27-next.0
+
 ## 0.3.76
 
 ### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index e48d604dd4..a0faf2154c 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.3.76",
+  "version": "0.4.3-next.2",
   "description": "A Backstage backend plugin that serves the Backstage frontend app",
   "backstage": {
     "role": "backend-plugin",
@@ -83,7 +83,6 @@
     "@backstage/cli": "workspace:^",
     "@backstage/types": "workspace:^",
     "@types/supertest": "^2.0.8",
-    "node-fetch": "^2.7.0",
     "supertest": "^7.0.0"
   },
   "configSchema": "config.d.ts"
diff --git a/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts b/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
index 51b949a623..bd7a01e5e8 100644
--- a/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
+++ b/plugins/app-backend/src/lib/assets/StaticAssetsStore.test.ts
@@ -14,24 +14,9 @@
  * limitations under the License.
  */
 
-import { Knex as KnexType } from 'knex';
 import { TestDatabases, mockServices } from '@backstage/backend-test-utils';
 import { StaticAssetsStore } from './StaticAssetsStore';
 
-const logger = mockServices.logger.mock();
-
-function createDatabaseManager(
-  client: KnexType,
-  skipMigrations: boolean = false,
-) {
-  return {
-    getClient: async () => client,
-    migrations: {
-      skip: skipMigrations,
-    },
-  };
-}
-
 jest.setTimeout(60_000);
 
 describe('StaticAssetsStore', () => {
@@ -40,11 +25,11 @@ describe('StaticAssetsStore', () => {
   it.each(databases.eachSupportedId())(
     'should store and retrieve assets, %p',
     async databaseId => {
-      const client = await databases.init(databaseId);
-      const database = createDatabaseManager(client);
+      const knex = await databases.init(databaseId);
+
       const store = await StaticAssetsStore.create({
-        logger,
-        database,
+        logger: mockServices.logger.mock(),
+        database: mockServices.database({ knex }),
       });
 
       await store.storeAssets([
@@ -82,11 +67,11 @@ describe('StaticAssetsStore', () => {
   it.each(databases.eachSupportedId())(
     'should update assets timestamps, but not contents, %p',
     async databaseId => {
-      const client = await databases.init(databaseId);
-      const database = createDatabaseManager(client);
+      const knex = await databases.init(databaseId);
+
       const store = await StaticAssetsStore.create({
-        logger,
-        database,
+        logger: mockServices.logger.mock(),
+        database: mockServices.database({ knex }),
       });
 
       await store.storeAssets([
@@ -134,10 +119,10 @@ describe('StaticAssetsStore', () => {
     'should trim old assets, %p',
     async databaseId => {
       const knex = await databases.init(databaseId);
-      const database = createDatabaseManager(knex);
+
       const store = await StaticAssetsStore.create({
-        logger,
-        database,
+        logger: mockServices.logger.mock(),
+        database: mockServices.database({ knex }),
       });
 
       await store.storeAssets([
@@ -179,10 +164,10 @@ describe('StaticAssetsStore', () => {
     'should isolate assets in namespace, %p',
     async databaseId => {
       const knex = await databases.init(databaseId);
-      const database = createDatabaseManager(knex);
+
       const store = await StaticAssetsStore.create({
-        logger,
-        database,
+        logger: mockServices.logger.mock(),
+        database: mockServices.database({ knex }),
       });
       const otherStore = store.withNamespace('other');
 
diff --git a/plugins/app-backend/src/lib/config/injectConfig.ts b/plugins/app-backend/src/lib/config/injectConfig.ts
index 9d63d219f4..fddd4ed1b5 100644
--- a/plugins/app-backend/src/lib/config/injectConfig.ts
+++ b/plugins/app-backend/src/lib/config/injectConfig.ts
@@ -24,13 +24,12 @@ import { InjectOptions } from './types';
  */
 export async function injectConfig(
   options: InjectOptions,
-): Promise<string | undefined> {
-  // In order to minimize the potential impact when rolling out the new config
-  // injection, we use both methods for a few releases. This allows the frontend
-  // app to be behind the backend by a version or two, but temporarily increases
-  // config injection overhead.
-  // TODO(Rugvip): After the 1.32 release we can stop calling the static injection if the HTML one is successful
-  await injectConfigIntoHtml(options);
+): Promise<{ injectedPath?: string | undefined; indexHtmlContent?: Buffer }> {
+  const indexHtmlContent = await injectConfigIntoHtml(options);
+  if (indexHtmlContent) {
+    return { indexHtmlContent };
+  }
 
-  return injectConfigIntoStatic(options);
+  const injectedPath = await injectConfigIntoStatic(options);
+  return { injectedPath };
 }
diff --git a/plugins/app-backend/src/lib/config/injectConfigIntoHtml.test.ts b/plugins/app-backend/src/lib/config/injectConfigIntoHtml.test.ts
index 56c916fbb9..c28f5b33a4 100644
--- a/plugins/app-backend/src/lib/config/injectConfigIntoHtml.test.ts
+++ b/plugins/app-backend/src/lib/config/injectConfigIntoHtml.test.ts
@@ -38,25 +38,22 @@ describe('injectConfigIntoHtml', () => {
     mockDir.setContent({
       'index.html.tmpl': "<html><%= config.getNumber('x') %></html>",
     });
-    await injectConfigIntoHtml({
+    const result = await injectConfigIntoHtml({
       ...baseOptions,
       appConfigs: [{ context: 'mock', data: { x: 1 } }],
     });
-    expect(mockDir.content()).toMatchObject({
-      'index.html': '<html>1</html>',
-    });
+    expect(result?.toString('utf8')).toBe('<html>1</html>');
   });
 
   it('should inject config', async () => {
     mockDir.setContent({
       'index.html.tmpl': '<html><head></head></html>',
     });
-    await injectConfigIntoHtml({
+    const result = await injectConfigIntoHtml({
       ...baseOptions,
       appConfigs: [{ context: 'mock', data: { x: 1 } }],
     });
-    expect(mockDir.content()).toMatchObject({
-      'index.html': `<html><head>
+    expect(result?.toString('utf8')).toBe(`<html><head>
 <script type="backstage.io/config">
 [
   {
@@ -67,15 +64,14 @@ describe('injectConfigIntoHtml', () => {
   }
 ]
 </script>
-</head></html>`,
-    });
+</head></html>`);
   });
 
   it('should trim script tag endings from injected config', async () => {
     mockDir.setContent({
       'index.html.tmpl': '<html><head></head></html>',
     });
-    await injectConfigIntoHtml({
+    const result = await injectConfigIntoHtml({
       ...baseOptions,
       appConfigs: [
         {
@@ -84,8 +80,7 @@ describe('injectConfigIntoHtml', () => {
         },
       ],
     });
-    expect(mockDir.content()).toMatchObject({
-      'index.html': `<html><head>
+    expect(result?.toString('utf8')).toBe(`<html><head>
 <script type="backstage.io/config">
 [
   {
@@ -96,7 +91,6 @@ describe('injectConfigIntoHtml', () => {
   }
 ]
 </script>
-</head></html>`,
-    });
+</head></html>`);
   });
 });
diff --git a/plugins/app-backend/src/lib/config/injectConfigIntoHtml.ts b/plugins/app-backend/src/lib/config/injectConfigIntoHtml.ts
index c0c1ca200a..dbd03e6ab5 100644
--- a/plugins/app-backend/src/lib/config/injectConfigIntoHtml.ts
+++ b/plugins/app-backend/src/lib/config/injectConfigIntoHtml.ts
@@ -25,13 +25,13 @@ const HTML_TEMPLATE_NAME = 'index.html.tmpl';
 /** @internal */
 export async function injectConfigIntoHtml(
   options: InjectOptions,
-): Promise<boolean> {
+): Promise<Buffer | undefined> {
   const { rootDir, appConfigs } = options;
 
   const templatePath = resolvePath(rootDir, HTML_TEMPLATE_NAME);
 
   if (!(await fs.exists(templatePath))) {
-    return false;
+    return undefined;
   }
 
   const templateContent = await fs.readFile(
@@ -67,13 +67,7 @@ ${JSON.stringify(appConfigs, null, 2)
 </head>`,
   );
 
-  await fs.writeFile(
-    resolvePath(rootDir, 'index.html'),
-    indexHtmlContentWithConfig,
-    'utf8',
-  );
-
-  return true;
+  return Buffer.from(indexHtmlContentWithConfig, 'utf8');
 }
 
 export function resolvePublicPath(config: Config) {
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
index 1fc4d27cdc..068405c19c 100644
--- a/plugins/app-backend/src/service/appPlugin.test.ts
+++ b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
 import {
   createMockDirectory,
   mockServices,
@@ -34,7 +33,11 @@ overridePackagePathResolution({
 createRootLogger();
 
 describe('appPlugin', () => {
-  beforeEach(() => {
+  afterEach(() => {
+    mockDir.clear();
+  });
+
+  it('boots', async () => {
     mockDir.setContent({
       'package.json': '{}',
       dist: {
@@ -42,9 +45,7 @@ describe('appPlugin', () => {
         'index.html': 'winning',
       },
     });
-  });
 
-  it('boots', async () => {
     const { server } = await startTestBackend({
       features: [
         appPlugin,
@@ -67,4 +68,61 @@ describe('appPlugin', () => {
       fetch(`http://localhost:${server.port()}`).then(res => res.text()),
     ).resolves.toBe('winning');
   });
+
+  it('injects config into index.html', async () => {
+    mockDir.setContent({
+      'package.json': '{}',
+      dist: {
+        static: {},
+        'index.html': '<html><head></head></html>',
+        'index.html.tmpl': '<html><head></head></html>',
+      },
+    });
+
+    const { server } = await startTestBackend({
+      features: [
+        appPlugin,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              disableStaticFallbackCache: true,
+            },
+          },
+        }),
+      ],
+    });
+
+    const baseUrl = `http://localhost:${server.port()}`;
+    const withInjectedConfig = `<html><head>
+<script type="backstage.io/config">
+[]
+</script>
+</head></html>`;
+
+    await expect(fetch(`${baseUrl}`).then(res => res.text())).resolves.toBe(
+      withInjectedConfig,
+    );
+
+    await expect(
+      fetch(`${baseUrl}?foo=bar`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/index.html`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/index.html?foo=bar`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/api/app/some/html5/route`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/api/app/some/html5/route?foo=bar`).then(res =>
+        res.text(),
+      ),
+    ).resolves.toBe(withInjectedConfig);
+  });
 });
diff --git a/plugins/app-backend/src/service/router.ts b/plugins/app-backend/src/service/router.ts
index a49a2918c7..24671fe5e9 100644
--- a/plugins/app-backend/src/service/router.ts
+++ b/plugins/app-backend/src/service/router.ts
@@ -267,7 +267,7 @@ async function createEntryPointRouter({
 }) {
   const staticDir = resolvePath(rootDir, 'static');
 
-  const injectedConfigPath =
+  const injectResult =
     appConfigs &&
     (await injectConfig({ appConfigs, logger, rootDir, staticDir }));
 
@@ -278,7 +278,7 @@ async function createEntryPointRouter({
   staticRouter.use(
     express.static(staticDir, {
       setHeaders: (res, path) => {
-        if (path === injectedConfigPath) {
+        if (injectResult?.injectedPath === path) {
           res.setHeader('Cache-Control', CACHE_CONTROL_REVALIDATE_CACHE);
         } else {
           res.setHeader('Cache-Control', CACHE_CONTROL_MAX_CACHE);
@@ -302,7 +302,17 @@ async function createEntryPointRouter({
   staticRouter.use(notFoundHandler());
 
   router.use('/static', staticRouter);
-  router.use(
+
+  const rootRouter = Router();
+  rootRouter.use((req, _res, next) => {
+    // Make sure / and /index.html are handled by the HTML5 route below
+    if (req.path === '/' || req.path === '/index.html') {
+      next('router');
+    } else {
+      next();
+    }
+  });
+  rootRouter.use(
     express.static(rootDir, {
       setHeaders: (res, path) => {
         // The Cache-Control header instructs the browser to not cache html files since it might
@@ -315,15 +325,23 @@ async function createEntryPointRouter({
       },
     }),
   );
+  router.use(rootRouter);
 
+  // HTML5 routing
   router.get('/*', (_req, res) => {
-    res.sendFile(resolvePath(rootDir, 'index.html'), {
-      headers: {
-        // The Cache-Control header instructs the browser to not cache the index.html since it might
-        // link to static assets from recently deployed versions.
-        'cache-control': CACHE_CONTROL_NO_CACHE,
-      },
-    });
+    if (injectResult?.indexHtmlContent) {
+      res.setHeader('Content-Type', 'text/html; charset=utf-8');
+      res.setHeader('Cache-Control', CACHE_CONTROL_NO_CACHE);
+      res.send(injectResult.indexHtmlContent);
+    } else {
+      res.sendFile(resolvePath(rootDir, 'index.html'), {
+        headers: {
+          // The Cache-Control header instructs the browser to not cache the index.html since it might
+          // link to static assets from recently deployed versions.
+          'cache-control': CACHE_CONTROL_NO_CACHE,
+        },
+      });
+    }
   });
 
   return router;
diff --git a/plugins/app-node/CHANGELOG.md b/plugins/app-node/CHANGELOG.md
index 6000edfff0..2490d02552 100644
--- a/plugins/app-node/CHANGELOG.md
+++ b/plugins/app-node/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-app-node
 
+## 0.1.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/config-loader@1.9.3-next.1
+
+## 0.1.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.1.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config-loader@1.9.2
+
+## 0.1.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config-loader@1.9.2-next.0
+
+## 0.1.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config-loader@1.9.2-next.0
+
+## 0.1.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config-loader@1.9.1
+
 ## 0.1.26
 
 ### Patch Changes
diff --git a/plugins/app-node/package.json b/plugins/app-node/package.json
index 8143eb31a9..1abd101c09 100644
--- a/plugins/app-node/package.json
+++ b/plugins/app-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-node",
-  "version": "0.1.26",
+  "version": "0.1.28-next.2",
   "description": "Node.js library for the app plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/app-visualizer/CHANGELOG.md b/plugins/app-visualizer/CHANGELOG.md
index 48216817dc..73487d2f2d 100644
--- a/plugins/app-visualizer/CHANGELOG.md
+++ b/plugins/app-visualizer/CHANGELOG.md
@@ -1,5 +1,79 @@
 # @backstage/plugin-app-visualizer
 
+## 0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+
+## 0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+
+## 0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.12
+
+### Patch Changes
+
+- e586e77: New `devDependency` for local development setup.
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## 0.1.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+
+## 0.1.12-next.2
+
+### Patch Changes
+
+- e586e77: New `devDependency` for local development setup.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## 0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+
+## 0.1.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/plugins/app-visualizer/dev/index.ts b/plugins/app-visualizer/dev/index.ts
new file mode 100644
index 0000000000..fa49e3360b
--- /dev/null
+++ b/plugins/app-visualizer/dev/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import ReactDOM from 'react-dom/client';
+import { createApp } from '@backstage/frontend-defaults';
+import { default as plugin } from '../src';
+
+const app = createApp({
+  features: [plugin],
+});
+
+ReactDOM.createRoot(document.getElementById('root')!).render(app.createRoot());
diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json
index e500ef6c89..fd2297bd2f 100644
--- a/plugins/app-visualizer/package.json
+++ b/plugins/app-visualizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-visualizer",
-  "version": "0.1.11",
+  "version": "0.1.14-next.2",
   "description": "Visualizes the Backstage app structure",
   "backstage": {
     "role": "frontend-plugin",
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
+    "@backstage/frontend-defaults": "workspace:^",
     "@types/react": "^18.0.0",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
diff --git a/plugins/app/CHANGELOG.md b/plugins/app/CHANGELOG.md
index 6287c07349..b7a68b9fe1 100644
--- a/plugins/app/CHANGELOG.md
+++ b/plugins/app/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @backstage/plugin-app
 
+## 0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- e5fa018: The OAuth 2 client implementations will now attempt to refresh the session when the existing session doesn't have the required scopes. The previous behavior was to only try to refresh the session of it was missing, and otherwise directly request a new session. This fixes an issue where some auth providers will not return access tokens with certain scopes unless explicitly requested, leading to an auth popup even if the underlying session already had been granted the requested scopes.
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/app/package.json b/plugins/app/package.json
index 93124aeec4..a67314e518 100644
--- a/plugins/app/package.json
+++ b/plugins/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app",
-  "version": "0.1.1",
+  "version": "0.1.4-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "app",
diff --git a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
index 30e0b2f025..3990ad28bc 100644
--- a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-atlassian-provider
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-atlassian-provider/package.json b/plugins/auth-backend-module-atlassian-provider/package.json
index 2ea6edb50c..42f9da9113 100644
--- a/plugins/auth-backend-module-atlassian-provider/package.json
+++ b/plugins/auth-backend-module-atlassian-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-atlassian-provider",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "The atlassian-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
index ac23f3ddae..884a10bdf9 100644
--- a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-auth0-provider
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-auth0-provider/package.json b/plugins/auth-backend-module-auth0-provider/package.json
index 39c590d319..43f5d6cfd1 100644
--- a/plugins/auth-backend-module-auth0-provider/package.json
+++ b/plugins/auth-backend-module-auth0-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-auth0-provider",
-  "version": "0.1.1",
+  "version": "0.1.3-next.2",
   "description": "The auth0-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
index 98a70c2698..ed6fca9fb3 100644
--- a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
@@ -1,5 +1,85 @@
 # @backstage/plugin-auth-backend-module-aws-alb-provider
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+
+## 0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+
+## 0.3.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+
+## 0.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.0-next.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-aws-alb-provider/package.json b/plugins/auth-backend-module-aws-alb-provider/package.json
index 34b1902a15..4f513dc904 100644
--- a/plugins/auth-backend-module-aws-alb-provider/package.json
+++ b/plugins/auth-backend-module-aws-alb-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-aws-alb-provider",
-  "version": "0.2.1",
+  "version": "0.3.1-next.2",
   "description": "The aws-alb provider module for the Backstage auth backend.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -37,14 +37,12 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-auth-backend": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
     "jose": "^5.0.0",
-    "node-cache": "^5.1.2",
-    "node-fetch": "^2.7.0"
+    "node-cache": "^5.1.2"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/auth-backend-module-aws-alb-provider/src/helpers.ts b/plugins/auth-backend-module-aws-alb-provider/src/helpers.ts
index 24026e2c9c..5d06de60a0 100644
--- a/plugins/auth-backend-module-aws-alb-provider/src/helpers.ts
+++ b/plugins/auth-backend-module-aws-alb-provider/src/helpers.ts
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { KeyObject } from 'crypto';
 import * as crypto from 'crypto';
 import { JWTHeaderParameters, decodeJwt } from 'jose';
 import NodeCache from 'node-cache';
-import fetch from 'node-fetch';
 import { PassportProfile, ProfileInfo } from '@backstage/plugin-auth-node';
 import { AuthenticationError } from '@backstage/errors';
 
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
index 9687e0d105..cdc6c21097 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-auth-backend-module-azure-easyauth-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/package.json b/plugins/auth-backend-module-azure-easyauth-provider/package.json
index 5de71c6754..159ced3d65 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/package.json
+++ b/plugins/auth-backend-module-azure-easyauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-azure-easyauth-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The azure-easyauth-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
index fdf3e2d674..9742024bea 100644
--- a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-bitbucket-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-provider/package.json b/plugins/auth-backend-module-bitbucket-provider/package.json
index d42cefc4a4..8134785461 100644
--- a/plugins/auth-backend-module-bitbucket-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-bitbucket-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The bitbucket-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
index b95d3e8700..b494d0f98b 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-auth-backend-module-bitbucket-server-provider
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/package.json b/plugins/auth-backend-module-bitbucket-server-provider/package.json
index d2a61dca17..306c931bda 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-server-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-bitbucket-server-provider",
-  "version": "0.1.1",
+  "version": "0.1.3-next.2",
   "description": "The bitbucket-server-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -36,7 +36,6 @@
   "dependencies": {
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
-    "node-fetch": "^2.7.0",
     "passport": "^0.7.0",
     "passport-oauth2": "^1.6.1"
   },
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/src/helpers.ts b/plugins/auth-backend-module-bitbucket-server-provider/src/helpers.ts
index fc16253b27..26b45d1f6d 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/src/helpers.ts
+++ b/plugins/auth-backend-module-bitbucket-server-provider/src/helpers.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
 import { PassportProfile } from '@backstage/plugin-auth-node';
 
 export async function fetchProfile(options: {
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
index 2e301abb76..05bb865a9c 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
@@ -1,5 +1,78 @@
 # @backstage/plugin-auth-backend-module-cloudflare-access-provider
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.3.2
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
index 72dc599cea..b73c8d87a5 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
+++ b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
@@ -42,7 +42,7 @@ export interface Config {
       /**
        * The backstage token expiration.
        */
-      backstageTokenExpiration?: HumanDuration;
+      backstageTokenExpiration?: HumanDuration | string;
     };
   };
 }
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/package.json b/plugins/auth-backend-module-cloudflare-access-provider/package.json
index 67a5d16b2f..a6ab768f0f 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/package.json
+++ b/plugins/auth-backend-module-cloudflare-access-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-cloudflare-access-provider",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "The cloudflare-access-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -39,8 +39,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
     "express": "^4.18.2",
-    "jose": "^5.0.0",
-    "node-fetch": "^2.7.0"
+    "jose": "^5.0.0"
   },
   "devDependencies": {
     "@backstage/backend-defaults": "workspace:^",
@@ -50,7 +49,7 @@
     "@backstage/types": "workspace:^",
     "msw": "^2.0.0",
     "node-mocks-http": "^1.0.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "configSchema": "config.d.ts"
 }
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/src/helpers.ts b/plugins/auth-backend-module-cloudflare-access-provider/src/helpers.ts
index 3077258dd6..64f79f113a 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/src/helpers.ts
+++ b/plugins/auth-backend-module-cloudflare-access-provider/src/helpers.ts
@@ -23,7 +23,6 @@ import {
 } from '@backstage/errors';
 import express from 'express';
 import { createRemoteJWKSet, jwtVerify } from 'jose';
-import fetch, { Headers } from 'node-fetch';
 import {
   CACHE_PREFIX,
   CF_JWT_HEADER,
@@ -87,8 +86,7 @@ export class AuthHelper {
       // Only throw if both are not provided by Cloudflare Access since either
       // can be used.
       throw new AuthenticationError(
-        `Missing ${this.jwtHeaderName} and 
-          ${this.authorizationCookieName} from Cloudflare Access`,
+        `Missing ${this.jwtHeaderName} and ${this.authorizationCookieName} from Cloudflare Access`,
       );
     }
 
diff --git a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
index 771e7c4e22..312a18eac7 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-auth-backend-module-gcp-iap-provider
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/types@1.2.0
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gcp-iap-provider/package.json b/plugins/auth-backend-module-gcp-iap-provider/package.json
index 352f03223b..f39dde45b9 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/package.json
+++ b/plugins/auth-backend-module-gcp-iap-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gcp-iap-provider",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "A GCP IAP auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-github-provider/CHANGELOG.md b/plugins/auth-backend-module-github-provider/CHANGELOG.md
index 5834c279ac..1b59b8647f 100644
--- a/plugins/auth-backend-module-github-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-github-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-github-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-github-provider/package.json b/plugins/auth-backend-module-github-provider/package.json
index 13a987e13c..49dca01723 100644
--- a/plugins/auth-backend-module-github-provider/package.json
+++ b/plugins/auth-backend-module-github-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-github-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The github-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
index 2ecbb7f743..ecfa128461 100644
--- a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-gitlab-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gitlab-provider/package.json b/plugins/auth-backend-module-gitlab-provider/package.json
index 38bf97fc80..b006aeb15f 100644
--- a/plugins/auth-backend-module-gitlab-provider/package.json
+++ b/plugins/auth-backend-module-gitlab-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gitlab-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The gitlab-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-google-provider/CHANGELOG.md b/plugins/auth-backend-module-google-provider/CHANGELOG.md
index 1e030d58fe..439de2acdc 100644
--- a/plugins/auth-backend-module-google-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-google-provider/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-auth-backend-module-google-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- 79b055a: Pass through `includeGrantedScopes` in order to persist scopes across refresh calls
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- b833660: Fix visibility of config for use in front end code
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- b833660: Fix visibility of config for use in front end code
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-google-provider/config.d.ts b/plugins/auth-backend-module-google-provider/config.d.ts
index e788860fa8..1571c06deb 100644
--- a/plugins/auth-backend-module-google-provider/config.d.ts
+++ b/plugins/auth-backend-module-google-provider/config.d.ts
@@ -18,6 +18,7 @@ export interface Config {
   /** Configuration options for the auth plugin */
   auth?: {
     providers?: {
+      /** @visibility frontend */
       google?: {
         [authEnv: string]: {
           clientId: string;
diff --git a/plugins/auth-backend-module-google-provider/package.json b/plugins/auth-backend-module-google-provider/package.json
index 6b609fcf02..e336c96987 100644
--- a/plugins/auth-backend-module-google-provider/package.json
+++ b/plugins/auth-backend-module-google-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-google-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "A Google auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-google-provider/src/authenticator.ts b/plugins/auth-backend-module-google-provider/src/authenticator.ts
index 9f1e298ae8..b0c58b777b 100644
--- a/plugins/auth-backend-module-google-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-google-provider/src/authenticator.ts
@@ -73,6 +73,7 @@ export const googleAuthenticator = createOAuthAuthenticator({
     return helper.start(input, {
       accessType: 'offline',
       prompt: 'consent',
+      includeGrantedScopes: 'true',
     });
   },
 
diff --git a/plugins/auth-backend-module-google-provider/src/module.test.ts b/plugins/auth-backend-module-google-provider/src/module.test.ts
index 8ece0c1942..608428d9f5 100644
--- a/plugins/auth-backend-module-google-provider/src/module.test.ts
+++ b/plugins/auth-backend-module-google-provider/src/module.test.ts
@@ -67,6 +67,7 @@ describe('authModuleGoogleProvider', () => {
       prompt: 'consent',
       response_type: 'code',
       client_id: 'my-client-id',
+      include_granted_scopes: 'true',
       redirect_uri: `http://localhost:${server.port()}/api/auth/google/handler/frame`,
       state: expect.any(String),
       scope:
diff --git a/plugins/auth-backend-module-guest-provider/CHANGELOG.md b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
index 49e53f0574..8c03d41a0b 100644
--- a/plugins/auth-backend-module-guest-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-auth-backend-module-guest-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-guest-provider/package.json b/plugins/auth-backend-module-guest-provider/package.json
index 77d547f6e1..22b24139f6 100644
--- a/plugins/auth-backend-module-guest-provider/package.json
+++ b/plugins/auth-backend-module-guest-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-guest-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The guest-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -34,7 +34,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/errors": "workspace:^",
diff --git a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
index a8a2555072..c9ceff5f82 100644
--- a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/plugin-auth-backend-module-microsoft-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-microsoft-provider/package.json b/plugins/auth-backend-module-microsoft-provider/package.json
index eafb94d7e0..4853cf95a2 100644
--- a/plugins/auth-backend-module-microsoft-provider/package.json
+++ b/plugins/auth-backend-module-microsoft-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-microsoft-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The microsoft-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -38,7 +38,6 @@
     "@backstage/plugin-auth-node": "workspace:^",
     "express": "^4.18.2",
     "jose": "^5.0.0",
-    "node-fetch": "^2.7.0",
     "passport-microsoft": "^1.0.0"
   },
   "devDependencies": {
diff --git a/plugins/auth-backend-module-microsoft-provider/src/strategy.ts b/plugins/auth-backend-module-microsoft-provider/src/strategy.ts
index 910bd85d1d..3a89b19c87 100644
--- a/plugins/auth-backend-module-microsoft-provider/src/strategy.ts
+++ b/plugins/auth-backend-module-microsoft-provider/src/strategy.ts
@@ -16,7 +16,6 @@
 
 import { PassportProfile } from '@backstage/plugin-auth-node';
 import { decodeJwt } from 'jose';
-import fetch from 'node-fetch';
 import { Strategy as MicrosoftStrategy } from 'passport-microsoft';
 
 export class ExtendedMicrosoftStrategy extends MicrosoftStrategy {
@@ -103,9 +102,9 @@ export class ExtendedMicrosoftStrategy extends MicrosoftStrategy {
           },
         },
       );
-      const data = await res.buffer();
+      const data = await res.arrayBuffer();
 
-      return `data:image/jpeg;base64,${data.toString('base64')}`;
+      return `data:image/jpeg;base64,${Buffer.from(data).toString('base64')}`;
     } catch (error) {
       return undefined;
     }
diff --git a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
index 68e621887c..2d1a8ffd95 100644
--- a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-oauth2-provider
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-provider/package.json b/plugins/auth-backend-module-oauth2-provider/package.json
index 668f689b4c..fb0ee690df 100644
--- a/plugins/auth-backend-module-oauth2-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-provider",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "The oauth2-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
index 07be133697..ef29374df0 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-auth-backend-module-oauth2-proxy-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/package.json b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
index 7c6ae3484f..84258c01c7 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-proxy-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The oauth2-proxy-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
index f641d7d3ee..1f4f574d06 100644
--- a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-auth-backend-module-oidc-provider
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-backend@0.24.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.1-next.1
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-auth-backend@0.24.1-next.0
+
+## 0.3.2
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-backend@0.24.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend@0.24.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oidc-provider/package.json b/plugins/auth-backend-module-oidc-provider/package.json
index 8dca2f332c..9e10260bbd 100644
--- a/plugins/auth-backend-module-oidc-provider/package.json
+++ b/plugins/auth-backend-module-oidc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oidc-provider",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "The oidc-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -34,7 +34,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/plugin-auth-backend": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
diff --git a/plugins/auth-backend-module-okta-provider/CHANGELOG.md b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
index 9d0e31e4b4..36c5a56db6 100644
--- a/plugins/auth-backend-module-okta-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-okta-provider
 
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-okta-provider/package.json b/plugins/auth-backend-module-okta-provider/package.json
index 4d77b5535f..8ca4e26db2 100644
--- a/plugins/auth-backend-module-okta-provider/package.json
+++ b/plugins/auth-backend-module-okta-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-okta-provider",
-  "version": "0.1.1",
+  "version": "0.1.3-next.2",
   "description": "The okta-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
index cbda40d0be..be3263db85 100644
--- a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-auth-backend-module-onelogin-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-onelogin-provider/package.json b/plugins/auth-backend-module-onelogin-provider/package.json
index a27a68ef98..4f92065d30 100644
--- a/plugins/auth-backend-module-onelogin-provider/package.json
+++ b/plugins/auth-backend-module-onelogin-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-onelogin-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The onelogin-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
index 67f48b4632..f1e14601f9 100644
--- a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-auth-backend-module-pinniped-provider
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-pinniped-provider/package.json b/plugins/auth-backend-module-pinniped-provider/package.json
index 74954fdea8..a70e51018d 100644
--- a/plugins/auth-backend-module-pinniped-provider/package.json
+++ b/plugins/auth-backend-module-pinniped-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-pinniped-provider",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "The pinniped-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
index 439ced456f..088d9acef5 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-auth-backend-module-vmware-cloud-provider
 
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+
+## 0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+
+## 0.4.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## 0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/package.json b/plugins/auth-backend-module-vmware-cloud-provider/package.json
index 21ddd9f1e1..a005fd1762 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/package.json
+++ b/plugins/auth-backend-module-vmware-cloud-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-vmware-cloud-provider",
-  "version": "0.4.0",
+  "version": "0.4.2-next.2",
   "description": "The vmware-cloud-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 55a5d9ff27..b41eee890e 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,235 @@
 # @backstage/plugin-auth-backend
 
+## 0.24.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.2
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.24.1-next.1
+
+### Patch Changes
+
+- c907440: Improved error forwarding for OAuth refresh endpoints
+- 40518ab: Fix issue with `jwks` endpoint returning invalid data with `firestore`
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.24.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.1-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.3-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.3-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.3-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.24.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2
+
+## 0.24.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.2
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.2
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.2
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.2
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.2
+
+## 0.24.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.24.0-next.0
+
+### Minor Changes
+
+- 75168e3: **BREAKING**: The AWS ALB `fullProfile` will no longer have the its username or email converted to lowercase. This is to ensure unique handling of the users. You may need to update and configure a custom sign-in resolver or profile transform as a result.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.3.0-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.2-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.2-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.2-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.2-next.0
+
 ## 0.23.1
 
 ### Patch Changes
diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index a7ea18ed1d..d2725e99a5 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -143,7 +143,7 @@ export interface Config {
       /**
        * The backstage token expiration.
        */
-      backstageTokenExpiration?: HumanDuration;
+      backstageTokenExpiration?: HumanDuration | string;
     };
     /**
      * Additional app origins to allow for authenticating
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index bb6db339ba..63fa6861d5 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.23.1",
+  "version": "0.24.1-next.2",
   "description": "A Backstage backend plugin that handles authentication",
   "backstage": {
     "role": "backend-plugin",
@@ -89,7 +89,6 @@
     "minimatch": "^9.0.0",
     "morgan": "^1.10.0",
     "node-cache": "^5.1.2",
-    "node-fetch": "^2.7.0",
     "openid-client": "^5.2.1",
     "passport": "^0.7.0",
     "passport-auth0": "^1.4.3",
@@ -98,7 +97,7 @@
     "passport-microsoft": "^1.0.0",
     "passport-oauth2": "^1.6.1",
     "passport-onelogin-oauth": "^0.0.1",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
   },
diff --git a/plugins/auth-backend/src/identity/FirestoreKeyStore.test.ts b/plugins/auth-backend/src/identity/FirestoreKeyStore.test.ts
index b04cf8a6b3..8e30dcc6f8 100644
--- a/plugins/auth-backend/src/identity/FirestoreKeyStore.test.ts
+++ b/plugins/auth-backend/src/identity/FirestoreKeyStore.test.ts
@@ -24,7 +24,9 @@ import {
 } from './FirestoreKeyStore';
 import { AnyJWK } from './types';
 
-const data = jest.fn().mockReturnValue('data');
+const data = jest
+  .fn()
+  .mockReturnValue({ key: { kid: 'something' }, kid: 'something' });
 const toDate = jest.fn().mockReturnValue('date');
 const get = jest.fn().mockReturnValue({
   docs: [{ data, createTime: { toDate } }],
@@ -145,7 +147,7 @@ describe('FirestoreKeyStore', () => {
     expect(firestoreMock.doc).toHaveBeenCalledWith(key.kid);
     expect(firestoreMock.set).toHaveBeenCalledWith({
       kid: key.kid,
-      key: JSON.stringify(key),
+      key,
     });
   });
 
@@ -180,7 +182,26 @@ describe('FirestoreKeyStore', () => {
     expect(data).toHaveBeenCalledTimes(1);
     expect(toDate).toHaveBeenCalledTimes(1);
     expect(items).toMatchObject({
-      items: [{ key: 'data', createdAt: 'date' }],
+      items: [{ key: { kid: 'something' }, createdAt: 'date' }],
+    });
+  });
+
+  it('supports older string versions of the keys', async () => {
+    data.mockReturnValue({
+      key: JSON.stringify({ kid: 'something' }),
+      kid: 'something',
+    });
+
+    const keyStore = await FirestoreKeyStore.create(firestoreSettings);
+    const items = await keyStore.listKeys();
+
+    expect(setTimeout).toHaveBeenCalledTimes(1);
+    expect(firestoreMock.collection).toHaveBeenCalledWith(path);
+    expect(firestoreMock.get).toHaveBeenCalledTimes(1);
+    expect(data).toHaveBeenCalledTimes(1);
+    expect(toDate).toHaveBeenCalledTimes(1);
+    expect(items).toMatchObject({
+      items: [{ key: { kid: 'something' }, createdAt: 'date' }],
     });
   });
 });
diff --git a/plugins/auth-backend/src/identity/FirestoreKeyStore.ts b/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
index b5f4f5dcfb..3b998a4fe9 100644
--- a/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
+++ b/plugins/auth-backend/src/identity/FirestoreKeyStore.ts
@@ -75,13 +75,10 @@ export class FirestoreKeyStore implements KeyStore {
 
   async addKey(key: AnyJWK): Promise<void> {
     await this.withTimeout<WriteResult>(
-      this.database
-        .collection(this.path)
-        .doc(key.kid)
-        .set({
-          kid: key.kid,
-          key: JSON.stringify(key),
-        }),
+      this.database.collection(this.path).doc(key.kid).set({
+        kid: key.kid,
+        key: key,
+      }),
     );
   }
 
@@ -91,10 +88,14 @@ export class FirestoreKeyStore implements KeyStore {
     );
 
     return {
-      items: keys.docs.map(key => ({
-        key: key.data() as AnyJWK,
-        createdAt: key.createTime.toDate(),
-      })),
+      items: keys.docs.map(doc => {
+        const { key } = doc.data();
+
+        return {
+          createdAt: doc.createTime.toDate(),
+          key: typeof key === 'string' ? JSON.parse(key) : key,
+        };
+      }),
     };
   }
 
diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
index 4d94634473..d9e80263ee 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.test.ts
@@ -272,28 +272,63 @@ describe('PassportStrategyHelper', () => {
       );
     });
 
-    it('should reject with an error if refresh failed', async () => {
-      class MyCustomOAuth2Error {
-        getOAuthAccessToken(
-          _refreshToken: string,
-          _options: any,
-          callback: Function,
-        ) {
-          callback(new Error('Unknown error'));
-        }
-      }
+    it('should forward simple errors', async () => {
       class MyCustomRefreshTokenSuccess extends passport.Strategy {
-        _oauth2 = new MyCustomOAuth2Error();
+        _oauth2 = new (class {
+          getOAuthAccessToken(_r: string, _o: any, cb: Function) {
+            cb(new Error('Unknown error'));
+          }
+        })();
       }
 
-      const mockStrategy = new MyCustomRefreshTokenSuccess();
-      const refreshTokenPromise = executeRefreshTokenStrategy(
-        mockStrategy,
-        'REFRESH_TOKEN',
-        'a',
+      await expect(
+        executeRefreshTokenStrategy(
+          new MyCustomRefreshTokenSuccess(),
+          'REFRESH_TOKEN',
+          'a',
+        ),
+      ).rejects.toThrow(
+        'Failed to refresh access token; caused by Error: Unknown error',
       );
-      await expect(refreshTokenPromise).rejects.toThrow(
-        'Failed to refresh access token Error: Unknown error',
+    });
+
+    it('should forward string errors', async () => {
+      class MyCustomRefreshTokenSuccess extends passport.Strategy {
+        _oauth2 = new (class {
+          getOAuthAccessToken(_r: string, _o: any, cb: Function) {
+            cb('some silly string error');
+          }
+        })();
+      }
+
+      await expect(
+        executeRefreshTokenStrategy(
+          new MyCustomRefreshTokenSuccess(),
+          'REFRESH_TOKEN',
+          'a',
+        ),
+      ).rejects.toThrow(
+        "Failed to refresh access token; caused by unknown error 'some silly string error'",
+      );
+    });
+
+    it('should forward object errors', async () => {
+      class MyCustomRefreshTokenSuccess extends passport.Strategy {
+        _oauth2 = new (class {
+          getOAuthAccessToken(_r: string, _o: any, cb: Function) {
+            cb({ name: 'SomeError', message: 'some message' });
+          }
+        })();
+      }
+
+      await expect(
+        executeRefreshTokenStrategy(
+          new MyCustomRefreshTokenSuccess(),
+          'REFRESH_TOKEN',
+          'a',
+        ),
+      ).rejects.toThrow(
+        'Failed to refresh access token; caused by SomeError: some message',
       );
     });
 
diff --git a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
index 88d3dbfa04..ef9284c1fb 100644
--- a/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
+++ b/plugins/auth-backend/src/lib/passport/PassportStrategyHelper.ts
@@ -21,6 +21,7 @@ import { InternalOAuthError } from 'passport-oauth2';
 import { ProfileInfo } from '@backstage/plugin-auth-node';
 import { PassportProfile } from './types';
 import { OAuthStartResponse } from '../../providers/types';
+import { ForwardedError } from '@backstage/errors';
 
 export type PassportDoneCallback<Res, Private = never> = (
   err?: Error,
@@ -66,7 +67,10 @@ export const makeProfileInfo = (
         displayName = decoded.name;
       }
     } catch (e) {
-      throw new Error(`Failed to parse id token and get profile info, ${e}`);
+      throw new ForwardedError(
+        `Failed to parse id token and get profile info`,
+        e,
+      );
     }
   }
 
@@ -176,7 +180,7 @@ export const executeRefreshTokenStrategy = async (
         params: any,
       ) => {
         if (err) {
-          reject(new Error(`Failed to refresh access token ${err.toString()}`));
+          reject(new ForwardedError(`Failed to refresh access token`, err));
         }
         if (!accessToken) {
           reject(
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index e7995c2394..e3209aaa45 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,95 @@
 # @backstage/plugin-auth-node
 
+## 0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.5.5-next.1
+
+### Patch Changes
+
+- c907440: Improved error forwarding for OAuth refresh endpoints
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.5.5-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.5.4
+
+### Patch Changes
+
+- a0a9a4a: Browsers silently drop cookies that exceed 4KB, which can be problematic for refresh tokens and other large cookies.This update ensures that large cookies, like refresh tokens, are not dropped by browsers, maintaining the integrity of the authentication process. The changes include both the implementation of the cookie splitting logic and corresponding tests to validate the new functionality.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.5.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.5.4-next.0
+
+### Patch Changes
+
+- a0a9a4a: Browsers silently drop cookies that exceed 4KB, which can be problematic for refresh tokens and other large cookies.This update ensures that large cookies, like refresh tokens, are not dropped by browsers, maintaining the integrity of the authentication process. The changes include both the implementation of the cookie splitting logic and corresponding tests to validate the new functionality.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.5.3
 
 ### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 5ec770ee57..cb7f02fd95 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-node",
-  "version": "0.5.3",
+  "version": "0.5.5-next.2",
   "backstage": {
     "role": "node-library",
     "pluginId": "auth",
@@ -44,12 +44,11 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@types/express": "*",
+    "@types/express": "^4.17.6",
     "@types/passport": "^1.0.3",
     "express": "^4.17.1",
     "jose": "^5.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "passport": "^0.7.0",
     "winston": "^3.2.1",
     "zod": "^3.22.4",
@@ -64,6 +63,6 @@
     "lodash": "^4.17.21",
     "msw": "^1.0.0",
     "supertest": "^7.0.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   }
 }
diff --git a/plugins/auth-node/src/oauth/OAuthCookieManager.ts b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
index 1d06242a2e..d594d7e78b 100644
--- a/plugins/auth-node/src/oauth/OAuthCookieManager.ts
+++ b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-import { Request, Response } from 'express';
+import { CookieOptions, Request, Response } from 'express';
 import { CookieConfigurer } from '../types';
 
 const THOUSAND_DAYS_MS = 1000 * 24 * 60 * 60 * 1000;
 const TEN_MINUTES_MS = 600 * 1000;
 
+const MAX_COOKIE_SIZE_CHARACTERS = 4000;
+
 const defaultCookieConfigurer: CookieConfigurer = ({
   callbackUrl,
   providerId,
@@ -85,50 +87,170 @@ export class OAuthCookieManager {
     };
   }
 
-  setNonce(res: Response, nonce: string, origin?: string) {
-    res.cookie(this.nonceCookie, nonce, {
-      maxAge: TEN_MINUTES_MS,
-      ...this.getConfig(origin, '/handler'),
-    });
+  setNonce(res: Response, nonce: string, origin?: string): void {
+    this.setCookie(
+      res,
+      this.nonceCookie,
+      nonce,
+      TEN_MINUTES_MS,
+      origin,
+      '/handler',
+    );
   }
 
-  setRefreshToken(res: Response, refreshToken: string, origin?: string) {
-    res.cookie(this.refreshTokenCookie, refreshToken, {
-      maxAge: THOUSAND_DAYS_MS,
-      ...this.getConfig(origin),
-    });
+  setRefreshToken(res: Response, refreshToken: string, origin?: string): void {
+    this.setCookie(
+      res,
+      this.refreshTokenCookie,
+      refreshToken,
+      THOUSAND_DAYS_MS,
+      origin,
+    );
   }
 
-  removeRefreshToken(res: Response, origin?: string) {
-    res.cookie(this.refreshTokenCookie, '', {
-      maxAge: 0,
-      ...this.getConfig(origin),
-    });
+  removeRefreshToken(res: Response, origin?: string): void {
+    this.removeCookie(res, this.refreshTokenCookie, origin);
   }
 
-  removeGrantedScopes(res: Response, origin?: string) {
-    res.cookie(this.grantedScopeCookie, '', {
-      maxAge: 0,
-      ...this.getConfig(origin),
-    });
+  removeGrantedScopes(res: Response, origin?: string): void {
+    this.removeCookie(res, this.grantedScopeCookie, origin);
   }
 
-  setGrantedScopes(res: Response, scope: string, origin?: string) {
-    res.cookie(this.grantedScopeCookie, scope, {
-      maxAge: THOUSAND_DAYS_MS,
-      ...this.getConfig(origin),
-    });
+  setGrantedScopes(res: Response, scope: string, origin?: string): void {
+    this.setCookie(
+      res,
+      this.grantedScopeCookie,
+      scope,
+      THOUSAND_DAYS_MS,
+      origin,
+    );
   }
 
   getNonce(req: Request): string | undefined {
-    return req.cookies[this.nonceCookie];
+    return this.getCookie(req, this.nonceCookie);
   }
 
   getRefreshToken(req: Request): string | undefined {
-    return req.cookies[this.refreshTokenCookie];
+    return this.getCookie(req, this.refreshTokenCookie);
   }
 
   getGrantedScopes(req: Request): string | undefined {
-    return req.cookies[this.grantedScopeCookie];
+    return this.getCookie(req, this.grantedScopeCookie);
+  }
+
+  private setCookie(
+    res: Response,
+    name: string,
+    val: string,
+    maxAge: number,
+    origin?: string,
+    pathSuffix: string = '',
+  ): Response {
+    const options = {
+      maxAge,
+      ...this.getConfig(origin, pathSuffix),
+    };
+    const req = res.req;
+    let output = res;
+    if (val.length > MAX_COOKIE_SIZE_CHARACTERS) {
+      const nonChunkedFormatExists = !!req.cookies[name];
+      if (nonChunkedFormatExists) {
+        output = output.cookie(name, '', this.getRemoveCookieOptions());
+      }
+
+      const chunked = this.splitCookieToChunks(val, MAX_COOKIE_SIZE_CHARACTERS);
+      chunked.forEach((value, chunkNumber) => {
+        output = output.cookie(
+          OAuthCookieManager.getCookieChunkName(name, chunkNumber),
+          value,
+          options,
+        );
+      });
+      return output;
+    }
+
+    const chunkedFormatExists = OAuthCookieManager.chunkedCookieExists(
+      req,
+      name,
+    );
+    if (chunkedFormatExists) {
+      for (let chunkNumber = 0; ; chunkNumber++) {
+        const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
+        const exists = !!req.cookies[key];
+        if (!exists) {
+          break;
+        }
+        output = output.cookie(key, '', this.getRemoveCookieOptions());
+      }
+    }
+
+    return output.cookie(name, val, options);
+  }
+
+  private getCookie(req: Request, name: string): string | undefined {
+    const isChunked = OAuthCookieManager.chunkedCookieExists(req, name);
+    if (isChunked) {
+      const chunks: string[] = [];
+      let chunkNumber = 0;
+      let chunk =
+        req.cookies[OAuthCookieManager.getCookieChunkName(name, chunkNumber)];
+      while (chunk) {
+        chunks.push(chunk);
+        chunkNumber++;
+        chunk =
+          req.cookies[OAuthCookieManager.getCookieChunkName(name, chunkNumber)];
+      }
+      return chunks.join('');
+    }
+    return req.cookies[name];
+  }
+
+  private removeCookie(res: Response, name: string, origin?: string): Response {
+    const req = res.req;
+    const options = this.getRemoveCookieOptions(origin);
+    const isChunked = OAuthCookieManager.chunkedCookieExists(req, name);
+    if (isChunked) {
+      const nonChunkedFormatExists = !!req.cookies[name];
+      let output: Response = nonChunkedFormatExists
+        ? res.cookie(name, '', options)
+        : res;
+      for (let chunkNumber = 0; ; chunkNumber++) {
+        const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
+        const exists = !!req.cookies[key];
+        if (!exists) {
+          break;
+        }
+        output = output.cookie(key, '', options);
+      }
+      return output;
+    }
+    return res.cookie(name, '', options);
+  }
+
+  private splitCookieToChunks(val: string, chunkSize: number): string[] {
+    const numChunks = Math.ceil(val.length / chunkSize);
+    const chunks: string[] = Array<string>(numChunks);
+
+    let offset: number = 0;
+    for (let i = 0; i < numChunks; i++) {
+      chunks[i] = val.substring(offset, offset + chunkSize);
+      offset += chunkSize;
+    }
+    return chunks;
+  }
+
+  private static chunkedCookieExists(req: Request, name: string): boolean {
+    return !!req.cookies[OAuthCookieManager.getCookieChunkName(name, 0)];
+  }
+
+  private static getCookieChunkName(name: string, chunkIndex: number): string {
+    return `${name}-${chunkIndex}`;
+  }
+
+  private getRemoveCookieOptions(origin?: string): CookieOptions {
+    return {
+      maxAge: 0,
+      ...this.getConfig(origin),
+    };
   }
 }
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
index edf816cbee..4ea8dc17cc 100644
--- a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
@@ -49,6 +49,9 @@ const mockSession = {
   refreshToken: 'refresh-token',
 };
 
+const fiveKilobyteRefreshToken =
+  'tylmRqYlw3LrrXATyPerWfYMXrF86h3FeI5DECH8lZ6bERd3SsSFaJZ7EVYw0Rr8HMQVqJAurcSDZBtXjry3y9hXGRmugroDiZngNw8ROSPqcWzaNWDbaVuxCGf3jdjccOio7MnbrmMGpKUF8dfx8DhBH9Vogj5qCWpDajxnGpG0HEOcAHmQbsmJ0KHKVIggAtTYIefjvO2I75Us5VI0sId1GYU0E2AsRVEGedu6oexiLV6QgyJHSyKzTTRD7DqZ4ktVLDsjOBUhAAEWbAl0vxhvjSUEt4YYEFshV5T13MhRGGma8QtVC7R1NItwtojj94QGfwnnQEviIuECONwQc6b4ObeQkPn4bgbsWG9PD5UJA9kBycBV8SqBQkKvT5nsrlsnO4E8zBJBtc2Pd14MUh6CzFng3Wee7v5uPQAnyDJT4V7COwY2F2opz2ifau6c6gUT5ybkEKbp945mo2R0mu99C7z99jhUq9RRxgrtSeNQ7o7j4NksnJThZMjxvpi978bG2P2oMWIl59LgsrYyUt2bkjEB5sQ1qwngitAQDy57flLwAyHAwTobQWjGDUumAAOHe9UqjsuPd6qf23nD0b2nn1rCtnGyJ0H6luaTT0Lqet1Eq9XRLHkL52mJN4iPLWKcDrYsK6KqKhIlVkHa4zXRKHnKONOgMqYioC155yncAirYYJQl142MWamHXqW3LsIjrPwPh9xj02TsWMG4hDt2kVb8Rp3qGJTDyDM79NKbIFFSkATIwyQmQB1THo0kAkpu3V7YYoOfDSl4N5TUbPJRSbEug6Xg3dqMjaHrL729xrGsc0iWC8DAKlTzPKnoVcjaYeru6zHIXhJJcs5BIxeA6afUcataOrzTddXdBiCehqtzjS0omXdeiHKv5d73fLeC5luUo1um6eVEidr5fXEApGpSHKsEo7mv1a9xOTCZPCE1lHntIkaG2vTgEc14QmGTXAjnaxuThGROxmm2gX8xM3JD6HYAfTxQpD5Y6fcMyF5joffBjLdFvHyYC66BghXIb4M7oZ0QQNqzMKzNuJ06JYLK4e0Pi2FQHt1XcO38sknlFnQh5S0GPMiGHXStIyDTfZNwPnI7iKH0GtsRZBUPmoG2cgJWSJPTMZOnIaC5AzZ8AClMT58GAa3MiyIhVLAs1hBv4BMu5mbY1QVSZ8UETZTDnXEn6rGIES41zkr1A3FThUhUTzJAwYLaG2nYn5Dtpge5C1B4LGElcVQDLJKKV3e6foYQMHcIzlwySKWSylI2bRjGJtE9594rlB9Yz1eno7KTtxy9IrMoAd13KnOCnrKjL40kGEWwbDScT0zob04qw1uuIcldUiLYLhPD0MtdxqtZTgvKeVTCeFNo23kWRnBvwhLlguGqvPCMfwXFjLldJsei9MElZgRrPgubBb7ZjSSdGT6CKey6TaFPx5jOT7V9v88jfQJMyEoX9jMCvCQZMFZyCMQdGKU40dOaozRqsymNMhPOgvheIhlXfN0MhU6RLJGhUen0QLuRBy2MiK82z1nkKSnlhMB3REmFmAIXrVhXiOalPLDVB9kR3csn5f6bddAcTzDLrv2YH6ZGhmXwILKJ0osKm8e9aIKVWHitr0LXl5zvkDj7U9CIVtktLLRodLTVxlKRS048LmbRBpGafoxXgOlcVfDmQO8LdKbKHWJOEN4oEhxF3zEgPf9rRMWEI0oE9KoOau7R5DVJMB6Bbf6tOxbHlVwPmnXGsEIJFDt7Wb79knZihK1mfLqaOumcAznQZiFdNt5NbBSestUCytXDDJn1fm8IGxXsBQSsEEtklg9phenjmMG38ABmyLhZCDiDEQ4M6VRPseVXpPhNYuija8YePhrB1y1aW1Cab7wglIIbeGj1Z06sJ6i4HGkAXtn2M1HolRLc6oPohihPaYtrKOFCtJarwbCHMtQjaR9GnzVfGoLFKemhY0kOZvAdLmB0g1QUKsmcKtNdpQwVYwciJE9vvIlgMIpeWBrU6cDkdIbQDOM6dvLicO3BZQqBXbSNgLcXsF1JqlD5YgUzdARjxv7tagxjXVJ4DVB31UgXcBWlEmI1gGrbVZUTQ4Kaj609StfQw2XNNdal8eES46C4rqHtTGCtdUjW7QINXaqt1efjNk4WYFS9OTGKL0GcgvF5ERlHuAQh0R2R0rSQLl72ayOZDeausNRBDYyI24pie4gFb2LI1hJjRwVTJej0xllYoPtMgLxmkCnUpPhbpPjIwPYIZfSYE6CoV7oxy4BDSyK6ueE6dUak6hlEZwOnDh3aOTSVioq53vuqk6ofC2kT2ar1PfgH5SGxpXB6RpI5bYiF4NYoDX9zEOKHD7hwVHoLK4UusPJWSNdbIDuIBmGb6p83vnEZukNaY5ocPZTZyM1Ex8dDOFiOiZs4bOgOY0NsJKv8pb4I1lDzSeBqPbytFkSAQrU5pUgK45bSIFlyEG3ef59nPHblCA8GstcMSm3zZETd5yVq1NAmQvAnabHyc10T3Arp8cm9Xe1SPVGMzEP6QjXMkZMRbwn8k9nXXcFNfRe6XjE4EhifwRuAYoUJ5jQEF5yrF1nYwwbsx6nlKtxlkxWljavjxH1aP8w8t50T3THX1hx39aktWddjRSjQJtu1rZcCxBCBx1FxictyrP9y5dhVVMGIup6mJ8vHws8nudLqHaiEEQlGlRGKi6hMcF31S8l1RWG6KJRsbm8x6jvJchk5ekr9Cj2fmCkpVdE2yCianjU7pCLibtfR7HV36uGK2d0DXwbrv0sXPr9M7KGgTLmSjlUJrohDBHshfHPdT5DgIq1boeBBZjxlxNoUxN7veZ80VjFSuNbCxTg9rcZeAT35qgt06oHboySGL1ZwGPs4Ip73tN1AYRlfo3PZBHWCT4V8mF0R9DDyFEdhkZtvjJLTNqroJsUuUAQzggheYufFunJ8lrwJyche4XaJqnKkv2JktuSbLXol2NoNX31493O2F2nnwWbzgff1jh2gDvPiG9o8wvNrXY06Ar47WDF62YipcLuAY50RnPWaVOgC2vV0OmDGMxnu3niKM0rSiyOtwWzc8SbRPkdRzGwqmtmSFfJSLzNdDLFAbGyDel7WzMUtWuXfvqEZwLVco49zrlcnLPAT4OKNvSl6AcZaTulU9sA2xbEK7gKMv7r8HNJLdEze2cgHG6rXUiayefWE3o2V8YjSHyUwV4PmrW8neAv0v5zKnKBsE6QwlYX23NoaPBvSokjStkNbLxLec0ip6Rgy7vJv5AEA7nxbDM53WUz44898OKHrVjN9vqvoKPBQUXf5BHihloJQCnpk03yzcc2h6y3e9rMFPyMyLFI6Hd4jCOuwtOqTJjAJAvcJzP7gKkeAe9N5ObwtjNqkkWPOd1AJccZukWnT1Lu390xfY3eyRjdMutc5OkTo4di2u0AjVH3LtRIRfa0AHVEly3ZvBCCYo9jCZ0CV8s6PlNOJ6SkyZyZzO3VyOUYxfj09D0P8kCaQ8YcyyoeSKPKVlFvxEqALW8nXASnKCv5mvsAyZMGpYRHtoyu4mVyCIrdOjmyGIK462aO6KaGC6lfWkKisQhLmSK2PmrPeimdS5ViOHllBfwexF5AsmNi6LYrjS00uPTki9K06h6yuppMVV8ykV6HIZoLABicTm5NofudhYrqV5hWstXxunHAk2cNq5Is1mFSNU4eedYbqu2c3y8iD3QzLWO6FmxwWFu3XUK8upSJ2cK34uUl8kX1uRsWSNEMIMOils8HZwHtxZ9fZ09sT2fRJKAIKxx57h0leLsjciNT5iTrMHgsNTlpa5I1QDSbEqtlFhDvh3TYmAYBYUENhcVBZmVK62XhTPpzgmEIQX4dlZJbz9g6I85jjfJILKLsEpmErtbzglmQpyQNw2EQFzYIWu25tv2dTDoDRP7uDV4KDKl5pXKRwu5z4UQI4sXLPACK78x6EoEyVUFnBktvnT7mQe5bqAlJ7dhqUEbzC3AJIgVosnRplZqXInSlNdpTFOasW3YyQmQtDB4183vKzCe4UMdKnHkRAoA127iSIUvKe5w66Cv8cQU38AFyWp5eedMNu9NlbqepUEaYSTmas5odjQUJ23D35QCuO67zFILoDKqWYv7jVKXMIVZUnyvspAWbtUFYDij5SmP2QQCgCpExeDtmoVPdjusL1QqQjukGVc9nXHwjhZ7KwrtrC5XMeKgl9EBvNjRum0sn4B7MLhuqJPqreoTLE2unGcI34mKbWRbyHjSq5xi8uZy72MuDCXyUU4GmZrXNqMG7QAw4wAvMKI31G0uHJEaOSV5II9XGAuYSGTuUuO4y31NTQBPpa2O0JFfnFJgYveVoWL3cCcjJivvEWezutrJ3eObOFbV4ACiZ1uXwJFlI484ILeWSNkS3jaSgfIYvBK9SMVZwg6IuFtjX6D855I4U4XHMqKWla3IcaKvIKwYFlrOWPq81lflKMPLQvJnrEiUi67jZJZYF0rMKtrv2ayFEfFBDtG58hA9uIkCbvHAQOBeWpzuTNUdtZoNdAuLqxddjpxZr4moFtk1CjdQihJNQLPeZR0ZrQYVBUPMyFIV639RykPOPyhxFMSKQNo9xjNCuxnoZWBbtqHHXtFZdUBq7qkb0GzfiADZ7LaRtj9MNOLLej35Wy0L0xPu5Hy5v9N0Jslj65YZJvC7N8uMYuIR6rMuh2MhuthHOlxLLbzcBy7gicP5aFofdt4fkOBgitm8CCRdm0f9DQpETZ5hEGmkI4V59HRs2Up4CG2ajOFIZwRmbvs3B8M5NZmwf1mmek0j7qfjkOhpsp7RHMqUztEYGd1RX3S6vaHDSFEouqPiU07CjNFDV1f8x94tUq8ldicDtQN1DbR5oBTvdmQZsgG8K6oU70IKNhwX4idMFNaTcQ0ZsfJk1rQLh6cIoksmrbm6tYu97HQhVsDmavCs5CnkN2mZDEEj9HfK6O53ck273X3jRo01lFfT65KcUSH71zr3KkLPzxBbhhCRmdpXQSfyHwbN7QbKWi6NkU8G7xb8oRFFsR';
+
 const baseConfig = {
   authenticator: mockAuthenticator,
   appUrl: 'http://127.0.0.1',
@@ -91,7 +94,15 @@ function getNonceCookie(test: SuperAgentTest) {
   });
 }
 
-function getRefreshTokenCookie(test: SuperAgentTest) {
+function getRefreshTokenCookie(test: SuperAgentTest, chunkNumber?: number) {
+  if (chunkNumber !== undefined) {
+    return test.jar.getCookie(`my-provider-refresh-token-${chunkNumber}`, {
+      domain: '127.0.0.1',
+      path: '/my-provider',
+      script: false,
+      secure: false,
+    });
+  }
   return test.jar.getCookie('my-provider-refresh-token', {
     domain: '127.0.0.1',
     path: '/my-provider',
@@ -267,6 +278,60 @@ describe('createOAuthRouteHandlers', () => {
       expect(getGrantedScopesCookie(agent)).toBeUndefined();
     });
 
+    it('should authenticate when refresh token is bigger than 4KB', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        'my-provider-nonce=123',
+        '127.0.0.1',
+        '/my-provider/handler',
+      );
+
+      mockAuthenticator.authenticate.mockResolvedValue({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: {
+          ...mockSession,
+          refreshToken: fiveKilobyteRefreshToken,
+        },
+      });
+
+      const res = await agent.get('/my-provider/handler/frame').query({
+        state: encodeOAuthState({
+          env: 'development',
+          nonce: '123',
+        } as OAuthState),
+      });
+
+      expect(mockAuthenticator.authenticate).toHaveBeenCalledWith(
+        { req: expect.anything() },
+        { ctx: 'authenticator' },
+      );
+
+      expect(res.status).toBe(200);
+      expect(parseWebMessageResponse(res.text).response).toEqual({
+        type: 'authorization_response',
+        response: {
+          profile: {},
+          providerInfo: {
+            accessToken: 'access-token',
+            expiresInSeconds: 3,
+            idToken: 'id-token',
+            scope: 'my-scope',
+          },
+        },
+      });
+
+      expect(getRefreshTokenCookie(agent, 0).value).toBe(
+        fiveKilobyteRefreshToken.slice(0, 4000),
+      );
+      expect(getRefreshTokenCookie(agent, 1).value).toBe(
+        fiveKilobyteRefreshToken.slice(4000),
+      );
+      expect(getGrantedScopesCookie(agent)).toBeUndefined();
+    });
+
     it('should authenticate with sign-in, profile transform, and persisted scopes', async () => {
       const agent = request.agent(
         wrapInApp(
@@ -556,6 +621,60 @@ describe('createOAuthRouteHandlers', () => {
       });
     });
 
+    it('should refresh for chunked token', async () => {
+      const agent = request.agent(
+        wrapInApp(createOAuthRouteHandlers(baseConfig)),
+      );
+
+      agent.jar.setCookie(
+        `my-provider-refresh-token-0=${fiveKilobyteRefreshToken.slice(
+          0,
+          4000,
+        )}`,
+        '127.0.0.1',
+        '/my-provider',
+      );
+      agent.jar.setCookie(
+        `my-provider-refresh-token-1=${fiveKilobyteRefreshToken.slice(4000)}`,
+        '127.0.0.1',
+        '/my-provider',
+      );
+
+      mockAuthenticator.refresh.mockImplementation(async ({ scope }) => ({
+        fullProfile: { id: 'id' } as PassportProfile,
+        session: {
+          ...mockSession,
+          scope,
+          refreshToken: fiveKilobyteRefreshToken,
+        },
+      }));
+
+      const res = await agent
+        .post('/my-provider/refresh')
+        .set('X-Requested-With', 'XMLHttpRequest')
+        .query({ scope: 'my-scope' });
+
+      expect(mockAuthenticator.refresh).toHaveBeenCalledWith(
+        {
+          req: expect.anything(),
+          refreshToken: fiveKilobyteRefreshToken,
+          scope: 'my-scope',
+        },
+        { ctx: 'authenticator' },
+      );
+
+      expect(res.status).toBe(200);
+      expect(res.body).toEqual({
+        profile: {},
+        providerInfo: {
+          accessToken: 'access-token',
+          expiresInSeconds: 3,
+          idToken: 'id-token',
+          scope: 'my-scope',
+        },
+      });
+    });
+
     it('should refresh with sign-in, profile transform, and persisted scopes', async () => {
       const agent = request.agent(
         wrapInApp(
diff --git a/plugins/auth-node/src/passport/PassportHelpers.ts b/plugins/auth-node/src/passport/PassportHelpers.ts
index d1ddee20a7..9c9198fbf1 100644
--- a/plugins/auth-node/src/passport/PassportHelpers.ts
+++ b/plugins/auth-node/src/passport/PassportHelpers.ts
@@ -19,6 +19,7 @@ import { decodeJwt } from 'jose';
 import { Strategy } from 'passport';
 import { PassportProfile } from './types';
 import { ProfileInfo } from '../types';
+import { ForwardedError } from '@backstage/errors';
 
 // Re-declared here to avoid direct dependency on passport-oauth2
 /** @internal */
@@ -76,7 +77,10 @@ export class PassportHelpers {
           displayName = decoded.name;
         }
       } catch (e) {
-        throw new Error(`Failed to parse id token and get profile info, ${e}`);
+        throw new ForwardedError(
+          `Failed to parse id token and get profile info`,
+          e,
+        );
       }
     }
 
@@ -191,9 +195,7 @@ export class PassportHelpers {
           params: any,
         ) => {
           if (err) {
-            reject(
-              new Error(`Failed to refresh access token ${err.toString()}`),
-            );
+            reject(new ForwardedError(`Failed to refresh access token`, err));
           }
           if (!accessToken) {
             reject(
diff --git a/plugins/auth-react/CHANGELOG.md b/plugins/auth-react/CHANGELOG.md
index 243bedecf2..8f47451e59 100644
--- a/plugins/auth-react/CHANGELOG.md
+++ b/plugins/auth-react/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @backstage/plugin-auth-react
 
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## 0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## 0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json
index f4bd2d9e27..5241176b4c 100644
--- a/plugins/auth-react/package.json
+++ b/plugins/auth-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-react",
-  "version": "0.1.7",
+  "version": "0.1.10-next.2",
   "description": "Web library for the auth plugin",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index 47a419a515..c0d50270cf 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-bitbucket-cloud-common
 
+## 0.2.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.26-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.25
+
+### Patch Changes
+
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.2
+
+## 0.2.25-next.0
+
+### Patch Changes
+
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1
+
 ## 0.2.24
 
 ### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/bitbucket-cloud.oas.json b/plugins/bitbucket-cloud-common/bitbucket-cloud.oas.json
index d897d83047..ead80230c6 100644
--- a/plugins/bitbucket-cloud-common/bitbucket-cloud.oas.json
+++ b/plugins/bitbucket-cloud-common/bitbucket-cloud.oas.json
@@ -24400,7 +24400,7 @@
         "title": "Pagination",
         "description": "Learn more about pagination",
         "icon": "data:image/svg+xml;base64,b'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjM4LjgyIDE1MS42Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2IyZDRmZjt9LmNscy0ye2ZpbGw6IzRjOWFmZjt9LmNscy0ze2ZpbGw6IzAwNTJjYzt9LmNscy00e29wYWNpdHk6MC42O30uY2xzLTV7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNntmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTd7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudC0zKTt9LmNscy04e2ZpbGw6dXJsKCNsaW5lYXItZ3JhZGllbnQtNCk7fS5jbHMtOXtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTUpO30uY2xzLTEwLC5jbHMtMTEsLmNscy0xMntmaWxsOm5vbmU7fS5jbHMtMTB7c3Ryb2tlOiMzMzg0ZmY7fS5jbHMtMTAsLmNscy0xMSwuY2xzLTEyLC5jbHMtMTN7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9LmNscy0xMXtzdHJva2U6I2ZmYWIwMDt9LmNscy0xMntzdHJva2U6I2ZhZmJmYzt9LmNscy0xM3tmaWxsOiNmZmFiMDA7c3Ryb2tlOiMyNjg0ZmY7fTwvc3R5bGU+PGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQiIHkxPSI2NS4xNyIgeDI9Ijg2LjM4IiB5Mj0iNjUuMTciIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM0YzlhZmYiLz48c3RvcCBvZmZzZXQ9IjAuMDgiIHN0b3AtY29sb3I9IiM0YzlhZmYiIHN0b3Atb3BhY2l0eT0iMC45NCIvPjxzdG9wIG9mZnNldD0iMC4yNCIgc3RvcC1jb2xvcj0iIzRjOWFmZiIgc3RvcC1vcGFjaXR5PSIwLjc4Ii8+PHN0b3Agb2Zmc2V0PSIwLjQ1IiBzdG9wLWNvbG9yPSIjNGM5YWZmIiBzdG9wLW9wYWNpdHk9IjAuNTMiLz48c3RvcCBvZmZzZXQ9IjAuNTUiIHN0b3AtY29sb3I9IiM0YzlhZmYiIHN0b3Atb3BhY2l0eT0iMC40Ii8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhci1ncmFkaWVudC0yIiB4MT0iMTUyLjQ0IiB5MT0iNjUuMTciIHgyPSIyMzguODIiIHkyPSI2NS4xNyIgeGxpbms6aHJlZj0iI2xpbmVhci1ncmFkaWVudCIvPjxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50LTMiIHgxPSIxOC44NSIgeTE9IjExOC43OCIgeDI9IjEyNi4wOCIgeTI9IjExLjU2IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwLjA2IiBzdG9wLWNvbG9yPSIjMDA2NWZmIi8+PHN0b3Agb2Zmc2V0PSIwLjE5IiBzdG9wLWNvbG9yPSIjMDA2NWZmIiBzdG9wLW9wYWNpdHk9IjAuOTQiLz48c3RvcCBvZmZzZXQ9IjAuNDYiIHN0b3AtY29sb3I9IiMwMDY1ZmYiIHN0b3Atb3BhY2l0eT0iMC43OCIvPjxzdG9wIG9mZnNldD0iMC44MiIgc3RvcC1jb2xvcj0iIzAwNjVmZiIgc3RvcC1vcGFjaXR5PSIwLjUzIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMDA2NWZmIiBzdG9wLW9wYWNpdHk9IjAuNCIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtNCIgeDE9IjExMi43NSIgeTE9IjExOC43OCIgeDI9IjIxOS45NyIgeTI9IjExLjU2IiB4bGluazpocmVmPSIjbGluZWFyLWdyYWRpZW50LTMiLz48bGluZWFyR3JhZGllbnQgaWQ9ImxpbmVhci1ncmFkaWVudC01IiB4MT0iNTAuOTciIHkxPSIxMzMuNjEiIHgyPSIxODcuODYiIHkyPSItMy4yOCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMC42NiIgc3RvcC1jb2xvcj0iIzI1Mzg1OCIvPjxzdG9wIG9mZnNldD0iMC44OCIgc3RvcC1jb2xvcj0iIzI1Mzg1OCIgc3RvcC1vcGFjaXR5PSIwLjgzIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMjUzODU4IiBzdG9wLW9wYWNpdHk9IjAuNyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjx0aXRsZT5WaWV3IFZlcnNpb25zPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iU29mdHdhcmUiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iOTQuNTMiIGN5PSIxNDcuOTMiIHI9IjMuNjciLz48Y2lyY2xlIGNsYXNzPSJjbHMtMiIgY3g9IjEwNi45NCIgY3k9IjE0Ny45MyIgcj0iMy42NyIvPjxjaXJjbGUgY2xhc3M9ImNscy0zIiBjeD0iMTE5LjM0IiBjeT0iMTQ3LjkzIiByPSIzLjY3Ii8+PGNpcmNsZSBjbGFzcz0iY2xzLTIiIGN4PSIxMzEuNzUiIGN5PSIxNDcuOTMiIHI9IjMuNjciLz48Y2lyY2xlIGNsYXNzPSJjbHMtMSIgY3g9IjE0NC4xNiIgY3k9IjE0Ny45MyIgcj0iMy42NyIvPjxnIGNsYXNzPSJjbHMtNCI+PHJlY3QgaWQ9Il9SZWN0YW5nbGVfIiBkYXRhLW5hbWU9IiZsdDtSZWN0YW5nbGUmZ3Q7IiBjbGFzcz0iY2xzLTUiIHk9IjI1LjkyIiB3aWR0aD0iODYuMzgiIGhlaWdodD0iNzguNDkiLz48L2c+PGcgY2xhc3M9ImNscy00Ij48cmVjdCBpZD0iX1JlY3RhbmdsZV8yIiBkYXRhLW5hbWU9IiZsdDtSZWN0YW5nbGUmZ3Q7IiBjbGFzcz0iY2xzLTYiIHg9IjE1Mi40NCIgeT0iMjUuOTIiIHdpZHRoPSI4Ni4zOCIgaGVpZ2h0PSI3OC40OSIvPjwvZz48cmVjdCBpZD0iX1JlY3RhbmdsZV8zIiBkYXRhLW5hbWU9IiZsdDtSZWN0YW5nbGUmZ3Q7IiBjbGFzcz0iY2xzLTciIHg9IjE2LjI4IiB5PSIxNC4xMiIgd2lkdGg9IjExMi4zNiIgaGVpZ2h0PSIxMDIuMDkiLz48cmVjdCBpZD0iX1JlY3RhbmdsZV80IiBkYXRhLW5hbWU9IiZsdDtSZWN0YW5nbGUmZ3Q7IiBjbGFzcz0iY2xzLTgiIHg9IjExMC4xOCIgeT0iMTQuMTIiIHdpZHRoPSIxMTIuMzYiIGhlaWdodD0iMTAyLjA5Ii8+PHJlY3QgaWQ9Il9SZWN0YW5nbGVfNSIgZGF0YS1uYW1lPSImbHQ7UmVjdGFuZ2xlJmd0OyIgY2xhc3M9ImNscy05IiB4PSI0Ny42OSIgd2lkdGg9IjE0My40NSIgaGVpZ2h0PSIxMzAuMzQiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNzkuMTYiIHkxPSIxNi4xOCIgeDI9IjExNy4yNCIgeTI9IjE2LjE4Ii8+PGxpbmUgY2xhc3M9ImNscy0xMCIgeDE9IjYyLjkzIiB5MT0iMTYuMTgiIHgyPSI3Mi42IiB5Mj0iMTYuMTgiLz48bGluZSBjbGFzcz0iY2xzLTExIiB4MT0iNzkuMTYiIHkxPSIyNi45NSIgeDI9IjExNy4yNCIgeTI9IjI2Ljk1Ii8+PGxpbmUgY2xhc3M9ImNscy0xMCIgeDE9IjYyLjkzIiB5MT0iMjYuOTUiIHgyPSI3Mi42IiB5Mj0iMjYuOTUiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNzkuMTYiIHkxPSIzNy43MiIgeDI9IjE1MC43IiB5Mj0iMzcuNzIiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNjIuOTMiIHkxPSIzNy43MiIgeDI9IjcyLjYiIHkyPSIzNy43MiIvPjxsaW5lIGNsYXNzPSJjbHMtMTEiIHgxPSIxNTAuNyIgeTE9IjQ4LjQ5IiB4Mj0iMTc1LjU5IiB5Mj0iNDguNDkiLz48bGluZSBjbGFzcz0iY2xzLTEyIiB4MT0iMTEwLjMyIiB5MT0iNDguNDkiIHgyPSIxNDMuMDUiIHkyPSI0OC40OSIvPjxsaW5lIGNsYXNzPSJjbHMtMTEiIHgxPSI3OS4xNiIgeTE9IjQ4LjQ5IiB4Mj0iMTAxLjM3IiB5Mj0iNDguNDkiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNjIuOTMiIHkxPSI0OC40OSIgeDI9IjcyLjYiIHkyPSI0OC40OSIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI3OS4xNiIgeTE9IjU5LjI2IiB4Mj0iMTUwLjciIHkyPSI1OS4yNiIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI2Mi45MyIgeTE9IjU5LjI2IiB4Mj0iNzIuNiIgeTI9IjU5LjI2Ii8+PGxpbmUgY2xhc3M9ImNscy0xMCIgeDE9Ijc5LjE2IiB5MT0iNzAuMDMiIHgyPSIxNzUuNTkiIHkyPSI3MC4wMyIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI2Mi45MyIgeTE9IjcwLjAzIiB4Mj0iNzIuNiIgeTI9IjcwLjAzIi8+PGxpbmUgY2xhc3M9ImNscy0xMSIgeDE9Ijc5LjE2IiB5MT0iODAuNzkiIHgyPSIxMTcuMjQiIHkyPSI4MC43OSIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI2Mi45MyIgeTE9IjgwLjc5IiB4Mj0iNzIuNiIgeTI9IjgwLjc5Ii8+PGxpbmUgY2xhc3M9ImNscy0xMyIgeDE9Ijc5LjE2IiB5MT0iOTEuNTYiIHgyPSIxNDkuMDYiIHkyPSI5MS41NiIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI2Mi45MyIgeTE9IjkxLjU2IiB4Mj0iNzIuNiIgeTI9IjkxLjU2Ii8+PGxpbmUgY2xhc3M9ImNscy0xMCIgeDE9IjYyLjkzIiB5MT0iODAuNzkiIHgyPSI3Mi42IiB5Mj0iODAuNzkiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNjIuOTMiIHkxPSI5MS41NiIgeDI9IjcyLjYiIHkyPSI5MS41NiIvPjxsaW5lIGNsYXNzPSJjbHMtMTEiIHgxPSI3OS4xNiIgeTE9IjEwMi4zMyIgeDI9IjExNy4yNCIgeTI9IjEwMi4zMyIvPjxsaW5lIGNsYXNzPSJjbHMtMTAiIHgxPSI2Mi45MyIgeTE9IjEwMi4zMyIgeDI9IjcyLjYiIHkyPSIxMDIuMzMiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iMTI1Ljk4IiB5MT0iMTEzLjEiIHgyPSIxNDkuMDYiIHkyPSIxMTMuMSIvPjxsaW5lIGNsYXNzPSJjbHMtMTIiIHgxPSI3OS4xNiIgeTE9IjExMy4xIiB4Mj0iMTE3LjI0IiB5Mj0iMTEzLjEiLz48bGluZSBjbGFzcz0iY2xzLTEwIiB4MT0iNjIuOTMiIHkxPSIxMTMuMSIgeDI9IjcyLjYiIHkyPSIxMTMuMSIvPjwvZz48L2c+PC9zdmc+'",
-        "body": "\nEndpoints that return collections of objects should always apply pagination.\nPaginated collections are always wrapped in the following wrapper object:\n\n```json\n{\n  \"size\": 5421,\n  \"page\": 2,\n  \"pagelen\": 10,\n  \"next\": \"https://api.bitbucket.org/2.0/repositories/pypy/pypy/commits?page=3\",\n  \"previous\": \"https://api.bitbucket.org/2.0/repositories/pypy/pypy/commits?page=1\",\n  \"values\": [\n    ...\n  ]\n}\n```\n\nPagination is often page-bound, with a query parameter page indicating which\npage is to be returned.\n\nHowever, clients are not expected to construct URLs themselves by manipulating\nthe page number query parameter. Instead, the response contains a link to the\nnext page. This link should be treated as an opaque location that is not to be\nconstructed by clients or even assumed to be predictable. The only contract\naround the next link is that it will return the next chunk of results.\n\nLack of a next link in the response indicates the end of the collection.\n\nThe paginated response contains the following fields:\n\n| Field      | Value    |\n|------------|----------|\n| `size`     | Total number of objects in the response. This is an optional element that is not provided in all responses, as it can be expensive to compute. |\n| `page`     | Page number of the current results. This is an optional element that is not provided in all responses. |\n| `pagelen`  | Current number of objects on the existing page. Globally, the minimum length is 10 and the maximum is 100. Some APIs may specify a different default. |\n| `next`     | Link to the next page if it exists. The last page of a collection does not have this value. Use this link to navigate the result set and refrain from constructing your own URLs. |\n| `previous` | Link to previous page if it exists. A collections first page does not have this value. This is an optional element that is not provided in all responses. Some result sets strictly support forward navigation and never provide previous links. Clients must anticipate that backwards navigation is not always available. Use this link to navigate the result set and refrain from constructing your own URLs. |\n| `values`   | The list of objects. This contains at most `pagelen` objects. |\n\nThe link to the next page is included such that you don't have to hardcode or construct any links.  Only values and next are guaranteed (except the last page, which lacks next). This is because the previous and size values can be expensive for some data sets.\n\nIt is important to realize that Bitbucket support both list-based pagination and iterator-based pagination. List-based pagination assumes that the collection is a discrete, immutable, consistently ordered, finite array of objects with a fixed size. Clients navigate a list-based collection by requesting offset-based chunks. In Bitbucket Cloud, list-based responses include the optional size, page, and previous element. The the next and previous links typically resemble something like /foo/bar?page=4.\n\nHowever, not all result sets can be treated as immutable and finite – much like how programming languages tend to distinguish between lists and arrays on one hand and iterators or stream on the other. Where an list-based pagination offers random access into any point in a collection, iterator-based pagination can only navigate forward one element at a time. In Bitbucket such iterator-based pagination contains the next link and pagelen elements, but not necessarily anything else. In these cases, the next link's value often contains an unpredictable hash instead of an explicit page number. The commits resource uses iterator-based pagination.\n"
+        "body": "\nEndpoints that return collections of objects should always apply pagination.\nPaginated collections are always wrapped in the following wrapper object:\n\n```json\n{\n  \"size\": 5421,\n  \"page\": 2,\n  \"pagelen\": 10,\n  \"next\": \"https://api.bitbucket.org/2.0/repositories/pypy/pypy/commits?page=3\",\n  \"previous\": \"https://api.bitbucket.org/2.0/repositories/pypy/pypy/commits?page=1\",\n  \"values\": [\n    ...\n  ]\n}\n```\n\nPagination is often page-bound, with a query parameter page indicating which\npage is to be returned.\n\nHowever, clients are not expected to construct URLs themselves by manipulating\nthe page number query parameter. Instead, the response contains a link to the\nnext page. This link should be treated as an opaque location that is not to be\nconstructed by clients or even assumed to be predictable. The only contract\naround the next link is that it will return the next chunk of results.\n\nLack of a next link in the response indicates the end of the collection.\n\nThe paginated response contains the following fields:\n\n| Field      | Value    |\n|------------|----------|\n| `size`     | Total number of objects in the response. This is an optional element that is not provided in all responses, as it can be expensive to compute. |\n| `page`     | Page number of the current results. This is an optional element that is not provided in all responses. |\n| `pagelen`  | Current number of objects on the existing page. Globally, the minimum length is 10 and the maximum is 100. Some APIs may specify a different default. |\n| `next`     | Link to the next page if it exists. The last page of a collection does not have this value. Use this link to navigate the result set and refrain from constructing your own URLs. |\n| `previous` | Link to previous page if it exists. A collections first page does not have this value. This is an optional element that is not provided in all responses. Some result sets strictly support forward navigation and never provide previous links. Clients must anticipate that backwards navigation is not always available. Use this link to navigate the result set and refrain from constructing your own URLs. |\n| `values`   | The list of objects. This contains at most `pagelen` objects. |\n\nThe link to the next page is included such that you don't have to hardcode or construct any links.  Only values and next are guaranteed (except the last page, which lacks next). This is because the previous and size values can be expensive for some data sets.\n\nIt is important to realize that Bitbucket support both list-based pagination and iterator-based pagination. List-based pagination assumes that the collection is a discrete, immutable, consistently ordered, finite array of objects with a fixed size. Clients navigate a list-based collection by requesting offset-based chunks. In Bitbucket Cloud, list-based responses include the optional size, page, and previous element. The next and previous links typically resemble something like /foo/bar?page=4.\n\nHowever, not all result sets can be treated as immutable and finite – much like how programming languages tend to distinguish between lists and arrays on one hand and iterators or stream on the other. Where an list-based pagination offers random access into any point in a collection, iterator-based pagination can only navigate forward one element at a time. In Bitbucket such iterator-based pagination contains the next link and pagelen elements, but not necessarily anything else. In these cases, the next link's value often contains an unpredictable hash instead of an explicit page number. The commits resource uses iterator-based pagination.\n"
       },
       {
         "anchor": "partial-response",
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index f25cc3b52b..9a9099e5db 100644
--- a/plugins/bitbucket-cloud-common/package.json
+++ b/plugins/bitbucket-cloud-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitbucket-cloud-common",
-  "version": "0.2.24",
+  "version": "0.2.26-next.1",
   "description": "Common functionalities for bitbucket-cloud plugins",
   "backstage": {
     "role": "common-library",
@@ -48,6 +48,6 @@
     "@backstage/cli": "workspace:^",
     "@openapitools/openapi-generator-cli": "^2.4.26",
     "msw": "^1.0.0",
-    "ts-morph": "^22.0.0"
+    "ts-morph": "^24.0.0"
   }
 }
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index 1b4dafde45..07a4438b6e 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,134 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.4.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.4.5
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.4.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 78d3fcedc5..c2f1e3f34b 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-aws",
-  "version": "0.4.3",
+  "version": "0.4.6-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards AWS",
   "backstage": {
     "role": "backend-plugin-module",
@@ -68,7 +68,7 @@
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "p-limit": "^3.0.2",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1"
   },
   "devDependencies": {
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index 64127b2e93..ebb1fe39c4 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,88 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.3.0-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.3.0-next.0
+
+### Minor Changes
+
+- 277092a: Added the Azure Blob Storage as catalog entity provider to import all the desired entities from storage account provided in app-config.yaml
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index 774db39280..389bc1cfc9 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-azure",
-  "version": "0.2.3",
+  "version": "0.3.0-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards Azure",
   "backstage": {
     "role": "backend-plugin-module",
@@ -51,13 +51,14 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
+    "@azure/identity": "^4.0.0",
+    "@azure/storage-blob": "^12.5.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-catalog-common": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-azure/report.api.md b/plugins/catalog-backend-module-azure/report.api.md
index d11197d7f2..60b7ee135b 100644
--- a/plugins/catalog-backend-module-azure/report.api.md
+++ b/plugins/catalog-backend-module-azure/report.api.md
@@ -56,6 +56,6 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
 }
 
 // @public
-const catalogModuleAzureDevOpsEntityProvider: BackendFeature;
-export default catalogModuleAzureDevOpsEntityProvider;
+const catalogModuleAzureEntityProvider: BackendFeature;
+export default catalogModuleAzureEntityProvider;
 ```
diff --git a/plugins/catalog-backend-module-azure/src/lib/azure.ts b/plugins/catalog-backend-module-azure/src/lib/azure.ts
index 3bdff90110..0b0d89c15b 100644
--- a/plugins/catalog-backend-module-azure/src/lib/azure.ts
+++ b/plugins/catalog-backend-module-azure/src/lib/azure.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
 import {
   AzureDevOpsCredentialsProvider,
   AzureIntegrationConfig,
diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
index 32eb190460..9c5d1baef7 100644
--- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts
@@ -17,8 +17,11 @@
 import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api';
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-import { catalogModuleAzureDevOpsEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';
-import { AzureDevOpsEntityProvider } from '../providers';
+import { catalogModuleAzureEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';
+import {
+  AzureBlobStorageEntityProvider,
+  AzureDevOpsEntityProvider,
+} from '../providers';
 
 describe('catalogModuleAzureDevOpsEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
@@ -58,7 +61,7 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       features: [
-        catalogModuleAzureDevOpsEntityProvider,
+        catalogModuleAzureEntityProvider,
         mockServices.rootConfig.factory({ data: config }),
         mockServices.logger.factory(),
         scheduler.factory,
@@ -73,4 +76,63 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
     );
     expect(runner).not.toHaveBeenCalled();
   });
+
+  it('should register azure blob storage provider at the catalog extension point', async () => {
+    let addedProviders: Array<AzureBlobStorageEntityProvider> | undefined;
+    let usedSchedule: SchedulerServiceTaskScheduleDefinition | undefined;
+
+    const extensionPoint = {
+      addEntityProvider: (providers: any) => {
+        addedProviders = providers;
+      },
+    };
+    const runner = jest.fn();
+    const scheduler = mockServices.scheduler.mock({
+      createScheduledTaskRunner(schedule) {
+        usedSchedule = schedule;
+        return { run: runner };
+      },
+    });
+
+    const config = {
+      integrations: {
+        azureBlobStorage: [
+          {
+            accountName: 'test',
+            accountKey: 'test',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          azureBlob: {
+            containerName: 'test',
+            accountName: 'test',
+            schedule: {
+              frequency: 'P1M',
+              timeout: 'PT3M',
+            },
+          },
+        },
+      },
+    };
+
+    await startTestBackend({
+      extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
+      features: [
+        catalogModuleAzureEntityProvider,
+        mockServices.rootConfig.factory({ data: config }),
+        mockServices.logger.factory(),
+        scheduler.factory,
+      ],
+    });
+
+    expect(usedSchedule?.frequency).toEqual({ months: 1 });
+    expect(usedSchedule?.timeout).toEqual({ minutes: 3 });
+    expect(addedProviders?.length).toEqual(1);
+    expect(addedProviders?.pop()?.getProviderName()).toEqual(
+      'azureBlobStorage-provider:default',
+    );
+    expect(runner).not.toHaveBeenCalled();
+  });
 });
diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
index 3aaa1b5b08..cc808292f3 100644
--- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
+++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
@@ -19,16 +19,19 @@ import {
   createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-import { AzureDevOpsEntityProvider } from '../providers';
+import {
+  AzureBlobStorageEntityProvider,
+  AzureDevOpsEntityProvider,
+} from '../providers';
 
 /**
  * Registers the AzureDevOpsEntityProvider with the catalog processing extension point.
  *
  * @public
  */
-export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
+export const catalogModuleAzureEntityProvider = createBackendModule({
   pluginId: 'catalog',
-  moduleId: 'azure-dev-ops-entity-provider',
+  moduleId: 'azure-providers',
   register(env) {
     env.registerInit({
       deps: {
@@ -38,12 +41,25 @@ export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
         scheduler: coreServices.scheduler,
       },
       async init({ config, catalog, logger, scheduler }) {
-        catalog.addEntityProvider(
-          AzureDevOpsEntityProvider.fromConfig(config, {
-            logger,
-            scheduler,
-          }),
-        );
+        // Check for Azure Blob Storage provider configuration and register it
+        if (config.has('catalog.providers.azureBlob')) {
+          catalog.addEntityProvider(
+            AzureBlobStorageEntityProvider.fromConfig(config, {
+              logger,
+              scheduler,
+            }),
+          );
+        }
+
+        // Check for Azure DevOps provider configuration and register it
+        if (config.has('catalog.providers.azureDevOps')) {
+          catalog.addEntityProvider(
+            AzureDevOpsEntityProvider.fromConfig(config, {
+              logger,
+              scheduler,
+            }),
+          );
+        }
       },
     });
   },
diff --git a/plugins/catalog-backend-module-azure/src/module/index.ts b/plugins/catalog-backend-module-azure/src/module/index.ts
index 329ad604e2..6e560cf17f 100644
--- a/plugins/catalog-backend-module-azure/src/module/index.ts
+++ b/plugins/catalog-backend-module-azure/src/module/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { catalogModuleAzureDevOpsEntityProvider as default } from './catalogModuleAzureDevOpsEntityProvider';
+export { catalogModuleAzureEntityProvider as default } from './catalogModuleAzureDevOpsEntityProvider';
diff --git a/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.test.ts b/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.test.ts
new file mode 100644
index 0000000000..62b635d26e
--- /dev/null
+++ b/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.test.ts
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  SchedulerService,
+  SchedulerServiceTaskRunner,
+  SchedulerServiceTaskInvocationDefinition,
+} from '@backstage/backend-plugin-api';
+import { ConfigReader } from '@backstage/config';
+import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
+import { AzureBlobStorageEntityProvider } from './AzureBlobStorageEntityProvider';
+import { mockServices } from '@backstage/backend-test-utils';
+
+class PersistingTaskRunner implements SchedulerServiceTaskRunner {
+  private tasks: SchedulerServiceTaskInvocationDefinition[] = [];
+
+  getTasks() {
+    return this.tasks;
+  }
+
+  run(task: SchedulerServiceTaskInvocationDefinition): Promise<void> {
+    this.tasks.push(task);
+    return Promise.resolve(undefined);
+  }
+}
+
+const blobs = ['key1.yaml', 'key2.yaml', 'key3.yaml', 'key4.yaml'];
+const createBlobList = (blobsArray: string[]) => {
+  return blobsArray.map(blob => ({
+    name: blob,
+  }));
+};
+// Mocking Azure Storage Blob Library
+jest.mock('@azure/storage-blob', () => {
+  return {
+    BlobServiceClient: jest.fn().mockImplementation(() => ({
+      url: 'https://myaccount.blob.core.windows.net/',
+      getContainerClient: jest.fn().mockImplementation(() => ({
+        // eslint-disable-next-line func-names
+        listBlobsFlat: jest.fn(async function* () {
+          yield* createBlobList(blobs);
+        }),
+      })),
+    })),
+  };
+});
+
+const logger = mockServices.logger.mock();
+
+describe('AzureBlobStorageEntityProvider', () => {
+  const containerName = 'container-1';
+  const accountName = 'myaccount';
+  const expectMutation = async (
+    providerId: string,
+    providerConfig: object,
+    expectedBaseUrl: string,
+    integrationConfig?: object,
+    scheduleInConfig?: boolean,
+  ) => {
+    const config = new ConfigReader({
+      integrations: {
+        azureBlobStorage: integrationConfig ? [integrationConfig] : [],
+      },
+      catalog: {
+        providers: {
+          azureBlob: {
+            [providerId]: providerConfig,
+          },
+        },
+      },
+    });
+
+    const schedulingConfig: Record<string, any> = {};
+    const normalizedExpectedBaseUrl = expectedBaseUrl.endsWith('/')
+      ? expectedBaseUrl
+      : `${expectedBaseUrl}/`;
+    const schedule = new PersistingTaskRunner();
+    const entityProviderConnection: EntityProviderConnection = {
+      applyMutation: jest.fn(),
+      refresh: jest.fn(),
+    };
+
+    if (scheduleInConfig) {
+      schedulingConfig.scheduler = {
+        createScheduledTaskRunner: (_: any) => schedule,
+      } as unknown as SchedulerService;
+    } else {
+      schedulingConfig.schedule = schedule;
+    }
+
+    const provider = AzureBlobStorageEntityProvider.fromConfig(config, {
+      ...schedulingConfig,
+      logger,
+    })[0];
+
+    expect(provider.getProviderName()).toEqual(
+      `azureBlobStorage-provider:${providerId}`,
+    );
+
+    try {
+      await provider.connect(entityProviderConnection);
+    } catch (error) {
+      console.error('Error during provider connection:', error);
+    }
+
+    const taskDef = schedule.getTasks()[0];
+    expect(taskDef.id).toEqual(
+      `azureBlobStorage-provider:${providerId}:refresh`,
+    );
+
+    await (taskDef.fn as () => Promise<void>)();
+
+    const expectedEntities = blobs.map(blob => {
+      const url = encodeURI(`${normalizedExpectedBaseUrl}${blob}`);
+      return {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${url}`,
+              'backstage.io/managed-by-origin-location': `url:${url}`,
+            },
+            name: expect.stringMatching(/generated-[a-f0-9]{40}/),
+          },
+          spec: {
+            presence: 'required',
+            target: `${url}`,
+            type: 'url',
+          },
+        },
+        locationKey: `azureBlobStorage-provider:${providerId}`,
+      };
+    });
+
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: expectedEntities,
+    });
+  };
+
+  // eslint-disable-next-line jest/expect-expect
+  it('apply full update on scheduled execution', async () => {
+    return expectMutation(
+      'staticContainer',
+      {
+        containerName,
+        accountName,
+      },
+      'https://myaccount.blob.core.windows.net/container-1/',
+      {
+        accountName: 'myaccount',
+      },
+    );
+  });
+
+  // eslint-disable-next-line jest/expect-expect
+  it('apply full update no prefix', async () => {
+    return expectMutation(
+      'staticContainerNoPrefix',
+      {
+        containerName,
+        accountName,
+        schedule: {
+          frequency: { minutes: 30 },
+          timeout: { minutes: 3 },
+        },
+      },
+      'https://myaccount.blob.core.windows.net/container-1/',
+      {
+        host: 'blob.core.windows.net',
+        accountName: 'myaccount',
+      },
+    );
+  });
+
+  it('fail without schedule and scheduler', () => {
+    const config = new ConfigReader({
+      catalog: {
+        providers: {
+          azureBlob: {
+            test: {
+              accountName: 'myaccount',
+              containerName: 'container-1',
+              prefix: 'sub/dir/',
+            },
+          },
+        },
+      },
+    });
+
+    expect(() =>
+      AzureBlobStorageEntityProvider.fromConfig(config, {
+        logger,
+      }),
+    ).toThrow('Either schedule or scheduler must be provided');
+  });
+
+  it('fail with scheduler but no schedule config', () => {
+    const scheduler = {
+      createScheduledTaskRunner: (_: any) => jest.fn(),
+    } as unknown as SchedulerService;
+    const config = new ConfigReader({
+      catalog: {
+        providers: {
+          azureBlob: {
+            test: {
+              containerName: 'container-1',
+              prefix: 'sub/dir/',
+              accountName: 'myaccount',
+            },
+          },
+        },
+      },
+    });
+
+    expect(() =>
+      AzureBlobStorageEntityProvider.fromConfig(config, {
+        logger,
+        scheduler,
+      }),
+    ).toThrow(
+      'No schedule provided neither via code nor config for AzureBlobStorageEntityProvider:test.',
+    );
+  });
+});
diff --git a/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.ts b/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.ts
new file mode 100644
index 0000000000..ae2fbcb3ff
--- /dev/null
+++ b/plugins/catalog-backend-module-azure/src/providers/AzureBlobStorageEntityProvider.ts
@@ -0,0 +1,241 @@
+/*
+ * 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 {
+  AnonymousCredential,
+  BlobServiceClient,
+  ContainerClient,
+  StorageSharedKeyCredential,
+} from '@azure/storage-blob';
+import { Config } from '@backstage/config';
+import {
+  LoggerService,
+  SchedulerService,
+  SchedulerServiceTaskRunner,
+} from '@backstage/backend-plugin-api';
+import {
+  EntityProvider,
+  EntityProviderConnection,
+  locationSpecToLocationEntity,
+} from '@backstage/plugin-catalog-node';
+import { LocationSpec } from '@backstage/plugin-catalog-common';
+import * as uuid from 'uuid';
+import { readAzureBlobStorageConfigs } from './config';
+import {
+  AzureBlobStorageIntergation,
+  DefaultAzureCredentialsManager,
+  ScmIntegrations,
+} from '@backstage/integration';
+import { TokenCredential } from '@azure/identity';
+import { AzureBlobStorageConfig } from './types';
+
+/**
+ * Provider which discovers catalog files within an Azure Storage accounts.
+ *
+ * Use `AzureBlobStorageEntityProvider.fromConfig(...)` to create instances.
+ *
+ * @public
+ */
+export class AzureBlobStorageEntityProvider implements EntityProvider {
+  private readonly logger: LoggerService;
+  private connection?: EntityProviderConnection;
+  private blobServiceClient?: BlobServiceClient;
+  private readonly scheduleFn: () => Promise<void>;
+
+  static fromConfig(
+    configRoot: Config,
+    options: {
+      logger: LoggerService;
+      schedule?: SchedulerServiceTaskRunner;
+      scheduler?: SchedulerService;
+    },
+  ): AzureBlobStorageEntityProvider[] {
+    const providerConfigs = readAzureBlobStorageConfigs(configRoot);
+
+    const scmIntegration = ScmIntegrations.fromConfig(configRoot);
+    const credentialsProvider =
+      DefaultAzureCredentialsManager.fromIntegrations(scmIntegration);
+    if (!options.schedule && !options.scheduler) {
+      throw new Error('Either schedule or scheduler must be provided.');
+    }
+
+    return providerConfigs.map(providerConfig => {
+      const integration = scmIntegration.azureBlobStorage
+        .list()
+        .filter(
+          azureIntegration =>
+            azureIntegration.config.accountName === providerConfig.accountName,
+        )[0];
+
+      if (!options.schedule && !providerConfig.schedule) {
+        throw new Error(
+          `No schedule provided neither via code nor config for AzureBlobStorageEntityProvider:${providerConfig.id}.`,
+        );
+      }
+
+      if (!integration) {
+        throw new Error(
+          `There is no Azure blob storage integration for account. Please add a configuration entry for it under integrations.azureBlobStorage`,
+        );
+      }
+
+      const taskRunner =
+        options.schedule ??
+        options.scheduler!.createScheduledTaskRunner(providerConfig.schedule!);
+
+      return new AzureBlobStorageEntityProvider(
+        providerConfig,
+        integration,
+        credentialsProvider,
+        options.logger,
+        taskRunner,
+      );
+    });
+  }
+  private constructor(
+    private readonly config: AzureBlobStorageConfig,
+    private readonly integration: AzureBlobStorageIntergation,
+    private readonly credentialsProvider: DefaultAzureCredentialsManager,
+    logger: LoggerService,
+    schedule: SchedulerServiceTaskRunner,
+  ) {
+    this.logger = logger.child({ target: this.getProviderName() });
+    this.scheduleFn = this.createScheduleFn(schedule);
+  }
+
+  private createScheduleFn(
+    taskRunner: SchedulerServiceTaskRunner,
+  ): () => Promise<void> {
+    return async () => {
+      const taskId = `${this.getProviderName()}:refresh`;
+      return taskRunner.run({
+        id: taskId,
+        fn: async () => {
+          const logger = this.logger.child({
+            class: AzureBlobStorageEntityProvider.prototype.constructor.name,
+            taskId,
+            taskInstanceId: uuid.v4(),
+          });
+
+          try {
+            await this.refresh(logger);
+          } catch (error) {
+            logger.error(
+              `${this.getProviderName()} refresh failed, ${error}`,
+              error,
+            );
+          }
+        },
+      });
+    };
+  }
+
+  getProviderName(): string {
+    return `azureBlobStorage-provider:${this.config.id}`;
+  }
+
+  async connect(connection: EntityProviderConnection): Promise<void> {
+    this.connection = connection;
+    let credential:
+      | TokenCredential
+      | StorageSharedKeyCredential
+      | AnonymousCredential;
+    if (this.integration.config.accountKey) {
+      credential = new StorageSharedKeyCredential(
+        this.integration.config.accountName as string,
+        this.integration.config.accountKey as string,
+      ); // StorageSharedKeyCredential is only allowed in node.js runtime not in browser
+    } else {
+      credential = await this.credentialsProvider.getCredentials(
+        this.integration.config.accountName as string,
+      );
+    }
+    let blobServiceClientUrl: string;
+
+    if (this.integration.config.endpoint) {
+      if (this.integration.config.sasToken) {
+        blobServiceClientUrl = `${this.integration.config.endpoint}?${this.integration.config.sasToken}`;
+      } else {
+        blobServiceClientUrl = `${this.integration.config.endpoint}`;
+      }
+    } else {
+      blobServiceClientUrl = `https://${this.integration.config.accountName}.${this.integration.config.host}`;
+    }
+
+    this.blobServiceClient = new BlobServiceClient(
+      blobServiceClientUrl,
+      credential,
+    );
+    await this.scheduleFn();
+  }
+
+  async refresh(logger: LoggerService) {
+    if (!this.connection) {
+      throw new Error('Not initialized');
+    }
+
+    logger.info('Discovering Azure Blob Storage blobs');
+
+    const keys = await this.listAllBlobKeys();
+    logger.info(`Discovered ${keys.length} Azure Blob Storage blobs`);
+
+    const locations = keys.map(key => this.createLocationSpec(key));
+
+    await this.connection.applyMutation({
+      type: 'full',
+      entities: locations.map(location => {
+        return {
+          locationKey: this.getProviderName(),
+          entity: locationSpecToLocationEntity({ location }),
+        };
+      }),
+    });
+
+    logger.info(
+      `Committed ${locations.length} Locations for Azure Blob Storage blobs`,
+    );
+  }
+
+  private async listAllBlobKeys(): Promise<string[]> {
+    const keys: string[] = [];
+    const containerClient = this.blobServiceClient?.getContainerClient(
+      this.config.containerName,
+    );
+
+    for await (const blob of (
+      containerClient as ContainerClient
+    ).listBlobsFlat()) {
+      if (blob.name) {
+        keys.push(blob.name);
+      }
+    }
+
+    return keys;
+  }
+
+  private createLocationSpec(key: string): LocationSpec {
+    return {
+      type: 'url',
+      target: this.createObjectUrl(key),
+      presence: 'required',
+    };
+  }
+
+  private createObjectUrl(key: string): string {
+    const endpoint = this.blobServiceClient?.url;
+    return `${endpoint}${this.config.containerName}/${key}`;
+  }
+}
diff --git a/plugins/catalog-backend-module-azure/src/providers/config.test.ts b/plugins/catalog-backend-module-azure/src/providers/config.test.ts
index 5d5ae930c1..78ed559749 100644
--- a/plugins/catalog-backend-module-azure/src/providers/config.test.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/config.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { ConfigReader } from '@backstage/config';
-import { readAzureDevOpsConfigs } from './config';
+import { readAzureBlobStorageConfigs, readAzureDevOpsConfigs } from './config';
 
 describe('readAzureDevOpsConfigs', () => {
   it('reads all provider configs and set default values', () => {
@@ -106,3 +106,74 @@ describe('readAzureDevOpsConfigs', () => {
     });
   });
 });
+
+describe('readAzureBlobStorageConfigs', () => {
+  it('reads single and multiple Azure Blob Storage provider configs', () => {
+    const provider1 = {
+      accountName: 'account-1',
+      containerName: 'container-1',
+      schedule: {
+        frequency: 'PT30M',
+        timeout: {
+          minutes: 3,
+        },
+      },
+    };
+    const provider2 = {
+      accountName: 'account-1',
+      containerName: 'container-2',
+    };
+
+    const configSingle = {
+      catalog: {
+        providers: {
+          azureBlob: provider2,
+        },
+      },
+    };
+
+    const configMulti = {
+      catalog: {
+        providers: {
+          azureBlob: {
+            provider1,
+            provider2,
+          },
+        },
+      },
+    };
+
+    // Single provider case
+    const actualSingle = readAzureBlobStorageConfigs(
+      new ConfigReader(configSingle),
+    );
+    expect(actualSingle).toHaveLength(1);
+    expect(actualSingle[0]).toEqual({
+      id: 'default',
+      accountName: 'account-1',
+      containerName: 'container-2',
+      schedule: undefined, // no schedule provided in this case
+    });
+
+    // Multiple providers case
+    const actualMulti = readAzureBlobStorageConfigs(
+      new ConfigReader(configMulti),
+    );
+    expect(actualMulti).toHaveLength(2);
+    expect(actualMulti[0]).toEqual({
+      id: 'provider1',
+      accountName: 'account-1',
+      containerName: 'container-1',
+      schedule: {
+        ...provider1.schedule,
+        frequency: { minutes: 30 },
+      },
+    });
+    expect(actualMulti[1]).toEqual({
+      id: 'provider2',
+      accountName: 'account-1',
+      containerName: 'container-2',
+      schedule: undefined, // no schedule provided
+    });
+  });
+});
diff --git a/plugins/catalog-backend-module-azure/src/providers/config.ts b/plugins/catalog-backend-module-azure/src/providers/config.ts
index 17616b06bc..8ec1cbfb1b 100644
--- a/plugins/catalog-backend-module-azure/src/providers/config.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/config.ts
@@ -16,7 +16,9 @@
 
 import { readSchedulerServiceTaskScheduleDefinitionFromConfig } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
-import { AzureDevOpsConfig } from './types';
+import { AzureDevOpsConfig, AzureBlobStorageConfig } from './types';
+
+const DEFAULT_PROVIDER_ID = 'default';
 
 export function readAzureDevOpsConfigs(config: Config): AzureDevOpsConfig[] {
   const configs: AzureDevOpsConfig[] = [];
@@ -61,3 +63,52 @@ function readAzureDevOpsConfig(id: string, config: Config): AzureDevOpsConfig {
     schedule,
   };
 }
+
+export function readAzureBlobStorageConfigs(
+  config: Config,
+): AzureBlobStorageConfig[] {
+  const configs: AzureBlobStorageConfig[] = [];
+
+  const providerConfigs = config.getOptionalConfig(
+    'catalog.providers.azureBlob',
+  );
+
+  if (!providerConfigs) {
+    return configs;
+  }
+
+  if (providerConfigs.has('containerName')) {
+    // simple/single config variant
+    configs.push(
+      readAzureBlobStorageConfig(DEFAULT_PROVIDER_ID, providerConfigs),
+    );
+
+    return configs;
+  }
+
+  for (const id of providerConfigs.keys()) {
+    configs.push(readAzureBlobStorageConfig(id, providerConfigs.getConfig(id)));
+  }
+
+  return configs;
+}
+
+function readAzureBlobStorageConfig(
+  id: string,
+  config: Config,
+): AzureBlobStorageConfig {
+  const containerName = config.getString('containerName');
+  const accountName = config.getString('accountName');
+  const schedule = config.has('schedule')
+    ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
+        config.getConfig('schedule'),
+      )
+    : undefined;
+
+  return {
+    id,
+    containerName,
+    accountName,
+    schedule,
+  };
+}
diff --git a/plugins/catalog-backend-module-azure/src/providers/index.ts b/plugins/catalog-backend-module-azure/src/providers/index.ts
index 450fc0af27..5c9616e162 100644
--- a/plugins/catalog-backend-module-azure/src/providers/index.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { AzureDevOpsEntityProvider } from './AzureDevOpsEntityProvider';
+export { AzureBlobStorageEntityProvider } from './AzureBlobStorageEntityProvider';
diff --git a/plugins/catalog-backend-module-azure/src/providers/types.ts b/plugins/catalog-backend-module-azure/src/providers/types.ts
index 5ca9dc94dc..e296d50ca7 100644
--- a/plugins/catalog-backend-module-azure/src/providers/types.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/types.ts
@@ -26,3 +26,10 @@ export type AzureDevOpsConfig = {
   path: string;
   schedule?: SchedulerServiceTaskScheduleDefinition;
 };
+
+export type AzureBlobStorageConfig = {
+  id: string;
+  containerName: string;
+  accountName: string;
+  schedule?: SchedulerServiceTaskScheduleDefinition;
+};
diff --git a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
index fa293c851a..c7e9b52de4 100644
--- a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @backstage/plugin-catalog-backend-module-backstage-openapi
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.4.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## 0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-backstage-openapi/package.json b/plugins/catalog-backend-module-backstage-openapi/package.json
index f1871ee277..191e1567d7 100644
--- a/plugins/catalog-backend-module-backstage-openapi/package.json
+++ b/plugins/catalog-backend-module-backstage-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-backstage-openapi",
-  "version": "0.4.1",
+  "version": "0.4.3-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
@@ -42,7 +42,7 @@
     "cross-fetch": "^4.0.0",
     "lodash": "^4.17.21",
     "openapi-merge": "^1.3.2",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 67a7ddab0f..082ba8461e 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,128 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.4.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- f6b4b8a: Implemented discovery on project-level to shift Bitbucket Cloud API limits
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.4.2-next.3
+
+### Patch Changes
+
+- f6b4b8a: Implemented discovery on project-level to shift Bitbucket Cloud API limits
+- Updated dependencies
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 58e0d7e7b0..73bbf48ffd 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
-  "version": "0.4.0",
+  "version": "0.4.3-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
   "backstage": {
     "role": "backend-plugin-module",
@@ -60,7 +60,7 @@
     "@backstage/plugin-catalog-common": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-events-node": "workspace:^",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.test.ts
index aa00f937d8..489578e853 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.test.ts
@@ -312,6 +312,22 @@ describe('BitbucketCloudEntityProvider', () => {
     );
 
     server.use(
+      rest.get(
+        `https://api.bitbucket.org/2.0/workspaces/test-ws/projects`,
+        (_req, res, ctx) => {
+          const response = {
+            values: [
+              {
+                key: 'TEST',
+              },
+              {
+                key: 'TEST2',
+              },
+            ],
+          };
+          return res(ctx.json(response));
+        },
+      ),
       rest.get(
         `https://api.bitbucket.org/2.0/workspaces/test-ws/search/code`,
         (_req, res, ctx) => {
@@ -447,6 +463,27 @@ describe('BitbucketCloudEntityProvider', () => {
         },
         locationKey: 'bitbucketCloud-provider:myProvider',
       },
+      {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${url}`,
+              'backstage.io/managed-by-origin-location': `url:${url}`,
+              'bitbucket.org/repo-url':
+                'https://bitbucket.org/test-ws/test-repo2',
+            },
+            name: 'generated-7c2e6263b6cc2d14e69fd4d029afba601ad6dc3b',
+          },
+          spec: {
+            presence: 'required',
+            target: `${url}`,
+            type: 'url',
+          },
+        },
+        locationKey: 'bitbucketCloud-provider:myProvider',
+      },
     ];
 
     expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
@@ -505,11 +542,31 @@ describe('BitbucketCloudEntityProvider', () => {
     })[0];
 
     server.use(
+      rest.get(
+        `https://api.bitbucket.org/2.0/workspaces/test-ws/projects`,
+        (_req, res, ctx) => {
+          const response = {
+            values: [
+              {
+                key: 'TEST',
+              },
+              {
+                key: 'TEST2',
+              },
+            ],
+          };
+          return res(ctx.json(response));
+        },
+      ),
       rest.get(
         `https://api.bitbucket.org/2.0/workspaces/test-ws/search/code`,
         (req, res, ctx) => {
           const query = req.url.searchParams.get('search_query');
-          if (!query || !query.includes('repo:test-repo')) {
+          if (
+            !query ||
+            !query.includes('repo:test-repo') ||
+            !query.includes('project:TEST')
+          ) {
             return res(ctx.json({ values: [] }));
           }
 
@@ -586,6 +643,10 @@ describe('BitbucketCloudEntityProvider', () => {
         entity: addedModule,
         locationKey: 'bitbucketCloud-provider:myProvider',
       },
+      {
+        entity: addedModule,
+        locationKey: 'bitbucketCloud-provider:myProvider',
+      },
     ];
     const removedEntities = [
       {
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.ts
index b439f391ca..6c2de0ac10 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.ts
@@ -323,6 +323,28 @@ export class BitbucketCloudEntityProvider implements EntityProvider {
       catalogPath.lastIndexOf('/') + 1,
     );
 
+    const optRepoFilter = repoSlug ? ` repo:${repoSlug}` : '';
+    const query = `"${catalogFilename}" path:${catalogPath}${optRepoFilter}`;
+
+    const projects = this.client
+      .listProjectsByWorkspace(workspace)
+      .iterateResults();
+
+    let results: IngestionTarget[] = [];
+
+    for await (const project of projects) {
+      const projectQuery = `${query} project:${project.key}`;
+      const result = await this.processQuery(workspace, projectQuery);
+      results = results.concat(result);
+    }
+
+    return results;
+  }
+
+  private async processQuery(
+    workspace: string,
+    query: string,
+  ): Promise<IngestionTarget[]> {
     // load all fields relevant for creating refs later, but not more
     const fields = [
       // exclude code/content match details
@@ -338,8 +360,7 @@ export class BitbucketCloudEntityProvider implements EntityProvider {
       // ...except the one we need
       '+values.file.commit.repository.links.html.href',
     ].join(',');
-    const optRepoFilter = repoSlug ? ` repo:${repoSlug}` : '';
-    const query = `"${catalogFilename}" path:${catalogPath}${optRepoFilter}`;
+
     const searchResults = this.client
       .searchCode(workspace, query, { fields })
       .iterateResults();
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index e9e6d2733c..d7318f53ea 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,95 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.3.0-next.2
+
+### Minor Changes
+
+- 3f34ea9: Throttles Bitbucket Server API calls
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 2b822b9a37..f82a7bba16 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-server",
-  "version": "0.2.3",
+  "version": "0.3.0-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
@@ -56,9 +56,8 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
-    "@types/node-fetch": "^2.5.12",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "p-throttle": "^4.1.1",
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-bitbucket-server/report.api.md b/plugins/catalog-backend-module-bitbucket-server/report.api.md
index b2a0a9368a..0da9b78139 100644
--- a/plugins/catalog-backend-module-bitbucket-server/report.api.md
+++ b/plugins/catalog-backend-module-bitbucket-server/report.api.md
@@ -11,7 +11,6 @@ import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { LocationSpec } from '@backstage/plugin-catalog-node';
 import { LoggerService } from '@backstage/backend-plugin-api';
-import { Response as Response_2 } from 'node-fetch';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 
@@ -27,7 +26,7 @@ export class BitbucketServerClient {
     projectKey: string;
     repo: string;
     path: string;
-  }): Promise<Response_2>;
+  }): Promise<Response>;
   // (undocumented)
   getRepository(options: {
     projectKey: string;
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts b/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
index b5baf66afd..73373ffff1 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.ts
@@ -14,12 +14,24 @@
  * limitations under the License.
  */
 
-import fetch, { Request, Response } from 'node-fetch';
 import {
   BitbucketServerIntegrationConfig,
   getBitbucketServerRequestOptions,
 } from '@backstage/integration';
 import { BitbucketServerProject, BitbucketServerRepository } from './types';
+import pThrottle from 'p-throttle';
+
+// 1 per second
+const throttle = pThrottle({
+  limit: 1,
+  interval: 1000,
+});
+
+const throttledFetch = throttle(
+  async (url: RequestInfo, options?: RequestInit) => {
+    return await fetch(url, options);
+  },
+);
 
 /**
  * A client for interacting with a Bitbucket Server instance
@@ -66,7 +78,7 @@ export class BitbucketServerClient {
     path: string;
   }): Promise<Response> {
     const base = new URL(this.config.apiBaseUrl);
-    return fetch(
+    return throttledFetch(
       `${base.protocol}//${base.host}/projects/${options.projectKey}/repos/${options.repo}/raw/${options.path}`,
       getBitbucketServerRequestOptions(this.config),
     );
@@ -77,7 +89,7 @@ export class BitbucketServerClient {
     repo: string;
   }): Promise<BitbucketServerRepository> {
     const request = `${this.config.apiBaseUrl}/projects/${options.projectKey}/repos/${options.repo}`;
-    const response = await fetch(
+    const response = await throttledFetch(
       request,
       getBitbucketServerRequestOptions(this.config),
     );
@@ -118,16 +130,17 @@ export class BitbucketServerClient {
   }
 
   private async request(req: Request): Promise<Response> {
-    return fetch(req, getBitbucketServerRequestOptions(this.config)).then(
-      (response: Response) => {
-        if (!response.ok) {
-          throw new Error(
-            `Unexpected response for ${req.method} ${req.url}. Expected 200 but got ${response.status} - ${response.statusText}`,
-          );
-        }
-        return response;
-      },
-    );
+    return throttledFetch(
+      req,
+      getBitbucketServerRequestOptions(this.config),
+    ).then((response: Response) => {
+      if (!response.ok) {
+        throw new Error(
+          `Unexpected response for ${req.method} ${req.url}. Expected 200 but got ${response.status} - ${response.statusText}`,
+        );
+      }
+      return response;
+    });
   }
 }
 
diff --git a/plugins/catalog-backend-module-gcp/CHANGELOG.md b/plugins/catalog-backend-module-gcp/CHANGELOG.md
index 87ebc0ca24..b8d319592e 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/plugin-catalog-backend-module-gcp
 
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index a54c852f2c..be2f0ba442 100644
--- a/plugins/catalog-backend-module-gcp/package.json
+++ b/plugins/catalog-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gcp",
-  "version": "0.3.1",
+  "version": "0.3.3-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards GCP",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 7249493452..2801831552 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,84 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index cf549decc8..b2c35e14b4 100644
--- a/plugins/catalog-backend-module-gerrit/package.json
+++ b/plugins/catalog-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gerrit",
-  "version": "0.2.3",
+  "version": "0.2.5-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
@@ -53,8 +53,7 @@
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "fs-extra": "^11.2.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
index bd03b90c52..2bd5b4e3ce 100644
--- a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
+++ b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
@@ -22,7 +22,6 @@ import {
   LocationSpec,
   locationSpecToLocationEntity,
 } from '@backstage/plugin-catalog-node';
-import fetch, { Response } from 'node-fetch';
 import {
   GerritIntegration,
   getGerritProjectsApiUrl,
diff --git a/plugins/catalog-backend-module-github-org/CHANGELOG.md b/plugins/catalog-backend-module-github-org/CHANGELOG.md
index de0b0d8e6f..782f70896a 100644
--- a/plugins/catalog-backend-module-github-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github-org/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-catalog-backend-module-github-org
 
+## 0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend-module-github@0.7.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend-module-github@0.7.7
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.3.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.7.7-next.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github-org/package.json b/plugins/catalog-backend-module-github-org/package.json
index 3350b8acc5..802b960a83 100644
--- a/plugins/catalog-backend-module-github-org/package.json
+++ b/plugins/catalog-backend-module-github-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github-org",
-  "version": "0.3.2",
+  "version": "0.3.5-next.2",
   "description": "The github-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index aeae05c013..a78b623ca4 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,129 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.7.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.7.8-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.7.8-next.0
+
+### Patch Changes
+
+- 468bbcc: Pass in a default schedule to the `GithubEntityProvider` if none is provided
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.7.7
+
+### Patch Changes
+
+- 9790c02: Fixed an issue in `GithubOrgEntityProvider` that caused an error when processing teams without a parent.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.7.7-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.7.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.7.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.7.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.7.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index ea8c7cefe3..511c4019af 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
-  "version": "0.7.5",
+  "version": "0.7.8-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
   "backstage": {
     "role": "backend-plugin-module",
@@ -66,15 +66,14 @@
     "git-url-parse": "^15.0.0",
     "lodash": "^4.17.21",
     "minimatch": "^9.0.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@types/lodash": "^4.14.151",
     "luxon": "^3.0.0",
-    "msw": "^1.0.0"
+    "msw": "^2.0.0"
   },
   "configSchema": "config.d.ts"
 }
diff --git a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
index 29c8cbc66d..d3be18f489 100644
--- a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
+++ b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
@@ -39,7 +39,7 @@ import {
   mockServices,
 } from '@backstage/backend-test-utils';
 import { setupServer } from 'msw/node';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { ConfigReader } from '@backstage/config';
 
 const server = setupServer();
@@ -67,10 +67,9 @@ describe('GithubLocationAnalyzer', () => {
 
   beforeEach(() => {
     server.use(
-      rest.post('http://localhost:7007/locations', async (_, res, ctx) => {
-        return res(
-          ctx.status(201),
-          ctx.json({
+      http.post('http://localhost:7007/locations', () =>
+        HttpResponse.json(
+          {
             location: 'test',
             exists: false,
             entities: [
@@ -100,9 +99,10 @@ describe('GithubLocationAnalyzer', () => {
                 },
               },
             ],
-          }),
-        );
-      }),
+          },
+          { status: 201 },
+        ),
+      ),
     );
 
     octokit.repos.get.mockResolvedValue({
diff --git a/plugins/catalog-backend-module-github/src/lib/github.test.ts b/plugins/catalog-backend-module-github/src/lib/github.test.ts
index 9eae9e1161..cbe8d8c525 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.test.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.test.ts
@@ -17,7 +17,7 @@
 import { registerMswTestHooks } from '@backstage/backend-test-utils';
 import { GroupEntity, UserEntity } from '@backstage/catalog-model';
 import { graphql as graphqlOctokit } from '@octokit/graphql';
-import { graphql as graphqlMsw } from 'msw';
+import { graphql as graphqlMsw, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import { TeamTransformer, UserTransformer } from './defaultTransformers';
 import {
@@ -33,14 +33,13 @@ import {
   createRemoveEntitiesOperation,
   createReplaceEntitiesOperation,
 } from './github';
-import fetch from 'node-fetch';
 
 describe('github', () => {
-  const graphql = graphqlOctokit.defaults({ request: { fetch } });
-
   const server = setupServer();
   registerMswTestHooks(server);
 
+  const graphql = graphqlOctokit.defaults({});
+
   describe('getOrganizationUsers using defaultUserMapper', () => {
     it('reads members', async () => {
       const input: QueryResponse = {
@@ -73,7 +72,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('users', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('users', () => HttpResponse.json({ data: input })),
       );
 
       await expect(
@@ -136,7 +135,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('users', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('users', () => HttpResponse.json({ data: input })),
       );
 
       await expect(
@@ -180,7 +179,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('users', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('users', () => HttpResponse.json({ data: input })),
       );
 
       const users = await getOrganizationUsers(
@@ -255,7 +254,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('teams', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('teams', () => HttpResponse.json({ data: input })),
       );
 
       await expect(getOrganizationTeams(graphql, 'a')).resolves.toEqual(output);
@@ -355,7 +354,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('teams', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('teams', () => HttpResponse.json({ data: input })),
       );
 
       await expect(
@@ -435,7 +434,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('teams', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('teams', () => HttpResponse.json({ data: input })),
       );
 
       const teams = await getOrganizationTeams(
@@ -471,7 +470,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('orgs', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('orgs', () => HttpResponse.json({ data: input })),
       );
 
       await expect(getOrganizationsFromUser(graphql, 'foo')).resolves.toEqual({
@@ -500,7 +499,7 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('members', (_req, res, ctx) => res(ctx.data(input))),
+        graphqlMsw.query('members', () => HttpResponse.json({ data: input })),
       );
 
       await expect(getTeamMembers(graphql, 'a', 'b')).resolves.toEqual(output);
@@ -587,8 +586,8 @@ describe('github', () => {
       };
 
       server.use(
-        graphqlMsw.query('repositories', (_req, res, ctx) =>
-          res(ctx.data(input)),
+        graphqlMsw.query('repositories', () =>
+          HttpResponse.json({ data: input }),
         ),
       );
 
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
index 624deaa38e..b7df19c296 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
@@ -621,22 +621,6 @@ describe('GithubEntityProvider', () => {
     ).toThrow('Either schedule or scheduler must be provided');
   });
 
-  it('fail with scheduler but no schedule config', () => {
-    const scheduler = {
-      createScheduledTaskRunner: (_: any) => jest.fn(),
-    } as unknown as SchedulerService;
-    const config = createSingleProviderConfig();
-
-    expect(() =>
-      GithubEntityProvider.fromConfig(config, {
-        logger,
-        scheduler,
-      }),
-    ).toThrow(
-      'No schedule provided neither via code nor config for github-provider:myProvider',
-    );
-  });
-
   it('single simple provider config with schedule in config', async () => {
     const schedule = new PersistingTaskRunner();
     const scheduler = {
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
index 5c6dc75e48..a18846b157 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
@@ -126,12 +126,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
         );
       }
 
-      if (!options.schedule && !providerConfig.schedule) {
-        throw new Error(
-          `No schedule provided neither via code nor config for github-provider:${providerConfig.id}.`,
-        );
-      }
-
       const taskRunner =
         options.schedule ??
         options.scheduler!.createScheduledTaskRunner(providerConfig.schedule!);
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
index 296cbc12df..d00cbc888c 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
@@ -15,7 +15,10 @@
  */
 
 import { ConfigReader } from '@backstage/config';
-import { readProviderConfigs } from './GithubEntityProviderConfig';
+import {
+  readProviderConfigs,
+  DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
+} from './GithubEntityProviderConfig';
 
 describe('readProviderConfigs', () => {
   afterEach(() => jest.resetAllMocks());
@@ -124,7 +127,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[1]).toEqual({
@@ -142,7 +145,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[2]).toEqual({
@@ -160,7 +163,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[3]).toEqual({
@@ -178,7 +181,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[4]).toEqual({
@@ -196,7 +199,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[5]).toEqual({
@@ -214,7 +217,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: undefined,
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[6]).toEqual({
@@ -232,7 +235,7 @@ describe('readProviderConfigs', () => {
         },
         visibility: ['public', 'internal'],
       },
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
       validateLocationsExist: false,
     });
     expect(providerConfigs[7]).toEqual({
@@ -251,7 +254,7 @@ describe('readProviderConfigs', () => {
         visibility: undefined,
       },
       validateLocationsExist: false,
-      schedule: undefined,
+      schedule: DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE,
     });
     expect(providerConfigs[8]).toEqual({
       id: 'providerWithSchedule',
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
index 073c92701f..2e2592b70a 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
@@ -23,6 +23,15 @@ import { Config } from '@backstage/config';
 const DEFAULT_CATALOG_PATH = '/catalog-info.yaml';
 const DEFAULT_PROVIDER_ID = 'default';
 
+export const DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE = {
+  frequency: {
+    hours: 3,
+  },
+  timeout: {
+    hours: 1,
+  },
+};
+
 export type GithubEntityProviderConfig = {
   id: string;
   catalogPath: string;
@@ -99,7 +108,7 @@ function readProviderConfig(
     ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
         config.getConfig('schedule'),
       )
-    : undefined;
+    : DEFAULT_GITHUB_ENTITY_PROVIDER_CONFIG_SCHEDULE;
 
   return {
     id,
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
index 82c93b0d57..52dc2b6d14 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
@@ -530,6 +530,95 @@ describe('GithubOrgEntityProvider', () => {
       });
     });
 
+    it('should apply delta added on receive a created team without parent', async () => {
+      const entityProviderConnection: EntityProviderConnection = {
+        applyMutation: jest.fn(),
+        refresh: jest.fn(),
+      };
+
+      const logger = mockServices.logger.mock();
+      const events = DefaultEventsService.create({ logger });
+      const gitHubConfig: GithubIntegrationConfig = {
+        host: 'github.com',
+      };
+
+      const mockGetCredentials = jest.fn().mockReturnValue({
+        headers: { token: 'blah' },
+        type: 'app',
+      });
+
+      const githubCredentialsProvider: GithubCredentialsProvider = {
+        getCredentials: mockGetCredentials,
+      };
+
+      const entityProvider = new GithubOrgEntityProvider({
+        events,
+        id: 'my-id',
+        githubCredentialsProvider,
+        orgUrl: 'https://github.com/backstage',
+        gitHubConfig,
+        logger,
+      });
+
+      entityProvider.connect(entityProviderConnection);
+
+      const expectedEntity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Group',
+        metadata: {
+          name: 'new-team',
+          description: 'description from the new team',
+          annotations: {
+            'backstage.io/edit-url':
+              'https://github.com/orgs/test-org/teams/new-team/edit',
+            'backstage.io/managed-by-location':
+              'url:https://github.com/orgs/test-org/teams/new-team',
+            'backstage.io/managed-by-origin-location':
+              'url:https://github.com/orgs/test-org/teams/new-team',
+            'github.com/team-slug': 'test-org/new-team',
+          },
+        },
+        spec: {
+          type: 'team',
+          children: [],
+          members: [],
+          profile: {
+            displayName: 'New Team',
+          },
+        },
+      };
+
+      const event: EventParams = {
+        topic: 'github.team',
+        eventPayload: {
+          action: 'created',
+          team: {
+            name: 'New Team',
+            slug: 'new-team',
+            description: 'description from the new team',
+            html_url: 'https://github.com/orgs/test-org/teams/new-team',
+          },
+          organization: {
+            login: 'test-org',
+          },
+        },
+      };
+
+      await events.publish(event);
+
+      expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
+      expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+        type: 'delta',
+        added: [
+          {
+            locationKey: 'github-org-provider:my-id',
+            entity: expectedEntity,
+          },
+        ],
+        removed: [],
+      });
+    });
+
     it('should apply delta removed on receive a deleted team', async () => {
       const entityProviderConnection: EntityProviderConnection = {
         applyMutation: jest.fn(),
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
index f7183b4df9..6e83b8d65f 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
@@ -511,7 +511,9 @@ export class GithubOrgEntityProvider implements EntityProvider {
         editTeamUrl: `${url}/edit`,
         combinedSlug: `${org}/${slug}`,
         description: description || undefined,
-        parentTeam: { slug: event.team?.parent?.slug || '' } as GithubTeam,
+        parentTeam: event.team?.parent?.slug
+          ? ({ slug: event.team.parent.slug } as GithubTeam)
+          : undefined,
         // entity will be removed
         members: [],
       },
diff --git a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
index 1463dfd3ee..f6b29c16a4 100644
--- a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
@@ -1,5 +1,85 @@
 # @backstage/plugin-catalog-backend-module-gitlab-org
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.6.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.1-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0
+
+## 0.2.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend-module-gitlab@0.5.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.5-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab-org/package.json b/plugins/catalog-backend-module-gitlab-org/package.json
index fe6c35b486..d0f00076a5 100644
--- a/plugins/catalog-backend-module-gitlab-org/package.json
+++ b/plugins/catalog-backend-module-gitlab-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab-org",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The gitlab-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index 950edfcd24..ba0605d660 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,131 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.6.0-next.2
+
+### Minor Changes
+
+- 99dce5c: Implemented discovery for top-level groups defined in config.group or if undefined global top-level group in Gitlab
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.5.1-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.5.0
+
+### Minor Changes
+
+- 1b5fdd9: Extended the configuration with the `includeArchivedRepos` property, which allows including repositories when the project is archived.
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.5.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.5.0-next.2
+
+### Minor Changes
+
+- 1b5fdd9: Extended the configuration with the `includeArchivedRepos` property, which allows including repositories when the project is archived.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/config.d.ts b/plugins/catalog-backend-module-gitlab/config.d.ts
index e249f13d4c..ce1cda50e7 100644
--- a/plugins/catalog-backend-module-gitlab/config.d.ts
+++ b/plugins/catalog-backend-module-gitlab/config.d.ts
@@ -63,6 +63,10 @@ export interface Config {
            * (Optional) Skip forked repository
            */
           skipForkedRepos?: boolean;
+          /**
+           * (Optional) Include archived repository
+           */
+          includeArchivedRepos?: boolean;
           /**
            * (Optional) A list of strings containing the paths of the repositories to skip
            * Should be in the format group/subgroup/repo, with no leading or trailing slashes.
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 99656e846d..75c376a355 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab",
-  "version": "0.4.3",
+  "version": "0.6.0-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards GitLab",
   "backstage": {
     "role": "backend-plugin-module",
@@ -61,15 +61,13 @@
     "@backstage/plugin-events-node": "workspace:^",
     "@gitbeaker/rest": "^40.0.3",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@backstage/plugin-events-backend-test-utils": "workspace:^",
     "@types/lodash": "^4.14.151",
-    "@types/uuid": "^9.0.0",
     "luxon": "^3.0.0",
     "msw": "^1.0.0"
   },
diff --git a/plugins/catalog-backend-module-gitlab/report.api.md b/plugins/catalog-backend-module-gitlab/report.api.md
index 890ca29eca..e2577553d3 100644
--- a/plugins/catalog-backend-module-gitlab/report.api.md
+++ b/plugins/catalog-backend-module-gitlab/report.api.md
@@ -51,6 +51,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
       logger: LoggerService;
       skipReposWithoutExactFileMatch?: boolean;
       skipForkedRepos?: boolean;
+      includeArchivedRepos?: boolean;
     },
   ): GitLabDiscoveryProcessor;
   // (undocumented)
@@ -116,6 +117,7 @@ export type GitlabProviderConfig = {
   orgEnabled?: boolean;
   schedule?: SchedulerServiceTaskScheduleDefinition;
   skipForkedRepos?: boolean;
+  includeArchivedRepos?: boolean;
   excludeRepos?: string[];
   includeUsersWithoutSeat?: boolean;
 };
diff --git a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
index 01e8018845..ab31a44bbc 100644
--- a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
@@ -39,6 +39,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
   private readonly cache: CacheService;
   private readonly skipReposWithoutExactFileMatch: boolean;
   private readonly skipForkedRepos: boolean;
+  private readonly includeArchivedRepos: boolean;
 
   static fromConfig(
     config: Config,
@@ -46,6 +47,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
       logger: LoggerService;
       skipReposWithoutExactFileMatch?: boolean;
       skipForkedRepos?: boolean;
+      includeArchivedRepos?: boolean;
     },
   ): GitLabDiscoveryProcessor {
     const integrations = ScmIntegrations.fromConfig(config);
@@ -65,6 +67,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
     logger: LoggerService;
     skipReposWithoutExactFileMatch?: boolean;
     skipForkedRepos?: boolean;
+    includeArchivedRepos?: boolean;
   }) {
     this.integrations = options.integrations;
     this.cache = options.pluginCache;
@@ -72,6 +75,7 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
     this.skipReposWithoutExactFileMatch =
       options.skipReposWithoutExactFileMatch || false;
     this.skipForkedRepos = options.skipForkedRepos || false;
+    this.includeArchivedRepos = options.includeArchivedRepos || false;
   }
 
   getProcessorName(): string {
@@ -105,12 +109,12 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
 
     const lastActivity = (await this.cache.get(this.getCacheKey())) as string;
     const opts = {
-      archived: false,
       group,
       page: 1,
       // We check for the existence of lastActivity and only set it if it's present to ensure
       // that the options doesn't include the key so that the API doesn't receive an empty query parameter.
       ...(lastActivity && { last_activity_after: lastActivity }),
+      ...(!this.includeArchivedRepos && { archived: false }),
     };
 
     const projects = paginated(options => client.listProjects(options), opts);
diff --git a/plugins/catalog-backend-module-gitlab/src/__testUtils__/handlers.ts b/plugins/catalog-backend-module-gitlab/src/__testUtils__/handlers.ts
index e49fb54465..a4fb3ba391 100644
--- a/plugins/catalog-backend-module-gitlab/src/__testUtils__/handlers.ts
+++ b/plugins/catalog-backend-module-gitlab/src/__testUtils__/handlers.ts
@@ -37,9 +37,18 @@ const httpHandlers = [
    * Project REST endpoint mocks
    */
 
-  // fetch all projects in an instance
-  rest.get(`${apiBaseUrl}/projects`, (_, res, ctx) => {
-    return res(ctx.set('x-next-page', ''), ctx.json(all_projects_response));
+  // fetch all projects in an instance handling archived ones
+  rest.get(`${apiBaseUrl}/projects`, (req, res, ctx) => {
+    const archived = req.url.searchParams.get('archived');
+
+    return res(
+      ctx.set('x-next-page', ''),
+      ctx.json(
+        all_projects_response.filter(p =>
+          archived === 'false' ? !p.archived : true,
+        ),
+      ),
+    );
   }),
 
   rest.get(`${apiBaseUrl}/projects/42`, (_, res, ctx) => {
@@ -127,6 +136,22 @@ const httpHandlers = [
 
 // dynamic handlers
 
+// https://docs.gitlab.com/ee/api/groups.html#list-group-details supports encoded path and id
+const httpGroupFindByEncodedPathDynamic = all_groups_response.flatMap(group => [
+  // Handler for apiBaseUrl
+  rest.get(`${apiBaseUrl}/groups/${group.full_path}`, (_, res, ctx) => {
+    return res(
+      ctx.json(all_groups_response.find(g => g.full_path === group.full_path)),
+    );
+  }),
+  // Handler for apiSaaSBaseUrl
+  rest.get(`${apiBaseUrlSaas}/groups/${group.full_path}`, (_, res, ctx) => {
+    return res(
+      ctx.json(all_groups_response.find(g => g.full_path === group.full_path)),
+    );
+  }),
+]);
+
 const httpGroupFindByIdDynamic = all_groups_response.map(group => {
   return rest.get(`${apiBaseUrl}/groups/${group.id}`, (_, res, ctx) => {
     return res(ctx.json(all_groups_response.find(g => g.id === group.id)));
@@ -136,9 +161,13 @@ const httpGroupFindByIdDynamic = all_groups_response.map(group => {
 const httpGroupListDescendantProjectsById = all_groups_response.map(group => {
   return rest.get(
     `${apiBaseUrl}/groups/${group.id}/projects`,
-    (_, res, ctx) => {
-      const projectsInGroup = all_projects_response.filter(p =>
-        p.path_with_namespace?.includes(group.name),
+    (req, res, ctx) => {
+      const archived = req.url.searchParams.get('archived');
+
+      const projectsInGroup = all_projects_response.filter(
+        p =>
+          p.path_with_namespace?.includes(group.name) &&
+          (archived === 'false' ? !p.archived : true),
       );
 
       return res(ctx.json(projectsInGroup));
@@ -149,9 +178,13 @@ const httpGroupListDescendantProjectsById = all_groups_response.map(group => {
 const httpGroupListDescendantProjectsByName = all_groups_response.map(group => {
   return rest.get(
     `${apiBaseUrl}/groups/${group.name}/projects`,
-    (_, res, ctx) => {
-      const projectsInGroup = all_projects_response.filter(p =>
-        p.path_with_namespace?.includes(group.name),
+    (req, res, ctx) => {
+      const archived = req.url.searchParams.get('archived');
+
+      const projectsInGroup = all_projects_response.filter(
+        p =>
+          p.path_with_namespace?.includes(group.name) &&
+          (archived === 'false' ? !p.archived : true),
       );
 
       return res(ctx.json(projectsInGroup));
@@ -601,4 +634,5 @@ export const handlers = [
   ...httpGroupListDescendantProjectsById,
   ...httpGroupListDescendantProjectsByName,
   ...graphqlHandlers,
+  ...httpGroupFindByEncodedPathDynamic,
 ];
diff --git a/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts b/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
index 3087d10f11..d9914c0d0c 100644
--- a/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
+++ b/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
@@ -299,6 +299,33 @@ export const config_single_integration_skip_forks: MockObject = {
   },
 };
 
+export const config_single_integration_include_archived: MockObject = {
+  integrations: {
+    gitlab: [
+      {
+        host: 'example.com',
+        apiBaseUrl: 'https://example.com/api/v4',
+        token: '1234',
+      },
+    ],
+  },
+  catalog: {
+    providers: {
+      gitlab: {
+        'test-id': {
+          host: 'example.com',
+          group: 'group1',
+          includeArchivedRepos: true,
+          schedule: {
+            frequency: 'PT30M',
+            timeout: 'PT3M',
+          },
+        },
+      },
+    },
+  },
+};
+
 export const config_single_integration_exclude_repos: MockObject = {
   integrations: {
     gitlab: [
@@ -856,6 +883,18 @@ export const all_projects_response: GitLabProject[] = [
     web_url: 'https://example.com/group1/test-repo7',
     path_with_namespace: 'group1/test-repo7',
   },
+  // archived project
+  {
+    id: 8,
+    description: 'Project Eight Description',
+    name: 'test-repo8-archived',
+    default_branch: 'main',
+    path: 'test-repo8-archived',
+    archived: true,
+    last_activity_at: new Date().toString(),
+    web_url: 'https://example.com/group1/test-repo8-archived',
+    path_with_namespace: 'group1/test-repo8-archived',
+  },
 ];
 
 export const all_users_response: GitLabUser[] = [
@@ -1002,7 +1041,7 @@ export const all_groups_response: GitLabGroup[] = [
   {
     id: 1,
     name: 'group1',
-    description: '',
+    description: 'description1',
     full_path: 'group1',
   },
   {
@@ -1553,7 +1592,7 @@ export const push_modif_event: EventParams = {
 // includes only projects that have a default branch (for when the branch and fallback branch were not set in the config)
 export const expected_location_entities_default_branch: MockObject[] =
   all_projects_response
-    .filter(project => project.default_branch)
+    .filter(project => project.default_branch && !project.archived)
     .map(project => {
       const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${project.default_branch}/catalog-info.yaml`;
 
@@ -1583,63 +1622,98 @@ export const expected_location_entities_default_branch: MockObject[] =
 
 // includes every GitLab project that has a default branch and the fallback declared in the config
 export const expected_location_entities_fallback_branch: MockObject[] =
-  all_projects_response.map(project => {
-    const branch = project.default_branch || 'main';
-    const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${branch}/catalog-info.yaml`;
+  all_projects_response
+    .filter(project => !project.archived)
+    .map(project => {
+      const branch = project.default_branch || 'main';
+      const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${branch}/catalog-info.yaml`;
 
-    return {
-      entity: {
-        apiVersion: 'backstage.io/v1alpha1',
-        kind: 'Location',
-        metadata: {
-          annotations: {
-            'backstage.io/managed-by-location': `url:${targetUrl}`,
-            'backstage.io/managed-by-origin-location': `url:${targetUrl}`,
+      return {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${targetUrl}`,
+              'backstage.io/managed-by-origin-location': `url:${targetUrl}`,
+            },
+            name: locationSpecToMetadataName({
+              target: targetUrl,
+              type: 'url',
+            }),
           },
-          name: locationSpecToMetadataName({
+          spec: {
+            presence: 'optional',
             target: targetUrl,
             type: 'url',
-          }),
+          },
         },
-        spec: {
-          presence: 'optional',
-          target: targetUrl,
-          type: 'url',
-        },
-      },
-      locationKey: 'GitlabDiscoveryEntityProvider:test-id',
-    };
-  });
+        locationKey: 'GitlabDiscoveryEntityProvider:test-id',
+      };
+    });
 
 // includes ONLY the projects with the branch declared in the config
 export const expected_location_entities_specific_branch: MockObject[] =
-  all_projects_response.map(project => {
-    const branch = 'develop';
-    const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${branch}/catalog-info.yaml`;
+  all_projects_response
+    .filter(project => !project.archived)
+    .map(project => {
+      const branch = 'develop';
+      const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${branch}/catalog-info.yaml`;
 
-    return {
-      entity: {
-        apiVersion: 'backstage.io/v1alpha1',
-        kind: 'Location',
-        metadata: {
-          annotations: {
-            'backstage.io/managed-by-location': `url:${targetUrl}`,
-            'backstage.io/managed-by-origin-location': `url:${targetUrl}`,
+      return {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${targetUrl}`,
+              'backstage.io/managed-by-origin-location': `url:${targetUrl}`,
+            },
+            name: locationSpecToMetadataName({
+              target: targetUrl,
+              type: 'url',
+            }),
           },
-          name: locationSpecToMetadataName({
+          spec: {
+            presence: 'optional',
             target: targetUrl,
             type: 'url',
-          }),
+          },
         },
-        spec: {
-          presence: 'optional',
-          target: targetUrl,
-          type: 'url',
+        locationKey: 'GitlabDiscoveryEntityProvider:test-id',
+      };
+    });
+
+// includes archived and not archived projects
+export const expected_location_entities_including_archived: MockObject[] =
+  all_projects_response
+    .filter(project => project.default_branch)
+    .map(project => {
+      const targetUrl = `https://example.com/${project.path_with_namespace}/-/blob/${project.default_branch}/catalog-info.yaml`;
+
+      return {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${targetUrl}`,
+              'backstage.io/managed-by-origin-location': `url:${targetUrl}`,
+            },
+            name: locationSpecToMetadataName({
+              target: targetUrl,
+              type: 'url',
+            }),
+          },
+          spec: {
+            presence: 'optional',
+            target: targetUrl,
+            type: 'url',
+          },
         },
-      },
-      locationKey: 'GitlabDiscoveryEntityProvider:test-id',
-    };
-  });
+        locationKey: 'GitlabDiscoveryEntityProvider:test-id',
+      };
+    });
 
 export const expected_added_location_entities: MockObject[] = added_commits.map(
   commit => {
@@ -1730,6 +1804,7 @@ export const expected_group_user_entity: MockObject[] = [
             'url:https://example.com/group1',
           'example.com/team-path': 'group1',
         },
+        description: 'description1',
         name: 'group1',
       },
       spec: {
@@ -2016,6 +2091,7 @@ export const expected_full_org_scan_entities: MockObject[] = [
             'url:https://example.com/group1',
           'example.com/team-path': 'group1',
         },
+        description: 'description1',
         name: 'group1',
       },
       spec: {
@@ -2273,7 +2349,7 @@ export const expected_full_members_group_org_scan_entities: MockObject[] = [
         name: 'JohnDoe',
       },
       spec: {
-        memberOf: ['subgroup1'],
+        memberOf: ['group1', 'subgroup1'], // since #26554 also config.group needs to be here.
         profile: {
           displayName: 'John Doe',
           email: 'john.doe@company.com',
@@ -2357,6 +2433,30 @@ export const expected_full_members_group_org_scan_entities: MockObject[] = [
     },
     locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
   },
+  {
+    entity: {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Group',
+      metadata: {
+        annotations: {
+          'backstage.io/managed-by-location': 'url:https://example.com/group1',
+          'backstage.io/managed-by-origin-location':
+            'url:https://example.com/group1',
+          'example.com/team-path': 'group1',
+        },
+        description: 'description1',
+        name: 'group1',
+      },
+      spec: {
+        children: [],
+        profile: {
+          displayName: 'group1',
+        },
+        type: 'team',
+      },
+    },
+    locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
+  },
   {
     entity: {
       apiVersion: 'backstage.io/v1alpha1',
@@ -2398,7 +2498,7 @@ export const expected_group_members_group_org_scan_entities: MockObject[] = [
         name: 'JohnDoe',
       },
       spec: {
-        memberOf: ['subgroup1'],
+        memberOf: ['subgroup1', 'group1'],
         profile: {
           displayName: 'John Doe',
           email: 'john.doe@company.com',
@@ -2433,6 +2533,30 @@ export const expected_group_members_group_org_scan_entities: MockObject[] = [
     },
     locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
   },
+  {
+    entity: {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Group',
+      metadata: {
+        annotations: {
+          'backstage.io/managed-by-location': 'url:https://example.com/group1',
+          'backstage.io/managed-by-origin-location':
+            'url:https://example.com/group1',
+          'example.com/team-path': 'group1',
+        },
+        name: 'group1',
+        description: 'description1',
+      },
+      spec: {
+        children: [],
+        profile: {
+          displayName: 'group1',
+        },
+        type: 'team',
+      },
+    },
+    locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
+  },
 ];
 
 export const all_self_hosted_group1_members: MockObject[] = [
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts
index 1eebe7d6e0..daea71060f 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts
@@ -143,6 +143,31 @@ describe('GitLabClient', () => {
       expect(allItems).toHaveLength(expectedProjects.length);
     });
 
+    it('should get not archived projects', async () => {
+      const client = new GitLabClient({
+        config: readGitLabIntegrationConfig(
+          new ConfigReader(mock.config_self_managed),
+        ),
+        logger: mockServices.logger.mock(),
+      });
+
+      const archivedProjectsGen = paginated(
+        options => client.listProjects(options),
+        { archived: false },
+      );
+
+      const expectedProjects = mock.all_projects_response.filter(
+        project => !project.archived,
+      );
+
+      const allItems = [];
+      for await (const item of archivedProjectsGen) {
+        allItems.push(item);
+      }
+
+      expect(allItems).toHaveLength(expectedProjects.length);
+    });
+
     it('should get all projects for an instance', async () => {
       const client = new GitLabClient({
         config: readGitLabIntegrationConfig(
@@ -159,6 +184,7 @@ describe('GitLabClient', () => {
       for await (const project of instanceProjects) {
         allProjects.push(project);
       }
+
       expect(allProjects).toHaveLength(mock.all_projects_response.length);
     });
   });
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
index f2ce3d18f8..81ba58db5d 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   getGitLabRequestOptions,
   GitLabIntegrationConfig,
 } from '@backstage/integration';
-import fetch from 'node-fetch';
 import { LoggerService } from '@backstage/backend-plugin-api';
-
 import {
   GitLabDescendantGroupsResponse,
   GitLabGroup,
@@ -166,6 +165,15 @@ export class GitLabClient {
     return this.pagedRequest(`/groups`, options);
   }
 
+  // https://docs.gitlab.com/ee/api/groups.html#list-group-details
+  // id can either be group id or encoded full path
+  async getGroupByPath(
+    groupPath: string,
+    options?: CommonListOptions,
+  ): Promise<GitLabGroup> {
+    return this.nonPagedRequest(`/groups/${groupPath}`, options);
+  }
+
   async listDescendantGroups(
     groupPath: string,
   ): Promise<PagedResponse<GitLabGroup>> {
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
index 423f3ff8b5..e25f9bacf4 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
@@ -232,6 +232,10 @@ export type GitlabProviderConfig = {
    * If the project is a fork, skip repository
    */
   skipForkedRepos?: boolean;
+  /**
+   * If the project is archived, include repository
+   */
+  includeArchivedRepos?: boolean;
   /**
    * List of repositories to exclude from discovery, should be the full path to the repository, e.g. `group/project`
    * Paths should not start or end with a slash.
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
index e6309a8516..dd7a4f0d6d 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
@@ -232,6 +232,35 @@ describe('GitlabDiscoveryEntityProvider - refresh', () => {
     });
   });
 
+  it('should include archived projects', async () => {
+    const config = new ConfigReader(
+      mock.config_single_integration_include_archived,
+    );
+    const schedule = new PersistingTaskRunner();
+    const entityProviderConnection: EntityProviderConnection = {
+      applyMutation: jest.fn(),
+      refresh: jest.fn(),
+    };
+    const provider = GitlabDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    })[0];
+
+    await provider.connect(entityProviderConnection);
+
+    await provider.refresh(logger);
+
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: mock.expected_location_entities_including_archived.filter(
+        entity =>
+          !entity.entity.metadata.annotations[
+            'backstage.io/managed-by-location'
+          ].includes('awesome'),
+      ),
+    });
+  });
+
   it('should filter repositories that are excluded', async () => {
     const config = new ConfigReader(
       mock.config_single_integration_exclude_repos,
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
index 0ac45b93e1..66a6247295 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
@@ -210,10 +210,10 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
     const projects = paginated<GitLabProject>(
       options => this.gitLabClient.listProjects(options),
       {
-        archived: false,
         group: this.config.group,
         page: 1,
         per_page: 50,
+        ...(!this.config.includeArchivedRepos && { archived: false }),
       },
     );
 
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
index a15894b236..5f62cedb71 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
@@ -435,7 +435,7 @@ describe('GitlabOrgDiscoveryEntityProvider - refresh', () => {
   });
 
   // This should return all members of the self-hosted instance regardless of the group set -> expected_full_members_group_org_scan_entities
-  // All instance members, but only the group entities below the config.group
+  // All instance members, but only the group entities of config.group and below (#26554)
   it('Self-hosted: should get all instance users when restrictUsersToGroup is not set', async () => {
     const config = new ConfigReader(mock.config_org_group_selfHosted);
     const schedule = new PersistingTaskRunner();
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
index 277a5a8c51..eb10dd2274 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
@@ -366,6 +366,7 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
     if (this.gitLabClient.isSelfManaged() && this.config.restrictUsersToGroup) {
       groups = (await this.gitLabClient.listDescendantGroups(this.config.group))
         .items;
+      groups.push(await this.gitLabClient.getGroupByPath(this.config.group)); // adds the parent group for #26554
       users = paginated<GitLabUser>(
         options =>
           this.gitLabClient.listGroupMembers(this.config.group, options), // calls /groups/<groupId>/members
@@ -395,10 +396,14 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
     else {
       groups = (await this.gitLabClient.listDescendantGroups(this.config.group))
         .items;
+
+      groups.push(await this.gitLabClient.getGroupByPath(this.config.group)); // adds the parent group for #26554
+
       const rootGroupSplit = this.config.group.split('/');
       const rootGroup = this.config.restrictUsersToGroup
         ? rootGroupSplit[rootGroupSplit.length - 1]
         : rootGroupSplit[0];
+
       users = paginated<GitLabUser>(
         options =>
           this.gitLabClient.listSaaSUsers(
@@ -775,7 +780,8 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
     return (
       this.config.groupPattern.test(group.full_path) &&
       (!this.config.group ||
-        group.full_path.startsWith(`${this.config.group}/`))
+        group.full_path.startsWith(`${this.config.group}/`) ||
+        group.full_path === this.config.group)
     );
   }
 
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
index 4b7c73ec80..e1798df184 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
@@ -61,6 +61,7 @@ describe('config', () => {
         relations: [],
         schedule: undefined,
         skipForkedRepos: false,
+        includeArchivedRepos: false,
         excludeRepos: [],
         restrictUsersToGroup: false,
         includeUsersWithoutSeat: false,
@@ -104,6 +105,7 @@ describe('config', () => {
         relations: [],
         schedule: undefined,
         skipForkedRepos: false,
+        includeArchivedRepos: false,
         excludeRepos: [],
         restrictUsersToGroup: false,
         includeUsersWithoutSeat: true,
@@ -149,6 +151,51 @@ describe('config', () => {
         restrictUsersToGroup: false,
         excludeRepos: [],
         skipForkedRepos: true,
+        includeArchivedRepos: false,
+        includeUsersWithoutSeat: false,
+      }),
+    );
+  });
+
+  it('valid config with includeArchivedRepos', () => {
+    const config = new ConfigReader({
+      catalog: {
+        providers: {
+          gitlab: {
+            test: {
+              group: 'group',
+              host: 'host',
+              branch: 'not-master',
+              fallbackBranch: 'main',
+              entityFilename: 'custom-file.yaml',
+              includeArchivedRepos: true,
+            },
+          },
+        },
+      },
+    });
+
+    const result = readGitlabConfigs(config);
+    expect(result).toHaveLength(1);
+    result.forEach(r =>
+      expect(r).toStrictEqual({
+        id: 'test',
+        group: 'group',
+        branch: 'not-master',
+        fallbackBranch: 'main',
+        host: 'host',
+        catalogFile: 'custom-file.yaml',
+        projectPattern: /[\s\S]*/,
+        groupPattern: /[\s\S]*/,
+        userPattern: /[\s\S]*/,
+        orgEnabled: false,
+        allowInherited: false,
+        relations: [],
+        schedule: undefined,
+        restrictUsersToGroup: false,
+        excludeRepos: [],
+        skipForkedRepos: false,
+        includeArchivedRepos: true,
         includeUsersWithoutSeat: false,
       }),
     );
@@ -192,6 +239,7 @@ describe('config', () => {
         schedule: undefined,
         restrictUsersToGroup: false,
         skipForkedRepos: false,
+        includeArchivedRepos: false,
         excludeRepos: ['foo/bar', 'quz/qux'],
         includeUsersWithoutSeat: false,
       }),
@@ -235,6 +283,7 @@ describe('config', () => {
         allowInherited: false,
         relations: [],
         skipForkedRepos: false,
+        includeArchivedRepos: false,
         restrictUsersToGroup: false,
         excludeRepos: [],
         includeUsersWithoutSeat: false,
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
index dd1f6d67d7..bf59bb0d36 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
@@ -49,6 +49,9 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
 
   const skipForkedRepos: boolean =
     config.getOptionalBoolean('skipForkedRepos') ?? false;
+
+  const includeArchivedRepos: boolean =
+    config.getOptionalBoolean('includeArchivedRepos') ?? false;
   const excludeRepos: string[] =
     config.getOptionalStringArray('excludeRepos') ?? [];
 
@@ -78,6 +81,7 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
     allowInherited,
     relations,
     skipForkedRepos,
+    includeArchivedRepos,
     excludeRepos,
     restrictUsersToGroup,
     includeUsersWithoutSeat,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index bbf7dfcf79..5f25c7e4f7 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,148 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.6.1-next.2
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- d42ecb0: Remove backend-common package from incremental-ingestion plugin and update related code
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.6.1-next.1
+
+### Patch Changes
+
+- fe87fbf: Add task metrics as two gauges that track the last start and end timestamps as epoch seconds.
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.6.1-next.0
+
+### Patch Changes
+
+- cce9cae: Deprecate old-backend-system `IncrementalCatalogBuilder`
+- 5aa44d2: Wire up the events together in the new backend system
+- cbfc69e: Create a `dev/index.ts` entrypoint for `yarn start`
+- 3ca5f70: Ensure that the scheduled worker task doesn't run at an unreasonably high frequency
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.6.0
+
+### Minor Changes
+
+- 6cf91c5: Use `HumanDuration` for all duration needs in the public API, instead of `luxon` types. These are generally compatible, with a few caveats:
+
+  - If you scheduled things to run quarterly (`quarter` or `quarters`), you can use `{ months: 3 }` instead.
+  - If you used the singular nouns such as `year: 1`, use plurals instead (e.g. `years: 1`).
+
+### Patch Changes
+
+- c5e39e7: Internal refactor to use the deferred from the types package
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.6.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.6.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.6.0-next.1
+
+### Minor Changes
+
+- 6cf91c5: Use `HumanDuration` for all duration needs in the public API, instead of `luxon` types. These are generally compatible, with a few caveats:
+
+  - If you scheduled things to run quarterly (`quarter` or `quarters`), you can use `{ months: 3 }` instead.
+  - If you used the singular nouns such as `year: 1`, use plurals instead (e.g. `years: 1`).
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.5.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.5.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/README.md b/plugins/catalog-backend-module-incremental-ingestion/README.md
index 3b847d4ad7..2535fbe8e3 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/README.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/README.md
@@ -311,7 +311,7 @@ export const catalogModuleCustomIncrementalIngestionProvider =
             burstInterval: { seconds: 3 },
 
             // How long should it rest before re-ingesting again?
-            restLength: { day: 1 },
+            restLength: { days: 1 },
 
             // Optional back-off configuration - how long should it wait to retry
             // in the event of an error?
diff --git a/plugins/catalog-backend-module-incremental-ingestion/dev/index.ts b/plugins/catalog-backend-module-incremental-ingestion/dev/index.ts
new file mode 100644
index 0000000000..cc205c6865
--- /dev/null
+++ b/plugins/catalog-backend-module-incremental-ingestion/dev/index.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createBackend } from '@backstage/backend-defaults';
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { mockServices } from '@backstage/backend-test-utils';
+import {
+  IncrementalEntityProvider,
+  incrementalIngestionProvidersExtensionPoint,
+} from '../src';
+
+const dummyProvider = createBackendModule({
+  pluginId: 'catalog',
+  moduleId: 'incremental-test-provider',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        logger: coreServices.logger,
+        providers: incrementalIngestionProvidersExtensionPoint,
+      },
+      async init({ logger, providers }) {
+        const provider: IncrementalEntityProvider<number, {}> = {
+          getProviderName: () => 'test-provider',
+          around: burst => burst(0),
+          next: async (_context, cursor) => {
+            await new Promise(resolve => setTimeout(resolve, 500));
+            if (cursor === undefined || cursor < 3) {
+              logger.info(`### Returning batch #${cursor}`);
+              return { done: false, entities: [], cursor: (cursor ?? 0) + 1 };
+            }
+
+            logger.info('### Last batch reached, stopping');
+            return { done: true };
+          },
+        };
+
+        providers.addProvider({
+          provider: provider,
+          options: {
+            burstInterval: { seconds: 1 },
+            burstLength: { seconds: 10 },
+            restLength: { seconds: 10 },
+          },
+        });
+      },
+    });
+  },
+});
+
+const backend = createBackend();
+backend.add(
+  mockServices.rootConfig.factory({
+    data: {
+      backend: {
+        baseUrl: 'http://localhost:7007',
+        listen: ':7007',
+        database: { client: 'better-sqlite3', connection: ':memory:' },
+      },
+    },
+  }),
+);
+backend.add(import('@backstage/plugin-catalog-backend'));
+backend.add(import('../src'));
+backend.add(dummyProvider);
+backend.start();
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 9f42c5f480..855973c834 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-incremental-ingestion",
-  "version": "0.5.5",
+  "version": "0.6.1-next.2",
   "description": "An entity provider for streaming large asset sources into the catalog",
   "backstage": {
     "role": "backend-plugin-module",
@@ -51,7 +51,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
@@ -60,17 +60,18 @@
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@opentelemetry/api": "^1.9.0",
     "@types/express": "^4.17.6",
-    "@types/luxon": "^3.0.0",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "knex": "^3.0.0",
     "luxon": "^3.0.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
-    "@backstage/cli": "workspace:^"
+    "@backstage/cli": "workspace:^",
+    "@types/luxon": "^3.0.0"
   }
 }
diff --git a/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md b/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
index cb1bb63d00..30717e8752 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
@@ -5,7 +5,7 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha (undocumented)
+// @alpha @deprecated (undocumented)
 const _feature: BackendFeature;
 export default _feature;
 
diff --git a/plugins/catalog-backend-module-incremental-ingestion/report.api.md b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
index 9686a7ca57..b4979b1e37 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/report.api.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
@@ -7,17 +7,17 @@
 
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
-import type { Config } from '@backstage/config';
+import { DatabaseService } from '@backstage/backend-plugin-api';
 import type { DeferredEntity } from '@backstage/plugin-catalog-node';
-import type { DurationObjectUnits } from 'luxon';
 import { EventParams } from '@backstage/plugin-events-node';
 import { EventSubscriber } from '@backstage/plugin-events-node';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { HumanDuration } from '@backstage/types';
 import { IncrementalEntityProvider as IncrementalEntityProvider_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 import { IncrementalEntityProviderOptions as IncrementalEntityProviderOptions_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
-import type { Logger } from 'winston';
-import type { PermissionEvaluator } from '@backstage/plugin-permission-common';
-import type { PluginDatabaseManager } from '@backstage/backend-common';
+import { PermissionsService } from '@backstage/backend-plugin-api';
+import { RootConfigService } from '@backstage/backend-plugin-api';
+import { RootLoggerService } from '@backstage/backend-plugin-api';
 import { Router } from 'express';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { UrlReaderService } from '@backstage/backend-plugin-api';
@@ -39,7 +39,7 @@ export type EntityIteratorResult<T> =
       cursor?: T;
     };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export class IncrementalCatalogBuilder {
   // (undocumented)
   addIncrementalEntityProvider<TCursor, TContext>(
@@ -85,12 +85,12 @@ export interface IncrementalEntityProvider<TCursor, TContext> {
 
 // @public (undocumented)
 export interface IncrementalEntityProviderOptions {
-  backoff?: DurationObjectUnits[];
-  burstInterval: DurationObjectUnits;
-  burstLength: DurationObjectUnits;
+  backoff?: HumanDuration[];
+  burstInterval: HumanDuration;
+  burstLength: HumanDuration;
   rejectEmptySourceCollections?: boolean;
   rejectRemovalsAbovePercentage?: number;
-  restLength: DurationObjectUnits;
+  restLength: HumanDuration;
 }
 
 // @public
@@ -106,11 +106,11 @@ export const incrementalIngestionProvidersExtensionPoint: ExtensionPoint<Increme
 
 // @public (undocumented)
 export type PluginEnvironment = {
-  logger: Logger;
-  database: PluginDatabaseManager;
+  logger: RootLoggerService;
+  database: DatabaseService;
   scheduler: SchedulerService;
-  config: Config;
+  config: RootConfigService;
   reader: UrlReaderService;
-  permissions: PermissionEvaluator;
+  permissions: PermissionsService;
 };
 ```
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
index cba672ce49..776dd937bf 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
@@ -16,6 +16,9 @@
 
 import { default as feature } from './module';
 
-/** @alpha */
+/**
+ * @alpha
+ * @deprecated Please import from `@backstage/plugin-catalog-backend-module-incremental-ingestion` instead
+ */
 const _feature = feature;
 export default _feature;
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
index 4f9e205cfe..e005d29292 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
@@ -15,23 +15,27 @@
  */
 
 import type { DeferredEntity } from '@backstage/plugin-catalog-node';
+import { Gauge, metrics } from '@opentelemetry/api';
 import { IterationEngine, IterationEngineOptions } from '../types';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
 import { performance } from 'perf_hooks';
-import { Duration, DurationObjectUnits } from 'luxon';
+import { Duration } from 'luxon';
 import { v4 } from 'uuid';
 import { stringifyError } from '@backstage/errors';
-import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
+import { EventParams } from '@backstage/plugin-events-node';
+import { HumanDuration } from '@backstage/types';
 
-export class IncrementalIngestionEngine
-  implements IterationEngine, EventSubscriber
-{
+export class IncrementalIngestionEngine implements IterationEngine {
   private readonly restLength: Duration;
-  private readonly backoff: DurationObjectUnits[];
+  private readonly backoff: HumanDuration[];
+  private readonly lastStarted: Gauge;
+  private readonly lastCompleted: Gauge;
 
   private manager: IncrementalIngestionDatabaseManager;
 
   constructor(private options: IterationEngineOptions) {
+    const meter = metrics.getMeter('default');
+
     this.manager = options.manager;
     this.restLength = Duration.fromObject(options.restLength);
     this.backoff = options.backoff ?? [
@@ -40,6 +44,23 @@ export class IncrementalIngestionEngine
       { minutes: 30 },
       { hours: 3 },
     ];
+
+    this.lastStarted = meter.createGauge(
+      'catalog_incremental.ingestions.started',
+      {
+        description:
+          'Epoch timestamp seconds when the ingestion was last started',
+        unit: 'seconds',
+      },
+    );
+    this.lastCompleted = meter.createGauge(
+      'catalog_incremental.ingestions.completed',
+      {
+        description:
+          'Epoch timestamp seconds when the ingestion was last completed',
+        unit: 'seconds',
+      },
+    );
   }
 
   async taskFn(signal: AbortSignal) {
@@ -71,6 +92,9 @@ export class IncrementalIngestionEngine
               `incremental-engine: Ingestion ${ingestionId} rest period complete. Ingestion will start again`,
             );
 
+            this.lastStarted.record(Date.now() / 1000, {
+              providerName: this.options.provider.getProviderName(),
+            });
             await this.manager.setProviderComplete(ingestionId);
           } else {
             this.options.logger.debug(
@@ -86,6 +110,10 @@ export class IncrementalIngestionEngine
               this.options.logger.info(
                 `incremental-engine: Ingestion '${ingestionId}' complete, transitioning to rest period of ${this.restLength.toHuman()}`,
               );
+              this.lastCompleted.record(Date.now() / 1000, {
+                providerName: this.options.provider.getProviderName(),
+                status: 'completed',
+              });
               await this.manager.setProviderResting(
                 ingestionId,
                 this.restLength,
@@ -123,6 +151,10 @@ export class IncrementalIngestionEngine
               this.options.logger.error(
                 `incremental-engine: Ingestion '${ingestionId}' threw an error during ingestion burst. Ingestion will backoff for ${currentBackoff.toHuman()} (${truncatedError})`,
               );
+              this.lastCompleted.record(Date.now() / 1000, {
+                providerName: this.options.provider.getProviderName(),
+                status: 'failed',
+              });
 
               await this.manager.setProviderBackoff(
                 ingestionId,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
index 0f98384893..95b3f203c4 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.test.ts
@@ -68,6 +68,7 @@ describe('WrapperProviders', () => {
         client,
         scheduler: scheduler as Partial<SchedulerService> as SchedulerService,
         applyDatabaseMigrations,
+        events: mockServices.events.mock(),
       });
       const wrapped1 = providers.wrap(provider1, {
         burstInterval: { seconds: 1 },
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
index b26cfe0baf..2f8a8df3ba 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
@@ -24,6 +24,7 @@ import {
   EntityProvider,
   EntityProviderConnection,
 } from '@backstage/plugin-catalog-node';
+import { createDeferred } from '@backstage/types';
 import express from 'express';
 import { Knex } from 'knex';
 import { Duration } from 'luxon';
@@ -35,7 +36,7 @@ import {
   IncrementalEntityProvider,
   IncrementalEntityProviderOptions,
 } from '../types';
-import { Deferred } from '../util';
+import { EventsService } from '@backstage/plugin-events-node';
 
 /**
  * Helps in the creation of the catalog entity providers that wrap the
@@ -44,7 +45,7 @@ import { Deferred } from '../util';
 export class WrapperProviders {
   private migrate: Promise<void> | undefined;
   private numberOfProvidersToConnect = 0;
-  private readonly readySignal = new Deferred<void>();
+  private readonly readySignal = createDeferred();
 
   constructor(
     private readonly options: {
@@ -53,6 +54,7 @@ export class WrapperProviders {
       client: Knex;
       scheduler: SchedulerService;
       applyDatabaseMigrations?: typeof applyDatabaseMigrations;
+      events: EventsService;
     },
   ) {}
 
@@ -73,10 +75,11 @@ export class WrapperProviders {
     };
   }
 
-  async adminRouter(): Promise<express.Router> {
-    return await new IncrementalProviderRouter(
+  adminRouter(): express.Router {
+    return new IncrementalProviderRouter(
       new IncrementalIngestionDatabaseManager({ client: this.options.client }),
       this.options.logger,
+      this.options.config,
     ).createRouter();
   }
 
@@ -117,12 +120,17 @@ export class WrapperProviders {
         connection,
       });
 
-      const frequency = Duration.isDuration(burstInterval)
+      let frequency = Duration.isDuration(burstInterval)
         ? burstInterval
         : Duration.fromObject(burstInterval);
-      const length = Duration.isDuration(burstLength)
+      if (frequency.as('milliseconds') < 5000) {
+        frequency = Duration.fromObject({ seconds: 5 }); // don't let it be silly low, to not overload the scheduler
+      }
+
+      let length = Duration.isDuration(burstLength)
         ? burstLength
         : Duration.fromObject(burstLength);
+      length = length.plus(Duration.fromObject({ minutes: 1 })); // some margin from the actual completion
 
       await this.options.scheduler.scheduleTask({
         id: provider.getProviderName(),
@@ -130,6 +138,20 @@ export class WrapperProviders {
         frequency,
         timeout: length,
       });
+
+      const topics = engine.supportsEventTopics();
+      if (topics.length > 0) {
+        logger.info(
+          `Provider ${provider.getProviderName()} subscribing to events for topics: ${topics.join(
+            ',',
+          )}`,
+        );
+        await this.options.events.subscribe({
+          topics,
+          id: `catalog-backend-module-incremental-ingestion:${provider.getProviderName()}`,
+          onEvent: evt => engine.onEvent(evt),
+        });
+      }
     } catch (error) {
       logger.warn(
         `Failed to initialize incremental ingestion provider ${provider.getProviderName()}, ${stringifyError(
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
index 8752bd3137..9e931c11fd 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
@@ -25,6 +25,7 @@ import {
   IncrementalEntityProviderOptions,
 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 import { WrapperProviders } from './WrapperProviders';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
 
 /**
  * @public
@@ -106,6 +107,7 @@ export const catalogModuleIncrementalIngestionEntityProvider =
           httpRouter: coreServices.httpRouter,
           logger: coreServices.logger,
           scheduler: coreServices.scheduler,
+          events: eventsServiceRef,
         },
         async init({
           catalog,
@@ -114,6 +116,7 @@ export const catalogModuleIncrementalIngestionEntityProvider =
           httpRouter,
           logger,
           scheduler,
+          events,
         }) {
           const client = await database.getClient();
 
@@ -122,6 +125,7 @@ export const catalogModuleIncrementalIngestionEntityProvider =
             logger,
             client,
             scheduler,
+            events,
           });
 
           for (const entry of addedProviders) {
@@ -129,7 +133,7 @@ export const catalogModuleIncrementalIngestionEntityProvider =
             catalog.addEntityProvider(wrapped);
           }
 
-          httpRouter.use(await providers.adminRouter());
+          httpRouter.use(providers.adminRouter());
         },
       });
     },
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
index d3ccb8863b..ad8d6ce103 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
@@ -14,25 +14,29 @@
  * limitations under the License.
  */
 
-import { errorHandler } from '@backstage/backend-common';
 import express from 'express';
 import Router from 'express-promise-router';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import { Config } from '@backstage/config';
 
 export class IncrementalProviderRouter {
   private manager: IncrementalIngestionDatabaseManager;
   private logger: LoggerService;
+  private config: Config;
 
   constructor(
     manager: IncrementalIngestionDatabaseManager,
     logger: LoggerService,
+    config: Config,
   ) {
     this.manager = manager;
     this.logger = logger;
+    this.config = config;
   }
 
-  async createRouter() {
+  createRouter(): express.Router {
     const router = Router();
     router.use(express.json());
 
@@ -249,7 +253,11 @@ export class IncrementalProviderRouter {
       },
     );
 
-    router.use(errorHandler());
+    const middleware = MiddlewareFactory.create({
+      logger: this.logger,
+      config: this.config,
+    });
+    router.use(middleware.error());
 
     return router;
   }
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
deleted file mode 100644
index 89698da1de..0000000000
--- a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
+++ /dev/null
@@ -1,96 +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.
- */
-
-// Think this file will probably go away once we move to backend system
-// And restructure into the /dev folder
-// eslint-disable-next-line @backstage/no-undeclared-imports
-import { createBackend } from '@backstage/backend-defaults';
-import {
-  coreServices,
-  createBackendModule,
-  createServiceFactory,
-} from '@backstage/backend-plugin-api';
-import { ConfigReader } from '@backstage/config';
-import {
-  IncrementalEntityProvider,
-  incrementalIngestionProvidersExtensionPoint,
-} from '.';
-import catalogModuleIncrementalIngestionEntityProvider from './alpha';
-
-const provider: IncrementalEntityProvider<number, {}> = {
-  getProviderName: () => 'test-provider',
-  around: burst => burst(0),
-  next: async (_context, cursor) => {
-    await new Promise(resolve => setTimeout(resolve, 500));
-    if (cursor === undefined || cursor < 3) {
-      console.log(`### Returning batch #${cursor}`);
-      return { done: false, entities: [], cursor: (cursor ?? 0) + 1 };
-    }
-
-    console.log('### Last batch reached, stopping');
-    return { done: true };
-  },
-};
-
-async function main() {
-  const config = {
-    backend: {
-      baseUrl: 'http://localhost:7007',
-      listen: ':7007',
-      database: { client: 'better-sqlite3', connection: ':memory:' },
-    },
-  };
-
-  const backend = createBackend();
-
-  backend.add(
-    createServiceFactory({
-      service: coreServices.rootConfig,
-      deps: {},
-      factory: () => new ConfigReader(config),
-    }),
-  );
-  backend.add(import('@backstage/plugin-catalog-backend/alpha'));
-  backend.add(catalogModuleIncrementalIngestionEntityProvider);
-  backend.add(
-    createBackendModule({
-      pluginId: 'catalog',
-      moduleId: 'incremental-test-provider',
-      register(reg) {
-        reg.registerInit({
-          deps: { extension: incrementalIngestionProvidersExtensionPoint },
-          async init({ extension }) {
-            extension.addProvider({
-              provider: provider,
-              options: {
-                burstInterval: { seconds: 1 },
-                burstLength: { seconds: 10 },
-                restLength: { seconds: 10 },
-              },
-            });
-          },
-        });
-      },
-    }),
-  );
-
-  await backend.start();
-}
-
-main().catch(error => {
-  console.error(error.stack);
-  process.exit(1);
-});
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
index a31076c6fd..ed4414b68b 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
@@ -20,16 +20,19 @@ import {
   PluginEnvironment,
 } from '../types';
 import { CatalogBuilder as CoreCatalogBuilder } from '@backstage/plugin-catalog-backend';
+import { createDeferred } from '@backstage/types';
 import { Duration } from 'luxon';
 import { Knex } from 'knex';
 import { IncrementalIngestionEngine } from '../engine/IncrementalIngestionEngine';
 import { applyDatabaseMigrations } from '../database/migrations';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
 import { IncrementalProviderRouter } from '../router/routes';
-import { Deferred } from '../util';
 import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
 
-/** @public */
+/**
+ * @public
+ * @deprecated Please migrate to the new backend system and import `@backstage/plugin-catalog-backend-module-incremental-ingestion` as a module, and add providers to the `incrementalIngestionProvidersExtensionPoint` instead
+ */
 export class IncrementalCatalogBuilder {
   /**
    * Creates the incremental catalog builder, which extends the regular catalog builder.
@@ -43,16 +46,14 @@ export class IncrementalCatalogBuilder {
     return new IncrementalCatalogBuilder(env, builder, client, manager);
   }
 
-  private ready: Deferred<void>;
+  private ready = createDeferred();
 
   private constructor(
     private env: PluginEnvironment,
     private builder: CoreCatalogBuilder,
     private client: Knex,
     private manager: IncrementalIngestionDatabaseManager,
-  ) {
-    this.ready = new Deferred<void>();
-  }
+  ) {}
 
   async build() {
     await applyDatabaseMigrations(this.client);
@@ -65,6 +66,7 @@ export class IncrementalCatalogBuilder {
     const incrementalAdminRouter = await new IncrementalProviderRouter(
       this.manager,
       routerLogger,
+      this.env.config,
     ).createRouter();
 
     return { incrementalAdminRouter };
@@ -99,12 +101,17 @@ export class IncrementalCatalogBuilder {
           connection,
         });
 
-        const frequency = Duration.isDuration(burstInterval)
+        let frequency = Duration.isDuration(burstInterval)
           ? burstInterval
           : Duration.fromObject(burstInterval);
-        const length = Duration.isDuration(burstLength)
+        if (frequency.as('milliseconds') < 5000) {
+          frequency = Duration.fromObject({ seconds: 5 }); // don't let it be silly low, to not overload the scheduler
+        }
+
+        let length = Duration.isDuration(burstLength)
           ? burstLength
           : Duration.fromObject(burstLength);
+        length = length.plus(Duration.fromObject({ minutes: 1 })); // some margin from the actual completion
 
         await scheduler.scheduleTask({
           id: provider.getProviderName(),
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
index 79368638f2..2c951aea07 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-import type { PluginDatabaseManager } from '@backstage/backend-common';
-import type { Config } from '@backstage/config';
+import {
+  DatabaseService,
+  LoggerService,
+  PermissionsService,
+  RootConfigService,
+  RootLoggerService,
+  SchedulerService,
+  SchedulerServiceTaskFunction,
+  UrlReaderService,
+} from '@backstage/backend-plugin-api';
 import type {
   DeferredEntity,
   EntityProviderConnection,
 } from '@backstage/plugin-catalog-node';
 import { EventParams } from '@backstage/plugin-events-node';
-import type { PermissionEvaluator } from '@backstage/plugin-permission-common';
-import type { DurationObjectUnits } from 'luxon';
-import type { Logger } from 'winston';
+import { HumanDuration } from '@backstage/types';
 import { IncrementalIngestionDatabaseManager } from './database/IncrementalIngestionDatabaseManager';
-import {
-  LoggerService,
-  UrlReaderService,
-  SchedulerService,
-  SchedulerServiceTaskFunction,
-} from '@backstage/backend-plugin-api';
 
 /**
  * Ingest entities into the catalog in bite-sized chunks.
@@ -145,27 +145,27 @@ export interface IncrementalEntityProviderOptions {
    * Entities are ingested in bursts. This interval determines how
    * much time to wait in between each burst.
    */
-  burstInterval: DurationObjectUnits;
+  burstInterval: HumanDuration;
 
   /**
    * Entities are ingested in bursts. This value determines how long
    * to keep ingesting within each burst.
    */
-  burstLength: DurationObjectUnits;
+  burstLength: HumanDuration;
 
   /**
    * After a successful ingestion, the incremental entity provider
    * will rest for this period of time before starting to ingest
    * again.
    */
-  restLength: DurationObjectUnits;
+  restLength: HumanDuration;
 
   /**
    * In the event of an error during an ingestion burst, the backoff
    * determines how soon it will be retried. E.g.
    * `[{ minutes: 1}, { minutes: 5}, {minutes: 30 }, { hours: 3 }]`
    */
-  backoff?: DurationObjectUnits[];
+  backoff?: HumanDuration[];
 
   /**
    * If an error occurs at a data source that results in a large
@@ -186,12 +186,12 @@ export interface IncrementalEntityProviderOptions {
 
 /** @public */
 export type PluginEnvironment = {
-  logger: Logger;
-  database: PluginDatabaseManager;
+  logger: RootLoggerService;
+  database: DatabaseService;
   scheduler: SchedulerService;
-  config: Config;
+  config: RootConfigService;
   reader: UrlReaderService;
-  permissions: PermissionEvaluator;
+  permissions: PermissionsService;
 };
 
 export interface IterationEngine {
@@ -203,7 +203,7 @@ export interface IterationEngineOptions {
   connection: EntityProviderConnection;
   manager: IncrementalIngestionDatabaseManager;
   provider: IncrementalEntityProvider<unknown, unknown>;
-  restLength: DurationObjectUnits;
+  restLength: HumanDuration;
   ready: Promise<void>;
   backoff?: IncrementalEntityProviderOptions['backoff'];
   rejectRemovalsAbovePercentage?: number;
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/util.ts b/plugins/catalog-backend-module-incremental-ingestion/src/util.ts
deleted file mode 100644
index d9e820f826..0000000000
--- a/plugins/catalog-backend-module-incremental-ingestion/src/util.ts
+++ /dev/null
@@ -1,44 +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.
- */
-
-export class Deferred<T> implements Promise<T> {
-  #resolve?: (value: T) => void;
-  #reject?: (error: Error) => void;
-
-  public get resolve() {
-    return this.#resolve!;
-  }
-  public get reject() {
-    return this.#reject!;
-  }
-
-  public then: Promise<T>['then'];
-  public catch: Promise<T>['catch'];
-  public finally: Promise<T>['finally'];
-
-  public constructor() {
-    const promise = new Promise<T>((resolve, reject) => {
-      this.#resolve = resolve;
-      this.#reject = reject;
-    });
-
-    this.then = promise.then.bind(promise);
-    this.catch = promise.catch.bind(promise);
-    this.finally = promise.finally.bind(promise);
-  }
-
-  [Symbol.toStringTag]: 'Deferred' = 'Deferred';
-}
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 231e392400..036e3cf152 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,113 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.11.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.11.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.11.0-next.0
+
+### Minor Changes
+
+- 732700a: Updated fix for ldap entity mapping which doesn't require extra config setting of dnCaseSensitive
+- 95ac4a2: Add new ldap vendor config 'LLDAP'
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.10.0
+
+### Minor Changes
+
+- 415aeb3: Add Support for Google LDAP Vendor
+
+### Patch Changes
+
+- 884a86c: Added a `dnCaseSensitive` flag to support LDAP servers with mixed-case attributes.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.10.0-next.2
+
+### Minor Changes
+
+- 415aeb3: Add Support for Google LDAP Vendor
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.9.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.9.2-next.0
+
+### Patch Changes
+
+- 884a86c: Added a `dnCaseSensitive` flag to support LDAP servers with mixed-case attributes.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.9.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 224f61c459..ac76079370 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-ldap",
-  "version": "0.9.1",
+  "version": "0.11.0-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards LDAP",
   "backstage": {
     "role": "backend-plugin-module",
@@ -48,7 +48,7 @@
     "@types/ldapjs": "^2.2.5",
     "ldapjs": "^2.3.3",
     "lodash": "^4.17.21",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/client.ts b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
index 48a3eedfb8..ac0be476d5 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/client.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/client.ts
@@ -25,6 +25,8 @@ import {
   AEDirVendor,
   ActiveDirectoryVendor,
   DefaultLdapVendor,
+  GoogleLdapVendor,
+  LLDAPVendor,
   FreeIpaVendor,
   LdapVendor,
 } from './vendors';
@@ -236,6 +238,7 @@ export class LdapClient {
     if (this.vendor) {
       return this.vendor;
     }
+    const clientHost = this.client?.host || '';
     this.vendor = this.getRootDSE()
       .then(root => {
         if (root && root.raw?.forestFunctionality) {
@@ -244,6 +247,10 @@ export class LdapClient {
           return FreeIpaVendor;
         } else if (root && 'aeRoot' in root.raw) {
           return AEDirVendor;
+        } else if (clientHost === 'ldap.google.com') {
+          return GoogleLdapVendor;
+        } else if (root && root.raw?.vendorName?.toString() === 'LLDAP') {
+          return LLDAPVendor;
         }
         return DefaultLdapVendor;
       })
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
index 5a7e625577..007678c188 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/read.test.ts
@@ -330,6 +330,125 @@ describe('readLdapUsers', () => {
       new Map([['dn-value', new Set(['x', 'y', 'z'])]]),
     );
   });
+
+  it('transfers all attributes from for vendorDN case sensitivity', async () => {
+    const vendor = DefaultLdapVendor;
+    client.getVendor.mockResolvedValue(vendor);
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          uid: ['uid-value'],
+          description: ['description-value'],
+          cn: ['cn-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'Y', 'z'],
+          entryDN: ['dn-VALUE'],
+          entryUUID: ['uuid-value'],
+        }),
+      );
+    });
+    const config: UserConfig[] = [
+      {
+        dn: 'ddd',
+        options: {},
+        map: {
+          rdn: 'uid',
+          name: 'uid',
+          description: 'description',
+          displayName: 'cn',
+          email: 'mail',
+          picture: 'avatarUrl',
+          memberOf: 'memberOf',
+        },
+      },
+    ];
+    const { users, userMemberOf } = await readLdapUsers(client, config, vendor);
+    expect(users).toEqual([
+      expect.objectContaining({
+        metadata: {
+          name: 'uid-value',
+          description: 'description-value',
+          annotations: {
+            [LDAP_DN_ANNOTATION]: 'dn-VALUE',
+            [LDAP_RDN_ANNOTATION]: 'uid-value',
+            [LDAP_UUID_ANNOTATION]: 'uuid-value',
+          },
+        },
+        spec: {
+          profile: {
+            displayName: 'cn-value',
+            email: 'mail-value',
+            picture: 'avatarUrl-value',
+          },
+          memberOf: [],
+        },
+      }),
+    ]);
+    expect(userMemberOf).toEqual(
+      new Map([['dn-VALUE', new Set(['x', 'Y', 'z'])]]),
+    );
+  });
+  it('fails to transfer all attributes from for due case sensitivity', async () => {
+    const vendor = DefaultLdapVendor;
+    client.getVendor.mockResolvedValue(vendor);
+    client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
+      await fn(
+        searchEntry({
+          uid: ['uid-value'],
+          description: ['description-value'],
+          cn: ['cn-value'],
+          mail: ['mail-value'],
+          avatarUrl: ['avatarUrl-value'],
+          memberOf: ['x', 'Y', 'z'],
+          entryDN: ['dn-VALUE'],
+          entryUUID: ['uuid-value'],
+        }),
+      );
+    });
+    const config: UserConfig[] = [
+      {
+        dn: 'ddd',
+        options: {},
+        map: {
+          rdn: 'uid',
+          name: 'uid',
+          description: 'description',
+          displayName: 'cn',
+          email: 'mail',
+          picture: 'avatarUrl',
+          memberOf: 'memberOf',
+        },
+      },
+    ];
+    const { users, userMemberOf } = await readLdapUsers(client, config, vendor);
+    expect(users).toEqual([
+      expect.objectContaining({
+        metadata: {
+          name: 'uid-value',
+          description: 'description-value',
+          annotations: {
+            [LDAP_DN_ANNOTATION]: 'dn-VALUE',
+            [LDAP_RDN_ANNOTATION]: 'uid-value',
+            [LDAP_UUID_ANNOTATION]: 'uuid-value',
+          },
+        },
+        spec: {
+          profile: {
+            displayName: 'cn-value',
+            email: 'mail-value',
+            picture: 'avatarUrl-value',
+          },
+          memberOf: [],
+        },
+      }),
+    ]);
+
+    expect(userMemberOf).toEqual(
+      new Map([['dn-VALUE', new Set(['x', 'Y', 'z'])]]),
+    );
+  });
+
   it('can process a list of UserConfigs', async () => {
     client.getVendor.mockResolvedValue(DefaultLdapVendor);
     client.searchStreaming.mockImplementation(async (_dn, _opts, fn) => {
@@ -955,3 +1074,164 @@ describe('defaultGroupTransformer', () => {
     });
   });
 });
+
+/**
+ * Case Insensitivity Tests
+ */
+describe('defaultUserTransformerWithCaseSensitiveDNs', () => {
+  it('can set things safely', async () => {
+    const config: UserConfig = {
+      dn: 'ddd',
+      options: {},
+      map: {
+        rdn: 'uid',
+        name: 'uid',
+        displayName: 'cn',
+        email: 'mail',
+        memberOf: 'memberOf',
+      },
+      set: {
+        'metadata.annotations.a': 1,
+        'metadata.annotations': { a: 2, b: 3 },
+      },
+    };
+
+    const entry = searchEntry({
+      uid: ['uid-value'],
+      description: ['description-value'],
+      cn: ['cn-value'],
+      mail: ['mail-value'],
+      avatarUrl: ['avatarUrl-value'],
+      memberOf: ['x', 'y', 'z'],
+      entryDN: ['dn-VALUE'],
+      entryUUID: ['uuid-value'],
+    });
+
+    const vendor = DefaultLdapVendor;
+    let output = await defaultUserTransformer(vendor, config, entry);
+    expect(output).toEqual({
+      apiVersion: 'backstage.io/v1beta1',
+      kind: 'User',
+      metadata: {
+        annotations: {
+          'backstage.io/ldap-dn': 'dn-VALUE',
+          'backstage.io/ldap-rdn': 'uid-value',
+          'backstage.io/ldap-uuid': 'uuid-value',
+          a: 2,
+          b: 3,
+        },
+        name: 'uid-value',
+      },
+      spec: {
+        memberOf: [],
+        profile: { displayName: 'cn-value', email: 'mail-value' },
+      },
+    });
+
+    (output!.metadata.annotations as any).c = 7;
+
+    // exact same inputs again
+    output = await defaultUserTransformer(vendor, config, entry);
+    expect(output).toEqual({
+      apiVersion: 'backstage.io/v1beta1',
+      kind: 'User',
+      metadata: {
+        annotations: {
+          'backstage.io/ldap-dn': 'dn-VALUE',
+          'backstage.io/ldap-rdn': 'uid-value',
+          'backstage.io/ldap-uuid': 'uuid-value',
+          a: 2,
+          b: 3,
+        },
+        name: 'uid-value',
+      },
+      spec: {
+        memberOf: [],
+        profile: { displayName: 'cn-value', email: 'mail-value' },
+      },
+    });
+  });
+});
+
+describe('defaultGroupTransformerWithCaseSensitiveDNs', () => {
+  it('can set things safely', async () => {
+    const config: GroupConfig = {
+      dn: 'ddd',
+      options: {},
+      map: {
+        rdn: 'uid',
+        name: 'uid',
+        displayName: 'cn',
+        email: 'mail',
+        description: 'description',
+        type: 'type',
+        members: 'members',
+        memberOf: 'memberOf',
+      },
+      set: {
+        'metadata.annotations.a': 1,
+        'metadata.annotations': { a: 2, b: 3 },
+      },
+    };
+
+    const entry = searchEntry({
+      uid: ['uid-value'],
+      description: ['description-value'],
+      cn: ['cn-value'],
+      mail: ['mail-value'],
+      avatarUrl: ['avatarUrl-value'],
+      memberOf: ['x', 'y', 'z'],
+      entryDN: ['dn-VALUE'],
+      entryUUID: ['uuid-value'],
+    });
+
+    const vendor = DefaultLdapVendor;
+
+    let output = await defaultGroupTransformer(vendor, config, entry);
+    expect(output).toEqual({
+      apiVersion: 'backstage.io/v1beta1',
+      kind: 'Group',
+      metadata: {
+        annotations: {
+          'backstage.io/ldap-dn': 'dn-VALUE',
+          'backstage.io/ldap-rdn': 'uid-value',
+          'backstage.io/ldap-uuid': 'uuid-value',
+          a: 2,
+          b: 3,
+        },
+        description: 'description-value',
+        name: 'uid-value',
+      },
+      spec: {
+        type: 'unknown',
+        children: [],
+        profile: { displayName: 'cn-value', email: 'mail-value' },
+      },
+    });
+
+    (output!.metadata.annotations as any).c = 7;
+
+    // exact same inputs again
+    output = await defaultGroupTransformer(vendor, config, entry);
+    expect(output).toEqual({
+      apiVersion: 'backstage.io/v1beta1',
+      kind: 'Group',
+      metadata: {
+        annotations: {
+          'backstage.io/ldap-dn': 'dn-VALUE',
+          'backstage.io/ldap-rdn': 'uid-value',
+          'backstage.io/ldap-uuid': 'uuid-value',
+          a: 2,
+          b: 3,
+        },
+        description: 'description-value',
+        name: 'uid-value',
+      },
+      spec: {
+        type: 'unknown',
+        children: [],
+        profile: { displayName: 'cn-value', email: 'mail-value' },
+      },
+    });
+  });
+});
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/read.ts b/plugins/catalog-backend-module-ldap/src/ldap/read.ts
index e1cfc0730e..176d6fca7a 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/read.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/read.ts
@@ -366,6 +366,20 @@ function ensureItems(
   }
 }
 
+/**
+ * Helper function which dual searches the user/group maps first for original value, then for lowercased value.
+ * @param map - The map of DN's user or group as the key usually multicased.
+ * @param searchValue - The DN/memberOf search criteria which could potentially not match the map DN by case.
+ * @returns The value/result of the search criteria dual searching.
+ */
+function getValueFromMapWithInsensitiveKey(
+  map: Map<string, any>,
+  searchValue: string,
+) {
+  const result = map.get(searchValue);
+  return result ? result : map.get(searchValue.toLocaleLowerCase('en-US'));
+}
+
 /**
  * Takes groups and entities with empty relations, and fills in the various
  * relations that were returned by the readers, and forms the org hierarchy.
@@ -396,12 +410,24 @@ export function resolveRelations(
   for (const user of users) {
     userMap.set(stringifyEntityRef(user), user);
     userMap.set(user.metadata.annotations![LDAP_DN_ANNOTATION], user);
+    userMap.set(
+      user.metadata.annotations![LDAP_DN_ANNOTATION]?.toLocaleLowerCase(
+        'en-US',
+      ),
+      user,
+    );
     userMap.set(user.metadata.annotations![LDAP_RDN_ANNOTATION], user);
     userMap.set(user.metadata.annotations![LDAP_UUID_ANNOTATION], user);
   }
   for (const group of groups) {
     groupMap.set(stringifyEntityRef(group), group);
     groupMap.set(group.metadata.annotations![LDAP_DN_ANNOTATION], group);
+    groupMap.set(
+      group.metadata.annotations![LDAP_DN_ANNOTATION]?.toLocaleLowerCase(
+        'en-US',
+      ),
+      group,
+    );
     groupMap.set(group.metadata.annotations![LDAP_RDN_ANNOTATION], group);
     groupMap.set(group.metadata.annotations![LDAP_UUID_ANNOTATION], group);
   }
@@ -426,10 +452,10 @@ export function resolveRelations(
   // express relations in different directions. Some may have a user memberOf
   // overlay, some don't, for example.
   for (const [userN, groupsN] of userMemberOf.entries()) {
-    const user = userMap.get(userN);
+    const user = getValueFromMapWithInsensitiveKey(userMap, userN);
     if (user) {
       for (const groupN of groupsN) {
-        const group = groupMap.get(groupN);
+        const group = getValueFromMapWithInsensitiveKey(groupMap, groupN);
         if (group) {
           ensureItems(newUserMemberOf, stringifyEntityRef(user), [
             stringifyEntityRef(group),
@@ -439,10 +465,13 @@ export function resolveRelations(
     }
   }
   for (const [groupN, parentsN] of groupMemberOf.entries()) {
-    const group = groupMap.get(groupN);
+    const group = getValueFromMapWithInsensitiveKey(groupMap, groupN);
     if (group) {
       for (const parentN of parentsN) {
-        const parentGroup = groupMap.get(parentN);
+        const parentGroup = getValueFromMapWithInsensitiveKey(
+          groupMap,
+          parentN,
+        );
         if (parentGroup) {
           ensureItems(newGroupParents, stringifyEntityRef(group), [
             stringifyEntityRef(parentGroup),
@@ -455,18 +484,21 @@ export function resolveRelations(
     }
   }
   for (const [groupN, membersN] of groupMember.entries()) {
-    const group = groupMap.get(groupN);
+    const group = getValueFromMapWithInsensitiveKey(groupMap, groupN);
     if (group) {
       for (const memberN of membersN) {
         // Group members can be both users and groups in the input model, so
         // try both
-        const memberUser = userMap.get(memberN);
+        const memberUser = getValueFromMapWithInsensitiveKey(userMap, memberN);
         if (memberUser) {
           ensureItems(newUserMemberOf, stringifyEntityRef(memberUser), [
             stringifyEntityRef(group),
           ]);
         } else {
-          const memberGroup = groupMap.get(memberN);
+          const memberGroup = getValueFromMapWithInsensitiveKey(
+            groupMap,
+            memberN,
+          );
           if (memberGroup) {
             ensureItems(newGroupChildren, stringifyEntityRef(group), [
               stringifyEntityRef(memberGroup),
@@ -482,21 +514,21 @@ export function resolveRelations(
 
   // Write down the relations again into the actual entities
   for (const [userN, groupsN] of newUserMemberOf.entries()) {
-    const user = userMap.get(userN);
+    const user = getValueFromMapWithInsensitiveKey(userMap, userN);
     if (user) {
       user.spec.memberOf = Array.from(groupsN).sort();
     }
   }
   for (const [groupN, parentsN] of newGroupParents.entries()) {
     if (parentsN.size === 1) {
-      const group = groupMap.get(groupN);
+      const group = getValueFromMapWithInsensitiveKey(groupMap, groupN);
       if (group) {
         group.spec.parent = parentsN.values().next().value;
       }
     }
   }
   for (const [groupN, childrenN] of newGroupChildren.entries()) {
-    const group = groupMap.get(groupN);
+    const group = getValueFromMapWithInsensitiveKey(groupMap, groupN);
     if (group) {
       group.spec.children = Array.from(childrenN).sort();
     }
diff --git a/plugins/catalog-backend-module-ldap/src/ldap/vendors.ts b/plugins/catalog-backend-module-ldap/src/ldap/vendors.ts
index 9f4e365c38..872941608d 100644
--- a/plugins/catalog-backend-module-ldap/src/ldap/vendors.ts
+++ b/plugins/catalog-backend-module-ldap/src/ldap/vendors.ts
@@ -30,6 +30,7 @@ export type LdapVendor = {
    * The attribute name that holds a universal unique identifier for an entry.
    */
   uuidAttributeName: string;
+
   /**
    * Decode ldap entry values for a given attribute name to their string representation.
    *
@@ -83,6 +84,26 @@ export const AEDirVendor: LdapVendor = {
   },
 };
 
+export const GoogleLdapVendor: LdapVendor = {
+  dnAttributeName: 'dn',
+  uuidAttributeName: 'uid',
+  decodeStringAttribute: (entry, name) => {
+    return decode(entry, name, value => {
+      return value.toString();
+    });
+  },
+};
+
+export const LLDAPVendor: LdapVendor = {
+  dnAttributeName: 'dn',
+  uuidAttributeName: 'entryuuid',
+  decodeStringAttribute: (entry, name) => {
+    return decode(entry, name.toLocaleLowerCase('en-US'), value => {
+      return value.toString();
+    });
+  },
+};
+
 // Decode an attribute to a consumer
 function decode(
   entry: SearchEntry,
diff --git a/plugins/catalog-backend-module-logs/CHANGELOG.md b/plugins/catalog-backend-module-logs/CHANGELOG.md
index dd5ef450ee..213d04dd40 100644
--- a/plugins/catalog-backend-module-logs/CHANGELOG.md
+++ b/plugins/catalog-backend-module-logs/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-catalog-backend-module-logs
 
+## 0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-logs/package.json b/plugins/catalog-backend-module-logs/package.json
index e291147181..402b6b3e8f 100644
--- a/plugins/catalog-backend-module-logs/package.json
+++ b/plugins/catalog-backend-module-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-logs",
-  "version": "0.1.2",
+  "version": "0.1.5-next.2",
   "description": "A module that subscribes to catalog releated events and logs them.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index b7ef9c3e6a..93f8b70860 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,84 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.6.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.6.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.6.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.6.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.6.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.6.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 47f79d934d..8661290585 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.6.3",
+  "version": "0.6.5-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
   "backstage": {
     "role": "backend-plugin-module",
@@ -58,12 +58,10 @@
     "@backstage/plugin-catalog-common": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "@microsoft/microsoft-graph-types": "^2.6.0",
-    "@types/node-fetch": "^2.5.12",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "p-limit": "^3.0.2",
     "qs": "^6.9.4",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-msgraph/report.api.md b/plugins/catalog-backend-module-msgraph/report.api.md
index 35ae148a25..912ca16e85 100644
--- a/plugins/catalog-backend-module-msgraph/report.api.md
+++ b/plugins/catalog-backend-module-msgraph/report.api.md
@@ -17,7 +17,6 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import { OrganizationTransformer as OrganizationTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { ProviderConfigTransformer as ProviderConfigTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
-import { Response as Response_2 } from 'node-fetch';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api';
@@ -114,7 +113,7 @@ export class MicrosoftGraphClient {
     path: string,
     query?: ODataQuery,
     headers?: Record<string, string>,
-  ): Promise<Response_2>;
+  ): Promise<Response>;
   requestCollection<T>(
     path: string,
     query?: ODataQuery,
@@ -124,7 +123,7 @@ export class MicrosoftGraphClient {
     url: string,
     headers?: Record<string, string>,
     retryCount?: number,
-  ): Promise<Response_2>;
+  ): Promise<Response>;
 }
 
 // @public
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
index 2dc2a65135..aa2d735a07 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
@@ -20,7 +20,6 @@ import {
   ClientSecretCredential,
 } from '@azure/identity';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
-import fetch, { Response } from 'node-fetch';
 import qs from 'qs';
 import { MicrosoftGraphProviderConfig } from './config';
 
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
index 60e5c3d79b..4f1c9efbe2 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
@@ -296,7 +296,7 @@ export function resolveRelations(
   groupMember: Map<string, Set<string>>,
   groupMemberOf: Map<string, Set<string>>,
 ) {
-  // Build reference lookup tables, we reference them by the id the the graph
+  // Build reference lookup tables, we reference them by the id of the graph
   const groupMap: Map<string, GroupEntity> = new Map(); // by group-id or tenant-id
 
   for (const group of groups) {
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index b5af38dc8d..72e969e708 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,118 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.29.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-catalog-backend@1.28.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 5f058e2: Updated dependency `@apidevtools/json-schema-ref-parser` to `^11.0.0`.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-backend@1.28.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.2.4-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.28.0-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-backend@1.27.2-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.2.2
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index 9d43af255e..8f7fae6f1e 100644
--- a/plugins/catalog-backend-module-openapi/package.json
+++ b/plugins/catalog-backend-module-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-openapi",
-  "version": "0.2.2",
+  "version": "0.2.5-next.2",
   "description": "A Backstage catalog backend module that helps with OpenAPI specifications",
   "backstage": {
     "role": "backend-plugin-module",
@@ -37,7 +37,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^9.0.6",
+    "@apidevtools/json-schema-ref-parser": "^11.0.0",
     "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/plugins/catalog-backend-module-openapi/src/lib/bundle.ts b/plugins/catalog-backend-module-openapi/src/lib/bundle.ts
index 59f7e5791f..b2b186dff1 100644
--- a/plugins/catalog-backend-module-openapi/src/lib/bundle.ts
+++ b/plugins/catalog-backend-module-openapi/src/lib/bundle.ts
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import $RefParser from '@apidevtools/json-schema-ref-parser';
+import {
+  $RefParser,
+  ParserOptions,
+  ResolverOptions,
+} from '@apidevtools/json-schema-ref-parser';
 import { parse, stringify } from 'yaml';
 import * as path from 'path';
 
@@ -36,7 +40,7 @@ export async function bundleFileWithRefs(
   read: BundlerRead,
   resolveUrl: BundlerResolveUrl,
 ): Promise<string> {
-  const fileUrlReaderResolver: $RefParser.ResolverOptions = {
+  const fileUrlReaderResolver: ResolverOptions = {
     canRead: file => {
       const protocol = getProtocol(file.url);
       return protocol === undefined || protocol === 'file';
@@ -47,7 +51,7 @@ export async function bundleFileWithRefs(
       return await read(url);
     },
   };
-  const httpUrlReaderResolver: $RefParser.ResolverOptions = {
+  const httpUrlReaderResolver: ResolverOptions = {
     canRead: ref => {
       const protocol = getProtocol(ref.url);
       return protocol === 'http' || protocol === 'https';
@@ -58,7 +62,7 @@ export async function bundleFileWithRefs(
     },
   };
 
-  const options: $RefParser.Options = {
+  const options: ParserOptions = {
     resolve: {
       file: fileUrlReaderResolver,
       http: httpUrlReaderResolver,
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index 318499d87b..9034f0fda9 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.4
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index 0efee842ef..80cc2af988 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-puppetdb",
-  "version": "0.2.3",
+  "version": "0.2.5-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
   "backstage": {
     "role": "backend-plugin-module",
@@ -61,8 +61,7 @@
     "@backstage/types": "workspace:^",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts b/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
index 18a6eb077f..891b19691a 100644
--- a/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
@@ -18,7 +18,6 @@ import { PuppetDbEntityProviderConfig } from '../providers';
 import { PuppetNode, ResourceTransformer } from './types';
 import { ResourceEntity } from '@backstage/catalog-model';
 import { defaultResourceTransformer } from './transformers';
-import fetch from 'node-fetch';
 import { ResponseError } from '@backstage/errors';
 import { ENDPOINT_FACTSETS } from './constants';
 import { LoggerService } from '@backstage/backend-plugin-api';
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
index c2e9164126..0bec90e9db 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-catalog-backend-module-scaffolder-entity-model
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/package.json b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
index 384e2c725a..8aa73ba42b 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/package.json
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-scaffolder-entity-model",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "Adds support for the scaffolder specific entity model (e.g. the Template kind) to the catalog backend plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
index c212be0e8c..8dd8ca1c2f 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @backstage/plugin-catalog-backend-module-unprocessed
 
+## 0.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.6-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.5.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.5
+
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index 075c31fe09..42685e45a0 100644
--- a/plugins/catalog-backend-module-unprocessed/package.json
+++ b/plugins/catalog-backend-module-unprocessed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-unprocessed",
-  "version": "0.5.1",
+  "version": "0.5.3-next.2",
   "description": "Backstage Catalog module to view unprocessed entities",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index e49cc3cb6e..65abfa1a07 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,227 @@
 # @backstage/plugin-catalog-backend
 
+## 1.29.0-next.2
+
+### Minor Changes
+
+- c1307b4: Implement `/entities` in terms of `queryEntities` to not run into memory and performance problems on large catalogs
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 8013c9c: Perform the by-query count inlined with the main query
+- feba9ee: Use a join based strategy for filtering, when having small page sizes
+- 1fdb48e: Use a faster count method on pg when computing some metrics
+- 0c33465: Implement `/entities/by-name/:kind/:namespace/:name` using `getEntitiesByRefs`
+- d93390d: When parsing filters, do not make redundant `anyOf` and `allOf` nodes when there's only a single entry within them
+- 24ecea8: Avoid extra ordering in by-query when the user doesn't ask for it
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.29.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+- 1d0bc11: Fetch all facets in a single database query
+
+### Patch Changes
+
+- e4aab10: Fix a bug where sometimes the `by-query` endpoint could return nulls for entities that were not yet stitched.
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## 1.28.1-next.0
+
+### Patch Changes
+
+- f159b25: Compute deltas more efficiently, which generally leads to less wasted processing cycles
+- 56511ba: Be more aggressive in dequeueing entities for stitching
+- 71152e3: Correctly report stitching queue length
+- 3ab57c6: Support changing location keys on existing entities, in delta mutations
+- 2924ffe: Compute some metrics using search table facet aggregations instead of reading the full refresh state
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.6-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 1.28.0
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+- 76857da: Added `entity_ref` column to `final_entities` in order to move `refresh_state` away from the read path
+- 34d4360: Drop redundant indices from the database.
+
+  The following redundant indices are removed in this version:
+
+  - `final_entities_entity_id_idx` - overlaps with `final_entities_pkey`
+  - `refresh_state_entity_id_idx` - overlaps with `refresh_state_pkey`
+  - `refresh_state_entity_ref_idx` - overlaps with `refresh_state_entity_ref_uniq`
+  - `search_key_idx` and `search_value_idx` - these were replaced by the composite index `search_key_value_idx` in #22594
+
+  No negative end user impact is expected, but rather that performance should increase due to less index churn.
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- b89834b: Fixed an issue where entities would not be marked for restitching if only the target of a relationship changed.
+- 1bf02cc: Fixed bug when searching an entity by `spec.profile.displayName` in the catalog on the frontend. Text filter fields were not applied correctly to the database query resulting in empty results.
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5efde17: Internal refactor to slightly speed up the processing loop
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-node@0.8.5
+
+## 1.28.0-next.3
+
+### Minor Changes
+
+- 76857da: Added `entity_ref` column to `final_entities` in order to move `refresh_state` away from the read path
+- 34d4360: Drop redundant indices from the database.
+
+  The following redundant indices are removed in this version:
+
+  - `final_entities_entity_id_idx` - overlaps with `final_entities_pkey`
+  - `refresh_state_entity_id_idx` - overlaps with `refresh_state_pkey`
+  - `refresh_state_entity_ref_idx` - overlaps with `refresh_state_entity_ref_uniq`
+  - `search_key_idx` and `search_value_idx` - these were replaced by the composite index `search_key_value_idx` in #22594
+
+  No negative end user impact is expected, but rather that performance should increase due to less index churn.
+
+### Patch Changes
+
+- b89834b: Fixed an issue where entities would not be marked for restitching if only the target of a relationship changed.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.3
+
+## 1.28.0-next.2
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 1.27.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.1
+
+## 1.27.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.5-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 1.27.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 1ab107ef10..8dd5e50480 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -157,9 +157,9 @@ export interface Config {
           /** Defer stitching to be performed asynchronously */
           mode: 'deferred';
           /** Polling interval for tasks in seconds */
-          pollingInterval?: HumanDuration;
+          pollingInterval?: HumanDuration | string;
           /** How long to wait for a stitch to complete before giving up in seconds */
-          stitchTimeout?: HumanDuration;
+          stitchTimeout?: HumanDuration | string;
         };
 
     /**
diff --git a/plugins/catalog-backend/migrations/20241024104700_add_entity_ref_to_final_entities.js b/plugins/catalog-backend/migrations/20241024104700_add_entity_ref_to_final_entities.js
new file mode 100644
index 0000000000..ef81dbdfe9
--- /dev/null
+++ b/plugins/catalog-backend/migrations/20241024104700_add_entity_ref_to_final_entities.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-check
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('final_entities', table => {
+    table
+      .string('entity_ref')
+      .nullable()
+      .comment('The entity reference of the entity');
+  });
+
+  await knex
+    .update({
+      entity_ref: knex
+        .select('r.entity_ref')
+        .from('refresh_state as r')
+        .where('r.entity_id', knex.raw('f.entity_id')),
+    })
+    .table('final_entities as f');
+
+  await knex.schema.alterTable('final_entities', table => {
+    table.string('entity_ref').notNullable().alter({ alterNullable: true });
+    table.unique(['entity_ref'], {
+      indexName: 'final_entities_entity_ref_uniq',
+    });
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('final_entities', table => {
+    table.dropUnique([], 'final_entities_entity_ref_uniq');
+    table.dropColumn('entity_ref');
+  });
+};
diff --git a/plugins/catalog-backend/migrations/20241111000000_drop_redundant_indices.js b/plugins/catalog-backend/migrations/20241111000000_drop_redundant_indices.js
new file mode 100644
index 0000000000..142e372cb9
--- /dev/null
+++ b/plugins/catalog-backend/migrations/20241111000000_drop_redundant_indices.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-check
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('final_entities', table => {
+    table.dropIndex([], 'final_entities_entity_id_idx'); // overlaps with final_entities_pkey
+  });
+
+  await knex.schema.alterTable('refresh_state', table => {
+    table.dropIndex([], 'refresh_state_entity_id_idx'); // overlaps with refresh_state_pkey
+    table.dropIndex([], 'refresh_state_entity_ref_idx'); // overlaps with refresh_state_entity_ref_uniq
+  });
+
+  await knex.schema.alterTable('search', table => {
+    table.dropIndex([], 'search_key_idx'); // was replaced by search_key_value_idx in 20240130092632_search_index
+    table.dropIndex([], 'search_value_idx'); // was replaced by search_key_value_idx in 20240130092632_search_index
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function down(knex) {
+  await knex.schema.alterTable('final_entities', table => {
+    table.index('entity_id', 'final_entities_entity_id_idx');
+  });
+
+  await knex.schema.alterTable('refresh_state', table => {
+    table.index('entity_id', 'refresh_state_entity_id_idx');
+    table.index('entity_ref', 'refresh_state_entity_ref_idx');
+  });
+
+  await knex.schema.alterTable('search', table => {
+    table.index(['key'], 'search_key_idx');
+    table.index(['value'], 'search_value_idx');
+  });
+};
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 7e08090c6a..09c6afd454 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.27.0",
+  "version": "1.29.0-next.2",
   "description": "The Backstage backend plugin that provides the Backstage catalog",
   "backstage": {
     "role": "backend-plugin",
@@ -76,7 +76,7 @@
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-search-backend-module-catalog": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/api": "^1.9.0",
     "@types/express": "^4.17.6",
     "codeowners-utils": "^1.0.2",
     "core-js": "^3.6.5",
@@ -89,10 +89,9 @@
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
     "minimatch": "^9.0.0",
-    "node-fetch": "^2.7.0",
     "p-limit": "^3.0.2",
     "prom-client": "^15.0.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "yaml": "^2.0.0",
     "yn": "^4.0.0",
     "zod": "^3.22.4"
@@ -108,7 +107,6 @@
     "@types/glob": "^8.0.0",
     "@types/lodash": "^4.14.151",
     "@types/supertest": "^2.0.8",
-    "@types/uuid": "^9.0.0",
     "better-sqlite3": "^11.0.0",
     "luxon": "^3.0.0",
     "msw": "^1.0.0",
diff --git a/plugins/catalog-backend/src/catalog/types.ts b/plugins/catalog-backend/src/catalog/types.ts
index a02c74c0c1..b3e52fb480 100644
--- a/plugins/catalog-backend/src/catalog/types.ts
+++ b/plugins/catalog-backend/src/catalog/types.ts
@@ -203,6 +203,7 @@ export interface QueryEntitiesInitialRequest {
     term: string;
     fields?: string[];
   };
+  skipTotalItems?: boolean;
 }
 
 /**
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index 37608b1493..e530c30d8b 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -283,7 +283,7 @@ describe('DefaultProcessingDatabase', () => {
     );
 
     it.each(databases.eachSupportedId())(
-      'adds deferred entities to the the refresh_state table to be picked up later, %p',
+      'adds deferred entities to the refresh_state table to be picked up later, %p',
       async databaseId => {
         const { knex, db } = await createDatabase(databaseId);
         await insertRefreshStateRow(knex, {
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 1cc39b3f43..ee836ff038 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -198,40 +198,46 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
   }
 
   async getProcessableEntities(
-    txOpaque: Transaction,
+    maybeTx: Transaction | Knex,
     request: { processBatchSize: number },
   ): Promise<GetProcessableEntitiesResult> {
-    const tx = txOpaque as Knex.Transaction;
+    const knex = maybeTx as Knex.Transaction | Knex;
 
-    let itemsQuery = tx<DbRefreshStateRow>('refresh_state').select();
+    let itemsQuery = knex<DbRefreshStateRow>('refresh_state').select([
+      'entity_id',
+      'entity_ref',
+      'unprocessed_entity',
+      'result_hash',
+      'cache',
+      'errors',
+      'location_key',
+      'next_update_at',
+    ]);
 
     // This avoids duplication of work because of race conditions and is
     // also fast because locked rows are ignored rather than blocking.
     // It's only available in MySQL and PostgreSQL
-    if (['mysql', 'mysql2', 'pg'].includes(tx.client.config.client)) {
+    if (['mysql', 'mysql2', 'pg'].includes(knex.client.config.client)) {
       itemsQuery = itemsQuery.forUpdate().skipLocked();
     }
 
     const items = await itemsQuery
-      .where('next_update_at', '<=', tx.fn.now())
+      .where('next_update_at', '<=', knex.fn.now())
       .limit(request.processBatchSize)
       .orderBy('next_update_at', 'asc');
 
     const interval = this.options.refreshInterval();
 
     const nextUpdateAt = (refreshInterval: number) => {
-      if (tx.client.config.client.includes('sqlite3')) {
-        return tx.raw(`datetime('now', ?)`, [`${refreshInterval} seconds`]);
+      if (knex.client.config.client.includes('sqlite3')) {
+        return knex.raw(`datetime('now', ?)`, [`${refreshInterval} seconds`]);
+      } else if (knex.client.config.client.includes('mysql')) {
+        return knex.raw(`now() + interval ${refreshInterval} second`);
       }
-
-      if (tx.client.config.client.includes('mysql')) {
-        return tx.raw(`now() + interval ${refreshInterval} second`);
-      }
-
-      return tx.raw(`now() + interval '${refreshInterval} seconds'`);
+      return knex.raw(`now() + interval '${refreshInterval} seconds'`);
     };
 
-    await tx<DbRefreshStateRow>('refresh_state')
+    await knex<DbRefreshStateRow>('refresh_state')
       .whereIn(
         'entity_ref',
         items.map(i => i.entity_ref),
@@ -247,16 +253,12 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
             id: i.entity_id,
             entityRef: i.entity_ref,
             unprocessedEntity: JSON.parse(i.unprocessed_entity) as Entity,
-            processedEntity: i.processed_entity
-              ? (JSON.parse(i.processed_entity) as Entity)
-              : undefined,
             resultHash: i.result_hash || '',
             nextUpdateAt: timestampToDateTime(i.next_update_at),
-            lastDiscoveryAt: timestampToDateTime(i.last_discovery_at),
             state: i.cache ? JSON.parse(i.cache) : undefined,
             errors: i.errors,
             locationKey: i.location_key,
-          } as RefreshStateItem),
+          } satisfies RefreshStateItem),
       ),
     };
   }
diff --git a/plugins/catalog-backend/src/database/DefaultProviderDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProviderDatabase.test.ts
index 0218d25a18..ac361795e1 100644
--- a/plugins/catalog-backend/src/database/DefaultProviderDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProviderDatabase.test.ts
@@ -19,13 +19,14 @@ import {
   TestDatabaseId,
   TestDatabases,
 } from '@backstage/backend-test-utils';
-import { Entity } from '@backstage/catalog-model';
+import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { Knex } from 'knex';
 import * as uuid from 'uuid';
 import { DefaultProviderDatabase } from './DefaultProviderDatabase';
 import { applyDatabaseMigrations } from './migrations';
 import { DbRefreshStateReferencesRow, DbRefreshStateRow } from './tables';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { generateStableHash } from './util';
 
 jest.setTimeout(60_000);
 
@@ -690,13 +691,8 @@ describe('DefaultProviderDatabase', () => {
     it.each(databases.eachSupportedId())(
       'should successfully fall back from batch to individual mode on conflicts, %p',
       async databaseId => {
-        const fakeLogger = {
-          debug: jest.fn(),
-        };
-        const { knex, db } = await createDatabase(
-          databaseId,
-          fakeLogger as any,
-        );
+        const fakeLogger = mockServices.logger.mock();
+        const { knex, db } = await createDatabase(databaseId, fakeLogger);
 
         await createLocations(knex, ['component:default/a']);
 
@@ -744,11 +740,8 @@ describe('DefaultProviderDatabase', () => {
     it.each(databases.eachSupportedId())(
       'should gracefully handle accidental duplicate refresh state references when deletion happens during a full sync, %p',
       async databaseId => {
-        const fakeLogger = { debug: jest.fn() };
-        const { knex, db } = await createDatabase(
-          databaseId,
-          fakeLogger as any,
-        );
+        const fakeLogger = mockServices.logger.mock();
+        const { knex, db } = await createDatabase(databaseId, fakeLogger);
 
         await createLocations(knex, ['component:default/a']);
 
@@ -773,5 +766,226 @@ describe('DefaultProviderDatabase', () => {
         expect(state).toEqual([]);
       },
     );
+
+    it.each(databases.eachSupportedId())(
+      'should properly translate deltas into add/update/remove, %p',
+      async databaseId => {
+        const fakeLogger = mockServices.logger.mock();
+        const { knex, db } = await createDatabase(databaseId, fakeLogger);
+
+        const entity1Before: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n1' },
+        };
+        const entity1After: Entity = {
+          ...entity1Before,
+          apiVersion: '2',
+        };
+
+        const entity2Before: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n2' },
+        };
+        const entity2After: Entity = {
+          ...entity2Before,
+          apiVersion: '2',
+        };
+
+        const entity3: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n3' },
+        };
+
+        const entity4: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n4' },
+        };
+
+        const entity5: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n5' },
+        };
+
+        const entity6: Entity = {
+          apiVersion: '1',
+          kind: 'k',
+          metadata: { namespace: 'ns', name: 'n6' },
+        };
+
+        await insertRefreshStateRow(knex, {
+          entity_id: 'id1',
+          entity_ref: stringifyEntityRef(entity1Before),
+          last_discovery_at: new Date(),
+          next_update_at: new Date(),
+          errors: '[]',
+          unprocessed_entity: JSON.stringify(entity1Before),
+          unprocessed_hash: generateStableHash(entity1Before),
+        });
+        await insertRefRow(knex, {
+          source_key: 'my-provider',
+          target_entity_ref: stringifyEntityRef(entity1Before),
+        });
+        await insertRefreshStateRow(knex, {
+          entity_id: 'id2',
+          entity_ref: stringifyEntityRef(entity2Before),
+          last_discovery_at: new Date(),
+          next_update_at: new Date(),
+          errors: '[]',
+          unprocessed_entity: JSON.stringify(entity2Before),
+          unprocessed_hash: generateStableHash(entity2After), // lie about the hash!
+        });
+        await insertRefRow(knex, {
+          source_key: 'my-provider',
+          target_entity_ref: stringifyEntityRef(entity2Before),
+        });
+        await insertRefreshStateRow(knex, {
+          entity_id: 'id4',
+          entity_ref: stringifyEntityRef(entity4),
+          last_discovery_at: new Date(),
+          next_update_at: new Date(),
+          errors: '[]',
+          unprocessed_entity: JSON.stringify(entity4),
+          unprocessed_hash: generateStableHash(entity4),
+        });
+        await insertRefRow(knex, {
+          source_key: 'my-provider',
+          target_entity_ref: stringifyEntityRef(entity4),
+        });
+        await insertRefreshStateRow(knex, {
+          entity_id: 'id5',
+          entity_ref: stringifyEntityRef(entity5),
+          last_discovery_at: new Date(),
+          next_update_at: new Date(),
+          errors: '[]',
+          unprocessed_entity: JSON.stringify(entity5),
+          unprocessed_hash: generateStableHash(entity5),
+        });
+        await insertRefRow(knex, {
+          source_key: 'my-provider',
+          target_entity_ref: stringifyEntityRef(entity5),
+        });
+        await insertRefreshStateRow(knex, {
+          entity_id: 'id6',
+          entity_ref: stringifyEntityRef(entity6),
+          last_discovery_at: new Date(),
+          next_update_at: new Date(),
+          errors: '[]',
+          unprocessed_entity: JSON.stringify(entity6),
+          unprocessed_hash: generateStableHash(entity6),
+          location_key: 'old',
+        });
+        await insertRefRow(knex, {
+          source_key: 'my-provider',
+          target_entity_ref: stringifyEntityRef(entity6),
+        });
+
+        await db.transaction(async tx => {
+          await db.replaceUnprocessedEntities(tx, {
+            type: 'delta',
+            sourceKey: 'my-provider',
+            added: [
+              // we used the right hashes for entity1, so this will turn into an update
+              { entity: entity1After },
+              // we lied about the hash for entity2, so this will become a no-op
+              { entity: entity2After },
+              // this didn't exist, so will become an add
+              { entity: entity3 },
+              // only the location key changed, so this will become an update
+              { entity: entity5, locationKey: 'new' },
+              // only the location key changed, so this will become an update
+              { entity: entity6, locationKey: 'new' },
+            ],
+            removed: [{ entityRef: stringifyEntityRef(entity4) }],
+          });
+        });
+
+        const state = await knex<DbRefreshStateRow>('refresh_state')
+          .select([
+            'entity_ref',
+            'unprocessed_entity',
+            'unprocessed_hash',
+            'location_key',
+          ])
+          .orderBy('entity_ref');
+
+        expect(state).toEqual([
+          {
+            entity_ref: stringifyEntityRef(entity1After),
+            unprocessed_entity: JSON.stringify(entity1After),
+            unprocessed_hash: generateStableHash(entity1After),
+            location_key: null,
+          },
+          {
+            entity_ref: stringifyEntityRef(entity2After),
+            unprocessed_entity: JSON.stringify(entity2Before), // didn't change
+            unprocessed_hash: generateStableHash(entity2After),
+            location_key: null,
+          },
+          {
+            entity_ref: stringifyEntityRef(entity3),
+            unprocessed_entity: JSON.stringify(entity3),
+            unprocessed_hash: generateStableHash(entity3),
+            location_key: null,
+          },
+          // entity4 was deleted here
+          {
+            entity_ref: stringifyEntityRef(entity5),
+            unprocessed_entity: JSON.stringify(entity5),
+            unprocessed_hash: generateStableHash(entity5),
+            location_key: 'new', // permitted to change, because it was null before
+          },
+          {
+            entity_ref: stringifyEntityRef(entity6),
+            unprocessed_entity: JSON.stringify(entity6),
+            unprocessed_hash: generateStableHash(entity6),
+            location_key: 'new', // managed to update only the location key
+          },
+        ]);
+      },
+    );
+
+    it.each(databases.eachSupportedId())(
+      'can handle large deltas without exploding, %p',
+      async databaseId => {
+        const fakeLogger = mockServices.logger.mock();
+        const { knex, db } = await createDatabase(databaseId, fakeLogger);
+
+        const count = 10000;
+        const padded = (n: number) => String(n).padStart(8, '0');
+
+        const entities = Array.from({ length: count }, (_, i) => ({
+          entity: {
+            apiVersion: '1',
+            kind: 'k',
+            metadata: { namespace: 'ns', name: padded(i) },
+          },
+        }));
+
+        await db.transaction(async tx => {
+          await db.replaceUnprocessedEntities(tx, {
+            type: 'delta',
+            sourceKey: 'my-provider',
+            added: entities,
+            removed: [],
+          });
+        });
+
+        const state = await knex<DbRefreshStateRow>('refresh_state')
+          .select(['entity_ref', 'unprocessed_entity', 'unprocessed_hash'])
+          .orderBy('entity_ref');
+
+        expect(state).toHaveLength(count);
+        expect(state[0]).toEqual({
+          entity_ref: stringifyEntityRef(entities[0].entity),
+          unprocessed_entity: JSON.stringify(entities[0].entity),
+          unprocessed_hash: generateStableHash(entities[0].entity),
+        });
+      },
+    );
   });
 });
diff --git a/plugins/catalog-backend/src/database/DefaultProviderDatabase.ts b/plugins/catalog-backend/src/database/DefaultProviderDatabase.ts
index 94026fbfa0..03f72e06b7 100644
--- a/plugins/catalog-backend/src/database/DefaultProviderDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProviderDatabase.ts
@@ -75,10 +75,10 @@ export class DefaultProviderDatabase implements ProviderDatabase {
   }
 
   async replaceUnprocessedEntities(
-    txOpaque: Transaction,
+    txOpaque: Knex | Transaction,
     options: ReplaceUnprocessedEntitiesOptions,
   ): Promise<void> {
-    const tx = txOpaque as Knex.Transaction;
+    const tx = txOpaque as Knex | Knex.Transaction;
     const { toAdd, toUpsert, toRemove } = await this.createDelta(tx, options);
 
     if (toRemove.length) {
@@ -205,7 +205,7 @@ export class DefaultProviderDatabase implements ProviderDatabase {
   }
 
   private async createDelta(
-    tx: Knex.Transaction,
+    tx: Knex | Knex.Transaction,
     options: ReplaceUnprocessedEntitiesOptions,
   ): Promise<{
     toAdd: { deferred: DeferredEntity; hash: string }[];
@@ -213,14 +213,46 @@ export class DefaultProviderDatabase implements ProviderDatabase {
     toRemove: string[];
   }> {
     if (options.type === 'delta') {
-      return {
-        toAdd: [],
-        toUpsert: options.added.map(e => ({
-          deferred: e,
-          hash: generateStableHash(e.entity),
-        })),
-        toRemove: options.removed.map(e => e.entityRef),
-      };
+      const toAdd = new Array<{ deferred: DeferredEntity; hash: string }>();
+      const toUpsert = new Array<{ deferred: DeferredEntity; hash: string }>();
+      const toRemove = options.removed.map(e => e.entityRef);
+
+      for (const chunk of lodash.chunk(options.added, 1000)) {
+        const entityRefs = chunk.map(e => stringifyEntityRef(e.entity));
+        const rows = await tx<DbRefreshStateRow>('refresh_state')
+          .select(['entity_ref', 'unprocessed_hash', 'location_key'])
+          .whereIn('entity_ref', entityRefs);
+        const oldStates = new Map(
+          rows.map(row => [
+            row.entity_ref,
+            {
+              unprocessed_hash: row.unprocessed_hash,
+              location_key: row.location_key,
+            },
+          ]),
+        );
+
+        chunk.forEach((deferred, i) => {
+          const entityRef = entityRefs[i];
+          const newHash = generateStableHash(deferred.entity);
+          const oldState = oldStates.get(entityRef);
+          if (oldState === undefined) {
+            // Add any entity that does not exist in the database
+            toAdd.push({ deferred, hash: newHash });
+          } else if (
+            (deferred.locationKey ?? null) !== (oldState.location_key ?? null)
+          ) {
+            // Remove and then re-add any entity that exists, but with a different location key
+            toRemove.push(entityRef);
+            toAdd.push({ deferred, hash: newHash });
+          } else if (newHash !== oldState.unprocessed_hash) {
+            // Entities with modifications should be pushed through too
+            toUpsert.push({ deferred, hash: newHash });
+          }
+        });
+      }
+
+      return { toAdd, toUpsert, toRemove };
     }
 
     // Grab all of the existing references from the same source, and their locationKeys as well
@@ -267,7 +299,7 @@ export class DefaultProviderDatabase implements ProviderDatabase {
         // Add any entity that does not exist in the database
         toAdd.push(upsertItem);
       } else if (
-        (oldRef?.locationKey ?? undefined) !==
+        (oldRef.locationKey ?? undefined) !==
         (item.deferred.locationKey ?? undefined)
       ) {
         // Remove and then re-add any entity that exists, but with a different location key
diff --git a/plugins/catalog-backend/src/database/metrics.ts b/plugins/catalog-backend/src/database/metrics.ts
index 8eb307ea46..809405d69f 100644
--- a/plugins/catalog-backend/src/database/metrics.ts
+++ b/plugins/catalog-backend/src/database/metrics.ts
@@ -16,9 +16,8 @@
 
 import { Knex } from 'knex';
 import { createGaugeMetric } from '../util/metrics';
-import { DbRefreshStateRow, DbRelationsRow, DbLocationsRow } from './tables';
+import { DbRelationsRow, DbLocationsRow, DbSearchRow } from './tables';
 import { metrics } from '@opentelemetry/api';
-import { parseEntityRef } from '@backstage/catalog-model';
 
 export function initDatabaseMetrics(knex: Knex) {
   const seenProm = new Set<string>();
@@ -30,23 +29,22 @@ export function initDatabaseMetrics(knex: Knex) {
       help: 'Total amount of entities in the catalog. DEPRECATED: Please use opentelemetry metrics instead.',
       labelNames: ['kind'],
       async collect() {
-        const result = await knex<DbRefreshStateRow>('refresh_state').select(
-          'entity_ref',
-        );
-        const results = result
-          .map(row => row.entity_ref.split(':')[0])
-          .reduce((acc, e) => acc.set(e, (acc.get(e) || 0) + 1), new Map());
+        const results = await knex<DbSearchRow>('search')
+          .where('key', '=', 'kind')
+          .whereNotNull('value')
+          .select({ kind: 'value', count: knex.raw('count(*)') })
+          .groupBy('value');
 
-        results.forEach((value, key) => {
-          seenProm.add(key);
-          this.set({ kind: key }, value);
+        results.forEach(({ kind, count }) => {
+          seenProm.add(kind);
+          this.set({ kind }, Number(count));
         });
 
         // Set all the entities that were not seenProm to 0 and delete them from the seenProm set.
-        seenProm.forEach(key => {
-          if (!results.has(key)) {
-            this.set({ kind: key }, 0);
-            seenProm.delete(key);
+        seenProm.forEach(kind => {
+          if (!results.some(r => r.kind === kind)) {
+            this.set({ kind }, 0);
+            seenProm.delete(kind);
           }
         });
       },
@@ -76,23 +74,22 @@ export function initDatabaseMetrics(knex: Knex) {
         description: 'Total amount of entities in the catalog',
       })
       .addCallback(async gauge => {
-        const result = await knex<DbRefreshStateRow>('refresh_state').select(
-          'entity_ref',
-        );
-        const results = result
-          .map(row => parseEntityRef(row.entity_ref).kind)
-          .reduce((acc, e) => acc.set(e, (acc.get(e) || 0) + 1), new Map());
+        const results = await knex<DbSearchRow>('search')
+          .where('key', '=', 'kind')
+          .whereNotNull('value')
+          .select({ kind: 'value', count: knex.raw('count(*)') })
+          .groupBy('value');
 
-        results.forEach((value, key) => {
-          seen.add(key);
-          gauge.observe(value, { kind: key });
+        results.forEach(({ kind, count }) => {
+          seen.add(kind);
+          gauge.observe(Number(count), { kind });
         });
 
         // Set all the entities that were not seen to 0 and delete them from the seen set.
-        seen.forEach(key => {
-          if (!results.has(key)) {
-            gauge.observe(0, { kind: key });
-            seen.delete(key);
+        seen.forEach(kind => {
+          if (!results.some(r => r.kind === kind)) {
+            gauge.observe(0, { kind });
+            seen.delete(kind);
           }
         });
       }),
@@ -101,20 +98,40 @@ export function initDatabaseMetrics(knex: Knex) {
         description: 'Total amount of registered locations in the catalog',
       })
       .addCallback(async gauge => {
-        const total = await knex<DbLocationsRow>('locations').count({
-          count: '*',
-        });
-        gauge.observe(Number(total[0].count));
+        if (knex.client.config.client === 'pg') {
+          // https://stackoverflow.com/questions/7943233/fast-way-to-discover-the-row-count-of-a-table-in-postgresql
+          const total = await knex.raw(`
+            SELECT reltuples::bigint AS estimate
+            FROM   pg_class
+            WHERE  oid = 'locations'::regclass;
+          `);
+          gauge.observe(Number(total.rows[0].estimate));
+        } else {
+          const total = await knex<DbLocationsRow>('locations').count({
+            count: '*',
+          });
+          gauge.observe(Number(total[0].count));
+        }
       }),
     relations: meter
       .createObservableGauge('catalog_relations_count', {
         description: 'Total amount of relations between entities',
       })
       .addCallback(async gauge => {
-        const total = await knex<DbRelationsRow>('relations').count({
-          count: '*',
-        });
-        gauge.observe(Number(total[0].count));
+        if (knex.client.config.client === 'pg') {
+          // https://stackoverflow.com/questions/7943233/fast-way-to-discover-the-row-count-of-a-table-in-postgresql
+          const total = await knex.raw(`
+            SELECT reltuples::bigint AS estimate
+            FROM   pg_class
+            WHERE  oid = 'relations'::regclass;
+          `);
+          gauge.observe(Number(total.rows[0].estimate));
+        } else {
+          const total = await knex<DbRelationsRow>('relations').count({
+            count: '*',
+          });
+          gauge.observe(Number(total[0].count));
+        }
       }),
   };
 }
diff --git a/plugins/catalog-backend/src/database/operations/refreshState/checkLocationKeyConflict.ts b/plugins/catalog-backend/src/database/operations/refreshState/checkLocationKeyConflict.ts
index 97d376f9a4..cf6c920d1d 100644
--- a/plugins/catalog-backend/src/database/operations/refreshState/checkLocationKeyConflict.ts
+++ b/plugins/catalog-backend/src/database/operations/refreshState/checkLocationKeyConflict.ts
@@ -24,7 +24,7 @@ import { DbRefreshStateRow } from '../../tables';
  * @returns The conflicting key if there is one.
  */
 export async function checkLocationKeyConflict(options: {
-  tx: Knex.Transaction;
+  tx: Knex | Knex.Transaction;
   entityRef: string;
   locationKey?: string;
 }): Promise<string | undefined> {
diff --git a/plugins/catalog-backend/src/database/operations/refreshState/insertUnprocessedEntity.ts b/plugins/catalog-backend/src/database/operations/refreshState/insertUnprocessedEntity.ts
index 195dbe1f2c..54067c3f2e 100644
--- a/plugins/catalog-backend/src/database/operations/refreshState/insertUnprocessedEntity.ts
+++ b/plugins/catalog-backend/src/database/operations/refreshState/insertUnprocessedEntity.ts
@@ -28,7 +28,7 @@ import {
  * true if successful and false if there was a conflict.
  */
 export async function insertUnprocessedEntity(options: {
-  tx: Knex.Transaction;
+  tx: Knex | Knex.Transaction;
   entity: Entity;
   hash: string;
   locationKey?: string;
diff --git a/plugins/catalog-backend/src/database/operations/refreshState/updateUnprocessedEntity.ts b/plugins/catalog-backend/src/database/operations/refreshState/updateUnprocessedEntity.ts
index e26db4429b..ced6b0d54d 100644
--- a/plugins/catalog-backend/src/database/operations/refreshState/updateUnprocessedEntity.ts
+++ b/plugins/catalog-backend/src/database/operations/refreshState/updateUnprocessedEntity.ts
@@ -25,7 +25,7 @@ import { DbRefreshStateRow } from '../../tables';
  * Updating the entity will also cause it to be scheduled for immediate processing.
  */
 export async function updateUnprocessedEntity(options: {
-  tx: Knex.Transaction;
+  tx: Knex | Knex.Transaction;
   entity: Entity;
   hash: string;
   locationKey?: string;
diff --git a/plugins/catalog-backend/src/database/operations/stitcher/markForStitching.test.ts b/plugins/catalog-backend/src/database/operations/stitcher/markForStitching.test.ts
index 011fe54e83..1afa0b9c30 100644
--- a/plugins/catalog-backend/src/database/operations/stitcher/markForStitching.test.ts
+++ b/plugins/catalog-backend/src/database/operations/stitcher/markForStitching.test.ts
@@ -252,24 +252,28 @@ describe('markForStitching', () => {
         {
           entity_id: '1',
           final_entity: '{}',
+          entity_ref: 'k:ns/one',
           hash: 'old',
           stitch_ticket: 'old',
         },
         {
           entity_id: '2',
           final_entity: '{}',
+          entity_ref: 'k:ns/two',
           hash: 'old',
           stitch_ticket: 'old',
         },
         {
           entity_id: '3',
           final_entity: '{}',
+          entity_ref: 'k:ns/three',
           hash: 'old',
           stitch_ticket: 'old',
         },
         {
           entity_id: '4',
           final_entity: '{}',
+          entity_ref: 'k:ns/four',
           hash: 'old',
           stitch_ticket: 'old',
         },
diff --git a/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts b/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
index 0832ba5db8..2ed65d3903 100644
--- a/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
+++ b/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
@@ -55,191 +55,195 @@ export async function performStitching(options: {
   const { knex, logger, entityRef } = options;
   const stitchTicket = options.stitchTicket ?? uuid();
 
-  const entityResult = await knex<DbRefreshStateRow>('refresh_state')
-    .where({ entity_ref: entityRef })
-    .limit(1)
-    .select('entity_id');
-  if (!entityResult.length) {
-    // Entity does no exist in refresh state table, no stitching required.
-    return 'abandoned';
-  }
+  // In deferred mode, the entity is removed from the stitch queue on ANY
+  // completion, except when an exception is thrown. In the latter case, the
+  // entity will be retried at a later time.
+  let removeFromStitchQueueOnCompletion = options.strategy.mode === 'deferred';
 
-  // Insert stitching ticket that will be compared before inserting the final entity.
-  await knex<DbFinalEntitiesRow>('final_entities')
-    .insert({
-      entity_id: entityResult[0].entity_id,
-      hash: '',
-      stitch_ticket: stitchTicket,
-    })
-    .onConflict('entity_id')
-    .merge(['stitch_ticket']);
+  try {
+    const entityResult = await knex<DbRefreshStateRow>('refresh_state')
+      .where({ entity_ref: entityRef })
+      .limit(1)
+      .select('entity_id');
+    if (!entityResult.length) {
+      // Entity does no exist in refresh state table, no stitching required.
+      return 'abandoned';
+    }
 
-  // Selecting from refresh_state and final_entities should yield exactly
-  // one row (except in abnormal cases where the stitch was invoked for
-  // something that didn't exist at all, in which case it's zero rows).
-  // The join with the temporary incoming_references still gives one row.
-  const [processedResult, relationsResult] = await Promise.all([
-    knex
-      .with('incoming_references', function incomingReferences(builder) {
-        return builder
-          .from('refresh_state_references')
-          .where({ target_entity_ref: entityRef })
-          .count({ count: '*' });
+    // Insert stitching ticket that will be compared before inserting the final entity.
+    await knex<DbFinalEntitiesRow>('final_entities')
+      .insert({
+        entity_id: entityResult[0].entity_id,
+        hash: '',
+        entity_ref: entityRef,
+        stitch_ticket: stitchTicket,
       })
-      .select({
-        entityId: 'refresh_state.entity_id',
-        processedEntity: 'refresh_state.processed_entity',
-        errors: 'refresh_state.errors',
-        incomingReferenceCount: 'incoming_references.count',
-        previousHash: 'final_entities.hash',
-      })
-      .from('refresh_state')
-      .where({ 'refresh_state.entity_ref': entityRef })
-      .crossJoin(knex.raw('incoming_references'))
-      .leftOuterJoin('final_entities', {
-        'final_entities.entity_id': 'refresh_state.entity_id',
-      }),
-    knex
-      .distinct({
-        relationType: 'type',
-        relationTarget: 'target_entity_ref',
-      })
-      .from('relations')
-      .where({ source_entity_ref: entityRef })
-      .orderBy('relationType', 'asc')
-      .orderBy('relationTarget', 'asc'),
-  ]);
+      .onConflict('entity_id')
+      .merge(['stitch_ticket']);
 
-  // If there were no rows returned, it would mean that there was no
-  // matching row even in the refresh_state. This can happen for example
-  // if we emit a relation to something that hasn't been ingested yet.
-  // It's safe to ignore this stitch attempt in that case.
-  if (!processedResult.length) {
-    logger.debug(
-      `Unable to stitch ${entityRef}, item does not exist in refresh state table`,
-    );
-    return 'abandoned';
-  }
+    // Selecting from refresh_state and final_entities should yield exactly
+    // one row (except in abnormal cases where the stitch was invoked for
+    // something that didn't exist at all, in which case it's zero rows).
+    // The join with the temporary incoming_references still gives one row.
+    const [processedResult, relationsResult] = await Promise.all([
+      knex
+        .with('incoming_references', function incomingReferences(builder) {
+          return builder
+            .from('refresh_state_references')
+            .where({ target_entity_ref: entityRef })
+            .count({ count: '*' });
+        })
+        .select({
+          entityId: 'refresh_state.entity_id',
+          processedEntity: 'refresh_state.processed_entity',
+          errors: 'refresh_state.errors',
+          incomingReferenceCount: 'incoming_references.count',
+          previousHash: 'final_entities.hash',
+        })
+        .from('refresh_state')
+        .where({ 'refresh_state.entity_ref': entityRef })
+        .crossJoin(knex.raw('incoming_references'))
+        .leftOuterJoin('final_entities', {
+          'final_entities.entity_id': 'refresh_state.entity_id',
+        }),
+      knex
+        .distinct({
+          relationType: 'type',
+          relationTarget: 'target_entity_ref',
+        })
+        .from('relations')
+        .where({ source_entity_ref: entityRef })
+        .orderBy('relationType', 'asc')
+        .orderBy('relationTarget', 'asc'),
+    ]);
 
-  const {
-    entityId,
-    processedEntity,
-    errors,
-    incomingReferenceCount,
-    previousHash,
-  } = processedResult[0];
+    // If there were no rows returned, it would mean that there was no
+    // matching row even in the refresh_state. This can happen for example
+    // if we emit a relation to something that hasn't been ingested yet.
+    // It's safe to ignore this stitch attempt in that case.
+    if (!processedResult.length) {
+      logger.debug(
+        `Unable to stitch ${entityRef}, item does not exist in refresh state table`,
+      );
+      return 'abandoned';
+    }
 
-  // If there was no processed entity in place, the target hasn't been
-  // through the processing steps yet. It's safe to ignore this stitch
-  // attempt in that case, since another stitch will be triggered when
-  // that processing has finished.
-  if (!processedEntity) {
-    logger.debug(
-      `Unable to stitch ${entityRef}, the entity has not yet been processed`,
-    );
-    return 'abandoned';
-  }
+    const {
+      entityId,
+      processedEntity,
+      errors,
+      incomingReferenceCount,
+      previousHash,
+    } = processedResult[0];
 
-  // Grab the processed entity and stitch all of the relevant data into
-  // it
-  const entity = JSON.parse(processedEntity) as AlphaEntity;
-  const isOrphan = Number(incomingReferenceCount) === 0;
-  let statusItems: EntityStatusItem[] = [];
+    // If there was no processed entity in place, the target hasn't been
+    // through the processing steps yet. It's safe to ignore this stitch
+    // attempt in that case, since another stitch will be triggered when
+    // that processing has finished.
+    if (!processedEntity) {
+      logger.debug(
+        `Unable to stitch ${entityRef}, the entity has not yet been processed`,
+      );
+      return 'abandoned';
+    }
 
-  if (isOrphan) {
-    logger.debug(`${entityRef} is an orphan`);
-    entity.metadata.annotations = {
-      ...entity.metadata.annotations,
-      ['backstage.io/orphan']: 'true',
-    };
-  }
-  if (errors) {
-    const parsedErrors = JSON.parse(errors) as SerializedError[];
-    if (Array.isArray(parsedErrors) && parsedErrors.length) {
-      statusItems = parsedErrors.map(e => ({
-        type: ENTITY_STATUS_CATALOG_PROCESSING_TYPE,
-        level: 'error',
-        message: `${e.name}: ${e.message}`,
-        error: e,
+    // Grab the processed entity and stitch all of the relevant data into
+    // it
+    const entity = JSON.parse(processedEntity) as AlphaEntity;
+    const isOrphan = Number(incomingReferenceCount) === 0;
+    let statusItems: EntityStatusItem[] = [];
+
+    if (isOrphan) {
+      logger.debug(`${entityRef} is an orphan`);
+      entity.metadata.annotations = {
+        ...entity.metadata.annotations,
+        ['backstage.io/orphan']: 'true',
+      };
+    }
+    if (errors) {
+      const parsedErrors = JSON.parse(errors) as SerializedError[];
+      if (Array.isArray(parsedErrors) && parsedErrors.length) {
+        statusItems = parsedErrors.map(e => ({
+          type: ENTITY_STATUS_CATALOG_PROCESSING_TYPE,
+          level: 'error',
+          message: `${e.name}: ${e.message}`,
+          error: e,
+        }));
+      }
+    }
+    // We opt to do this check here as we otherwise can't guarantee that it will be run after all processors
+    for (const annotation of [ANNOTATION_VIEW_URL, ANNOTATION_EDIT_URL]) {
+      const value = entity.metadata.annotations?.[annotation];
+      if (typeof value === 'string' && scriptProtocolPattern.test(value)) {
+        entity.metadata.annotations![annotation] =
+          'https://backstage.io/annotation-rejected-for-security-reasons';
+      }
+    }
+
+    // TODO: entityRef is lower case and should be uppercase in the final
+    // result
+    entity.relations = relationsResult
+      .filter(row => row.relationType /* exclude null row, if relevant */)
+      .map<EntityRelation>(row => ({
+        type: row.relationType!,
+        targetRef: row.relationTarget!,
       }));
+    if (statusItems.length) {
+      entity.status = {
+        ...entity.status,
+        items: [...(entity.status?.items ?? []), ...statusItems],
+      };
     }
-  }
-  // We opt to do this check here as we otherwise can't guarantee that it will be run after all processors
-  for (const annotation of [ANNOTATION_VIEW_URL, ANNOTATION_EDIT_URL]) {
-    const value = entity.metadata.annotations?.[annotation];
-    if (typeof value === 'string' && scriptProtocolPattern.test(value)) {
-      entity.metadata.annotations![annotation] =
-        'https://backstage.io/annotation-rejected-for-security-reasons';
+
+    // If the output entity was actually not changed, just abort
+    const hash = generateStableHash(entity);
+    if (hash === previousHash) {
+      logger.debug(`Skipped stitching of ${entityRef}, no changes`);
+      return 'unchanged';
     }
-  }
 
-  // TODO: entityRef is lower case and should be uppercase in the final
-  // result
-  entity.relations = relationsResult
-    .filter(row => row.relationType /* exclude null row, if relevant */)
-    .map<EntityRelation>(row => ({
-      type: row.relationType!,
-      targetRef: row.relationTarget!,
-    }));
-  if (statusItems.length) {
-    entity.status = {
-      ...entity.status,
-      items: [...(entity.status?.items ?? []), ...statusItems],
-    };
-  }
-
-  // If the output entity was actually not changed, just abort
-  const hash = generateStableHash(entity);
-  if (hash === previousHash) {
-    logger.debug(`Skipped stitching of ${entityRef}, no changes`);
-    return 'unchanged';
-  }
-
-  entity.metadata.uid = entityId;
-  if (!entity.metadata.etag) {
-    // If the original data source did not have its own etag handling,
-    // use the hash as a good-quality etag
-    entity.metadata.etag = hash;
-  }
-
-  // This may throw if the entity is invalid, so we call it before
-  // the final_entities write, even though we may end up not needing
-  // to write the search index.
-  const searchEntries = buildEntitySearch(entityId, entity);
-
-  const amountOfRowsChanged = await knex<DbFinalEntitiesRow>('final_entities')
-    .update({
-      final_entity: JSON.stringify(entity),
-      hash,
-      last_updated_at: knex.fn.now(),
-    })
-    .where('entity_id', entityId)
-    .where('stitch_ticket', stitchTicket)
-    .onConflict('entity_id')
-    .merge(['final_entity', 'hash', 'last_updated_at']);
-
-  const markDeferred = async () => {
-    if (options.strategy.mode !== 'deferred') {
-      return;
+    entity.metadata.uid = entityId;
+    if (!entity.metadata.etag) {
+      // If the original data source did not have its own etag handling,
+      // use the hash as a good-quality etag
+      entity.metadata.etag = hash;
     }
-    await markDeferredStitchCompleted({
-      knex: knex,
-      entityRef,
-      stitchTicket,
+
+    // This may throw if the entity is invalid, so we call it before
+    // the final_entities write, even though we may end up not needing
+    // to write the search index.
+    const searchEntries = buildEntitySearch(entityId, entity);
+
+    const amountOfRowsChanged = await knex<DbFinalEntitiesRow>('final_entities')
+      .update({
+        final_entity: JSON.stringify(entity),
+        hash,
+        last_updated_at: knex.fn.now(),
+      })
+      .where('entity_id', entityId)
+      .where('stitch_ticket', stitchTicket);
+
+    if (amountOfRowsChanged === 0) {
+      logger.debug(`Entity ${entityRef} is already stitched, skipping write.`);
+      return 'abandoned';
+    }
+
+    await knex.transaction(async trx => {
+      await trx<DbSearchRow>('search').where({ entity_id: entityId }).delete();
+      await trx.batchInsert('search', searchEntries, BATCH_SIZE);
     });
-  };
 
-  if (amountOfRowsChanged === 0) {
-    logger.debug(`Entity ${entityRef} is already stitched, skipping write.`);
-    await markDeferred();
-    return 'abandoned';
+    return 'changed';
+  } catch (error) {
+    removeFromStitchQueueOnCompletion = false;
+    throw error;
+  } finally {
+    if (removeFromStitchQueueOnCompletion) {
+      await markDeferredStitchCompleted({
+        knex: knex,
+        entityRef,
+        stitchTicket,
+      });
+    }
   }
-
-  await knex.transaction(async trx => {
-    await trx<DbSearchRow>('search').where({ entity_id: entityId }).delete();
-    await trx.batchInsert('search', searchEntries, BATCH_SIZE);
-  });
-
-  await markDeferred();
-  return 'changed';
 }
diff --git a/plugins/catalog-backend/src/database/operations/util/deleteOrphanedEntities.test.ts b/plugins/catalog-backend/src/database/operations/util/deleteOrphanedEntities.test.ts
index 1dc8a42d5f..0f4f5f0c3d 100644
--- a/plugins/catalog-backend/src/database/operations/util/deleteOrphanedEntities.test.ts
+++ b/plugins/catalog-backend/src/database/operations/util/deleteOrphanedEntities.test.ts
@@ -69,6 +69,7 @@ describe('deleteOrphanedEntities', () => {
       await knex<DbFinalEntitiesRow>('final_entities').insert({
         entity_id: `id-${ref}`,
         hash: 'original',
+        entity_ref: ref,
         stitch_ticket: '',
       });
     }
diff --git a/plugins/catalog-backend/src/database/tables.ts b/plugins/catalog-backend/src/database/tables.ts
index 57731e3d27..33e6250413 100644
--- a/plugins/catalog-backend/src/database/tables.ts
+++ b/plugins/catalog-backend/src/database/tables.ts
@@ -179,6 +179,7 @@ export type DbFinalEntitiesRow = {
   stitch_ticket: string;
   final_entity?: string;
   last_updated_at?: string | Date;
+  entity_ref: string;
 };
 
 export type DbSearchRow = {
diff --git a/plugins/catalog-backend/src/database/types.ts b/plugins/catalog-backend/src/database/types.ts
index 56e5f48f14..ad2be8e06c 100644
--- a/plugins/catalog-backend/src/database/types.ts
+++ b/plugins/catalog-backend/src/database/types.ts
@@ -23,6 +23,7 @@ import {
 } from '@backstage/plugin-catalog-node';
 import { DbRelationsRow } from './tables';
 import { RefreshKeyData } from '../processing/types';
+import { Knex } from 'knex';
 
 /**
  * An abstraction for transactions of the underlying database technology.
@@ -59,10 +60,8 @@ export type RefreshStateItem = {
   id: string;
   entityRef: string;
   unprocessedEntity: Entity;
-  processedEntity?: Entity;
   resultHash: string;
   nextUpdateAt: DateTime;
-  lastDiscoveryAt: DateTime; // remove?
   state?: JsonObject;
   errors?: string;
   locationKey?: string;
@@ -116,7 +115,7 @@ export interface ProcessingDatabase {
   transaction<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>;
 
   getProcessableEntities(
-    txOpaque: Transaction,
+    txOpaque: Transaction | Knex,
     request: { processBatchSize: number },
   ): Promise<GetProcessableEntitiesResult>;
 
diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
index 3f283a5b38..ab54a7b885 100644
--- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
+++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.test.ts
@@ -92,7 +92,6 @@ describe('DefaultCatalogProcessingEngine', () => {
             resultHash: '',
             state: [] as any,
             nextUpdateAt: DateTime.now(),
-            lastDiscoveryAt: DateTime.now(),
           },
         ],
       });
@@ -161,7 +160,6 @@ describe('DefaultCatalogProcessingEngine', () => {
             resultHash: '',
             state: { cache: { myProcessor: { myKey: 'myValue' } } },
             nextUpdateAt: DateTime.now(),
-            lastDiscoveryAt: DateTime.now(),
           },
         ],
       });
@@ -464,6 +462,111 @@ describe('DefaultCatalogProcessingEngine', () => {
     await engine.stop();
   });
 
+  it('should stitch both the previous and new sources when relation target changes', async () => {
+    const engine = new DefaultCatalogProcessingEngine({
+      config: new ConfigReader({}),
+      logger: mockServices.logger.mock(),
+      processingDatabase: db,
+      knex: {} as any,
+      orchestrator: orchestrator,
+      stitcher: stitcher,
+      createHash: () => hash,
+      pollingIntervalMs: 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],
+      })
+      .mockResolvedValueOnce({
+        items: [processableEntity],
+      });
+    db.updateProcessedEntity
+      .mockImplementationOnce(async () => ({
+        previous: { relations: [] },
+      }))
+      .mockImplementationOnce(async () => ({
+        previous: {
+          relations: [
+            {
+              originating_entity_id: '',
+              type: 't',
+              source_entity_ref: 'k:ns/other1',
+              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: [],
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        completedEntity: entity,
+        // change just the target of the relationship to a new entity,
+        // leaving the source and relation type the same.
+        // see: https://github.com/backstage/backstage/issues/27325
+        relations: [
+          {
+            type: 't',
+            source: { kind: 'k', namespace: 'ns', name: 'other1' },
+            target: { kind: 'k', namespace: 'ns', name: 'newtarget' },
+          },
+        ],
+        errors: [],
+        deferredEntities: [],
+        state: {},
+        refreshKeys: [],
+      });
+
+    await engine.start();
+    await waitForExpect(() => {
+      expect(stitcher.stitch).toHaveBeenCalledTimes(2);
+    });
+    expect([...stitcher.stitch.mock.calls[0][0].entityRefs!]).toEqual(
+      expect.arrayContaining(['k:ns/me', 'k:ns/other1']),
+    );
+    // As a result of switching the relationship for source other1 to
+    // a new target entity, the other1 relationship source must be
+    // restitched.
+    expect([...stitcher.stitch.mock.calls[1][0].entityRefs!]).toEqual(
+      expect.arrayContaining(['k:ns/me', 'k:ns/other1']),
+    );
+    await engine.stop();
+  });
+
   it('should not stitch sources entities when relations are the same', async () => {
     const engine = new DefaultCatalogProcessingEngine({
       config: new ConfigReader({}),
diff --git a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
index e42847bafe..59843ac430 100644
--- a/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
+++ b/plugins/catalog-backend/src/processing/DefaultCatalogProcessingEngine.ts
@@ -135,13 +135,10 @@ export class DefaultCatalogProcessingEngine {
       pollingIntervalMs: this.pollingIntervalMs,
       loadTasks: async count => {
         try {
-          const { items } = await this.processingDatabase.transaction(
-            async tx => {
-              return this.processingDatabase.getProcessableEntities(tx, {
-                processBatchSize: count,
-              });
-            },
-          );
+          const { items } =
+            await this.processingDatabase.getProcessableEntities(this.knex, {
+              processBatchSize: count,
+            });
           return items;
         } catch (error) {
           this.logger.warn('Failed to load processing items', error);
@@ -295,7 +292,7 @@ export class DefaultCatalogProcessingEngine {
                 });
               oldRelationSources = new Map(
                 previous.relations.map(r => [
-                  `${r.source_entity_ref}:${r.type}`,
+                  `${r.source_entity_ref}:${r.type}->${r.target_entity_ref}`,
                   r.source_entity_ref,
                 ]),
               );
@@ -304,7 +301,11 @@ export class DefaultCatalogProcessingEngine {
             const newRelationSources = new Map<string, string>(
               result.relations.map(relation => {
                 const sourceEntityRef = stringifyEntityRef(relation.source);
-                return [`${sourceEntityRef}:${relation.type}`, sourceEntityRef];
+                const targetEntityRef = stringifyEntityRef(relation.target);
+                return [
+                  `${sourceEntityRef}:${relation.type}->${targetEntityRef}`,
+                  sourceEntityRef,
+                ];
               }),
             );
 
diff --git a/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts b/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts
index 4f302308ae..5e3f3e0b17 100644
--- a/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts
+++ b/plugins/catalog-backend/src/providers/DefaultLocationStore.test.ts
@@ -204,6 +204,7 @@ describe('DefaultLocationStore', () => {
           hash: 'hash',
           last_updated_at: new Date(),
           stitch_ticket: '',
+          entity_ref: 'k:ns/n',
         });
 
         await knex<DbSearchRow>('search').insert({
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/apis/Api.server.ts b/plugins/catalog-backend/src/schema/openapi/generated/apis/Api.server.ts
new file mode 100644
index 0000000000..abd73e2876
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/apis/Api.server.ts
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationRequest } from '../models/AnalyzeLocationRequest.model';
+import { AnalyzeLocationResponse } from '../models/AnalyzeLocationResponse.model';
+import { CreateLocation201Response } from '../models/CreateLocation201Response.model';
+import { CreateLocationRequest } from '../models/CreateLocationRequest.model';
+import { EntitiesBatchResponse } from '../models/EntitiesBatchResponse.model';
+import { EntitiesQueryResponse } from '../models/EntitiesQueryResponse.model';
+import { Entity } from '../models/Entity.model';
+import { EntityAncestryResponse } from '../models/EntityAncestryResponse.model';
+import { EntityFacetsResponse } from '../models/EntityFacetsResponse.model';
+import { GetEntitiesByRefsRequest } from '../models/GetEntitiesByRefsRequest.model';
+import { GetLocations200ResponseInner } from '../models/GetLocations200ResponseInner.model';
+import { Location } from '../models/Location.model';
+import { RefreshEntityRequest } from '../models/RefreshEntityRequest.model';
+import { ValidateEntity400Response } from '../models/ValidateEntity400Response.model';
+import { ValidateEntityRequest } from '../models/ValidateEntityRequest.model';
+
+/**
+ * @public
+ */
+export type AnalyzeLocation = {
+  body: AnalyzeLocationRequest;
+  response: AnalyzeLocationResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type CreateLocation = {
+  body: CreateLocationRequest;
+  query: {
+    dryRun?: string;
+  };
+  response: CreateLocation201Response | Error | Error;
+};
+/**
+ * @public
+ */
+export type DeleteEntityByUid = {
+  path: {
+    uid: string;
+  };
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type DeleteLocation = {
+  path: {
+    id: string;
+  };
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntities = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    filter?: Array<string>;
+    offset?: number;
+    after?: string;
+    order?: Array<string>;
+  };
+  response: Array<Entity> | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntitiesByQuery = {
+  query: {
+    fields?: Array<string>;
+    limit?: number;
+    offset?: number;
+    orderField?: Array<string>;
+    cursor?: string;
+    filter?: Array<string>;
+    fullTextFilterTerm?: string;
+    fullTextFilterFields?: Array<string>;
+  };
+  response: EntitiesQueryResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntitiesByRefs = {
+  body: GetEntitiesByRefsRequest;
+  query: {
+    filter?: Array<string>;
+  };
+  response: EntitiesBatchResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityAncestryByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: EntityAncestryResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityByName = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: Entity | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityByUid = {
+  path: {
+    uid: string;
+  };
+  response: Entity | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetEntityFacets = {
+  query: {
+    facet: Array<string>;
+    filter?: Array<string>;
+  };
+  response: EntityFacetsResponse | Error | Error;
+};
+/**
+ * @public
+ */
+export type GetLocation = {
+  path: {
+    id: string;
+  };
+  response: Location | Error;
+};
+/**
+ * @public
+ */
+export type GetLocationByEntity = {
+  path: {
+    kind: string;
+    namespace: string;
+    name: string;
+  };
+  response: Location | Error;
+};
+/**
+ * @public
+ */
+export type GetLocations = {
+  response: Array<GetLocations200ResponseInner> | Error;
+};
+/**
+ * @public
+ */
+export type RefreshEntity = {
+  body: RefreshEntityRequest;
+  response: void | Error | Error;
+};
+/**
+ * @public
+ */
+export type ValidateEntity = {
+  body: ValidateEntityRequest;
+  response: void | ValidateEntity400Response;
+};
+
+export type EndpointMap = {
+  '#post|/analyze-location': AnalyzeLocation;
+
+  '#post|/locations': CreateLocation;
+
+  '#_delete|/entities/by-uid/{uid}': DeleteEntityByUid;
+
+  '#_delete|/locations/{id}': DeleteLocation;
+
+  '#get|/entities': GetEntities;
+
+  '#get|/entities/by-query': GetEntitiesByQuery;
+
+  '#post|/entities/by-refs': GetEntitiesByRefs;
+
+  '#get|/entities/by-name/{kind}/{namespace}/{name}/ancestry': GetEntityAncestryByName;
+
+  '#get|/entities/by-name/{kind}/{namespace}/{name}': GetEntityByName;
+
+  '#get|/entities/by-uid/{uid}': GetEntityByUid;
+
+  '#get|/entity-facets': GetEntityFacets;
+
+  '#get|/locations/{id}': GetLocation;
+
+  '#get|/locations/by-entity/{kind}/{namespace}/{name}': GetLocationByEntity;
+
+  '#get|/locations': GetLocations;
+
+  '#post|/refresh': RefreshEntity;
+
+  '#post|/validate-entity': ValidateEntity;
+};
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/apis/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..a3cdbbebd2
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/apis/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+export * from './Api.server';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..69c39313c6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './apis';
+export * from './router';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
new file mode 100644
index 0000000000..ad2b5aecd1
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationEntityField.model.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationEntityField {
+  /**
+   * A text to show to the user to inform about the choices made. Like, it could say \"Found a CODEOWNERS file that covers this target, so we suggest leaving this field empty; which would currently make it owned by X\" where X is taken from the codeowners file.
+   */
+  description: string;
+  value: string | null;
+  /**
+   * The outcome of the analysis for this particular field
+   */
+  state: AnalyzeLocationEntityFieldStateEnum;
+  /**
+   * e.g. \"spec.owner\"? The frontend needs to know how to \"inject\" the field into the entity again if the user wants to change it
+   */
+  field: string;
+}
+
+/**
+ * @public
+ */
+export type AnalyzeLocationEntityFieldStateEnum =
+  | 'analysisSuggestedValue'
+  | 'analysisSuggestedNoValue'
+  | 'needsUserInput';
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
new file mode 100644
index 0000000000..fb01ae8e8e
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationExistingEntity.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+import { LocationSpec } from '../models/LocationSpec.model';
+
+/**
+ * If the folder pointed to already contained catalog info yaml files, they are 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
+ * @public
+ */
+export interface AnalyzeLocationExistingEntity {
+  entity: Entity;
+  isRegistered: boolean;
+  location: LocationSpec;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
new file mode 100644
index 0000000000..e760d9cf94
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationGenerateEntity.model.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationEntityField } from '../models/AnalyzeLocationEntityField.model';
+import { RecursivePartialEntity } from '../models/RecursivePartialEntity.model';
+
+/**
+ * This is some form of representation of what the analyzer could deduce. We should probably have a chat about how this can best be conveyed to 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.
+ * @public
+ */
+export interface AnalyzeLocationGenerateEntity {
+  fields: Array<AnalyzeLocationEntityField>;
+  entity: RecursivePartialEntity;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
new file mode 100644
index 0000000000..c1085a2a7b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationRequest.model.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { LocationInput } from '../models/LocationInput.model';
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationRequest {
+  catalogFileName?: string;
+  location: LocationInput;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
new file mode 100644
index 0000000000..66fc46bc0f
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/AnalyzeLocationResponse.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { AnalyzeLocationExistingEntity } from '../models/AnalyzeLocationExistingEntity.model';
+import { AnalyzeLocationGenerateEntity } from '../models/AnalyzeLocationGenerateEntity.model';
+
+/**
+ * @public
+ */
+export interface AnalyzeLocationResponse {
+  generateEntities: Array<AnalyzeLocationGenerateEntity>;
+  existingEntityFiles: Array<AnalyzeLocationExistingEntity>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
new file mode 100644
index 0000000000..27e557639a
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocation201Response.model.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+import { Location } from '../models/Location.model';
+
+/**
+ * @public
+ */
+export interface CreateLocation201Response {
+  exists?: boolean;
+  entities: Array<Entity>;
+  location: Location;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
new file mode 100644
index 0000000000..5351ac289b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/CreateLocationRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface CreateLocationRequest {
+  target: string;
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
new file mode 100644
index 0000000000..1a962367d1
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesBatchResponse.model.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { NullableEntity } from '../models/NullableEntity.model';
+
+/**
+ * @public
+ */
+export interface EntitiesBatchResponse {
+  /**
+   * 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.
+   */
+  items: Array<NullableEntity>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
new file mode 100644
index 0000000000..11c42a6aee
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponse.model.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntitiesQueryResponsePageInfo } from '../models/EntitiesQueryResponsePageInfo.model';
+import { Entity } from '../models/Entity.model';
+
+/**
+ * @public
+ */
+export interface EntitiesQueryResponse {
+  /**
+   * The list of entities paginated by a specific filter.
+   */
+  items: Array<Entity>;
+  totalItems: number;
+  pageInfo: EntitiesQueryResponsePageInfo;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
new file mode 100644
index 0000000000..07b4137c77
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntitiesQueryResponsePageInfo.model.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface EntitiesQueryResponsePageInfo {
+  /**
+   * The cursor for the next batch of entities.
+   */
+  nextCursor?: string;
+  /**
+   * The cursor for the previous batch of entities.
+   */
+  prevCursor?: string;
+}
diff --git a/packages/catalog-client/src/generated/models/NullableEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
similarity index 97%
rename from packages/catalog-client/src/generated/models/NullableEntity.model.ts
rename to plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
index b4344a3bfb..f386f3dd17 100644
--- a/packages/catalog-client/src/generated/models/NullableEntity.model.ts
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/Entity.model.ts
@@ -22,8 +22,9 @@ import { EntityRelation } from '../models/EntityRelation.model';
 
 /**
  * The parts of the format that's common to all versions/kinds of entity.
+ * @public
  */
-export interface NullableEntity {
+export interface Entity {
   /**
    * The relations that this entity has with other entities.
    */
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
new file mode 100644
index 0000000000..a94f784f05
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponse.model.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityAncestryResponseItemsInner } from '../models/EntityAncestryResponseItemsInner.model';
+
+/**
+ * @public
+ */
+export interface EntityAncestryResponse {
+  items: Array<EntityAncestryResponseItemsInner>;
+  rootEntityRef: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
new file mode 100644
index 0000000000..40594a1515
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityAncestryResponseItemsInner.model.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Entity } from '../models/Entity.model';
+
+/**
+ * @public
+ */
+export interface EntityAncestryResponseItemsInner {
+  parentEntityRefs: Array<string>;
+  entity: Entity;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts
new file mode 100644
index 0000000000..f0f89f6eae
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacet.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface EntityFacet {
+  value: string;
+  count: number;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
new file mode 100644
index 0000000000..e013f0b5a8
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityFacetsResponse.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityFacet } from '../models/EntityFacet.model';
+
+/**
+ * @public
+ */
+export interface EntityFacetsResponse {
+  facets: { [key: string]: Array<EntityFacet> };
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts
new file mode 100644
index 0000000000..53d7d1f9ff
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityLink.model.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A link to external information that is related to the entity.
+ * @public
+ */
+export interface EntityLink {
+  /**
+   * An optional value to categorize links into specific groups
+   */
+  type?: string;
+  /**
+   * An optional semantic key that represents a visual icon.
+   */
+  icon?: string;
+  /**
+   * An optional descriptive title for the link.
+   */
+  title?: string;
+  /**
+   * The url to the external site, document, etc.
+   */
+  url: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts
new file mode 100644
index 0000000000..cc8dd555a6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityMeta.model.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * Metadata fields common to all versions/kinds of entity.
+ * @public
+ */
+export interface EntityMeta {
+  [key: string]: any;
+
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * 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.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * 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.
+   */
+  name: string;
+  /**
+   * 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.
+   */
+  etag?: string;
+  /**
+   * 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.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts
new file mode 100644
index 0000000000..fe98a84481
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/EntityRelation.model.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A relation of a specific type to another entity in the catalog.
+ * @public
+ */
+export interface EntityRelation {
+  /**
+   * The entity ref of the target of this relation.
+   */
+  targetRef: string;
+  /**
+   * The type of the relation.
+   */
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..fe5811628d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+  stack?: string;
+  code?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
new file mode 100644
index 0000000000..9160f0823b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/GetEntitiesByRefsRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface GetEntitiesByRefsRequest {
+  entityRefs: Array<string>;
+  fields?: Array<string>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
new file mode 100644
index 0000000000..a9f1af1c53
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/GetLocations200ResponseInner.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Location } from '../models/Location.model';
+
+/**
+ * @public
+ */
+export interface GetLocations200ResponseInner {
+  data: Location;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts
new file mode 100644
index 0000000000..d7e4a22de4
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/Location.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Entity location for a specific entity.
+ * @public
+ */
+export interface Location {
+  target: string;
+  type: string;
+  id: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts
new file mode 100644
index 0000000000..9cdc4c2c13
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationInput.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface LocationInput {
+  type: string;
+  target: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts
new file mode 100644
index 0000000000..1d56d8f3b0
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/LocationSpec.model.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Holds the entity location information.
+ * @public
+ */
+export interface LocationSpec {
+  target: string;
+  type: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..5526d703e6
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  [key: string]: any;
+
+  error: ErrorError;
+  request?: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts
new file mode 100644
index 0000000000..aa6135ded4
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/NullableEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityMeta } from '../models/EntityMeta.model';
+import { EntityRelation } from '../models/EntityRelation.model';
+
+/**
+ * The parts of the format that's common to all versions/kinds of entity.
+ * @public
+ */
+export type NullableEntity = {
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<EntityRelation>;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  metadata: EntityMeta;
+  /**
+   * The high level entity type being described.
+   */
+  kind: string;
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion: string;
+} | null;
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
new file mode 100644
index 0000000000..b3913ccd85
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntity.model.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { RecursivePartialEntityMeta } from '../models/RecursivePartialEntityMeta.model';
+import { RecursivePartialEntityRelation } from '../models/RecursivePartialEntityRelation.model';
+
+/**
+ * Makes all keys of an entire hierarchy optional.
+ * @public
+ */
+export interface RecursivePartialEntity {
+  /**
+   * The version of specification format for this particular entity that this is written against.
+   */
+  apiVersion?: string;
+  /**
+   * The high level entity type being described.
+   */
+  kind?: string;
+  metadata?: RecursivePartialEntityMeta;
+  /**
+   * A type representing all allowed JSON object values.
+   */
+  spec?: { [key: string]: any };
+  /**
+   * The relations that this entity has with other entities.
+   */
+  relations?: Array<RecursivePartialEntityRelation>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
new file mode 100644
index 0000000000..df5ce3811b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMeta.model.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * @public
+ */
+export interface RecursivePartialEntityMeta {
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * 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.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * 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.
+   */
+  name?: string;
+  /**
+   * 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.
+   */
+  etag?: string;
+  /**
+   * 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.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
new file mode 100644
index 0000000000..6598f8df96
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityMetaAllOf.model.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { EntityLink } from '../models/EntityLink.model';
+
+/**
+ * Metadata fields common to all versions/kinds of entity.
+ * @public
+ */
+export interface RecursivePartialEntityMetaAllOf {
+  /**
+   * A list of external hyperlinks related to the entity.
+   */
+  links?: Array<EntityLink>;
+  /**
+   * A list of single-valued strings, to for example classify catalog entities in various ways.
+   */
+  tags?: Array<string>;
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  annotations?: { [key: string]: string };
+  /**
+   * Construct a type with a set of properties K of type T
+   */
+  labels?: { [key: string]: string };
+  /**
+   * A short (typically relatively few words, on one line) description of the entity.
+   */
+  description?: string;
+  /**
+   * 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.
+   */
+  title?: string;
+  /**
+   * The namespace that the entity belongs to.
+   */
+  namespace?: string;
+  /**
+   * 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.
+   */
+  name?: string;
+  /**
+   * 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.
+   */
+  etag?: string;
+  /**
+   * 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.
+   */
+  uid?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
new file mode 100644
index 0000000000..9c7dafb534
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RecursivePartialEntityRelation.model.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * A relation of a specific type to another entity in the catalog.
+ * @public
+ */
+export interface RecursivePartialEntityRelation {
+  /**
+   * The entity ref of the target of this relation.
+   */
+  targetRef?: string;
+  /**
+   * The type of the relation.
+   */
+  type?: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
new file mode 100644
index 0000000000..617f35288b
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/RefreshEntityRequest.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * Options for requesting a refresh of entities in the catalog.
+ * @public
+ */
+export interface RefreshEntityRequest {
+  authorizationToken?: string;
+  /**
+   * The reference to a single entity that should be refreshed
+   */
+  entityRef: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
new file mode 100644
index 0000000000..fac9525afa
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400Response.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ValidateEntity400ResponseErrorsInner } from '../models/ValidateEntity400ResponseErrorsInner.model';
+
+/**
+ * @public
+ */
+export interface ValidateEntity400Response {
+  errors: Array<ValidateEntity400ResponseErrorsInner>;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
new file mode 100644
index 0000000000..8718d7938d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ValidateEntity400ResponseErrorsInner {
+  [key: string]: any;
+
+  name: string;
+  message: string;
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
new file mode 100644
index 0000000000..c3be04818d
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/ValidateEntityRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ValidateEntityRequest {
+  location: string;
+  entity: { [key: string]: any };
+}
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts b/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..d6c81becb5
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from '../models/AnalyzeLocationEntityField.model';
+export * from '../models/AnalyzeLocationExistingEntity.model';
+export * from '../models/AnalyzeLocationGenerateEntity.model';
+export * from '../models/AnalyzeLocationRequest.model';
+export * from '../models/AnalyzeLocationResponse.model';
+export * from '../models/CreateLocation201Response.model';
+export * from '../models/CreateLocationRequest.model';
+export * from '../models/EntitiesBatchResponse.model';
+export * from '../models/EntitiesQueryResponse.model';
+export * from '../models/EntitiesQueryResponsePageInfo.model';
+export * from '../models/Entity.model';
+export * from '../models/EntityAncestryResponse.model';
+export * from '../models/EntityAncestryResponseItemsInner.model';
+export * from '../models/EntityFacet.model';
+export * from '../models/EntityFacetsResponse.model';
+export * from '../models/EntityLink.model';
+export * from '../models/EntityMeta.model';
+export * from '../models/EntityRelation.model';
+export * from '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/GetEntitiesByRefsRequest.model';
+export * from '../models/GetLocations200ResponseInner.model';
+export * from '../models/Location.model';
+export * from '../models/LocationInput.model';
+export * from '../models/LocationSpec.model';
+export * from '../models/ModelError.model';
+export * from '../models/NullableEntity.model';
+export * from '../models/RecursivePartialEntity.model';
+export * from '../models/RecursivePartialEntityMeta.model';
+export * from '../models/RecursivePartialEntityMetaAllOf.model';
+export * from '../models/RecursivePartialEntityRelation.model';
+export * from '../models/RefreshEntityRequest.model';
+export * from '../models/ValidateEntity400Response.model';
+export * from '../models/ValidateEntity400ResponseErrorsInner.model';
+export * from '../models/ValidateEntityRequest.model';
diff --git a/plugins/catalog-backend/src/schema/openapi.generated.ts b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
similarity index 99%
rename from plugins/catalog-backend/src/schema/openapi.generated.ts
rename to plugins/catalog-backend/src/schema/openapi/generated/router.ts
index f3bd46c05c..8712625653 100644
--- a/plugins/catalog-backend/src/schema/openapi.generated.ts
+++ b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
@@ -17,7 +17,8 @@
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import { createValidatedOpenApiRouter } from '@backstage/backend-openapi-utils';
+import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
+import { EndpointMap } from './';
 
 export const spec = {
   openapi: '3.0.3',
@@ -1602,5 +1603,11 @@ export const spec = {
   },
 } as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<
+    typeof createValidatedOpenApiRouterFromGeneratedEndpointMap
+  >['1'],
+) =>
+  createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(
+    spec,
+    options,
+  );
diff --git a/plugins/catalog-backend/src/schema/openapi/index.ts b/plugins/catalog-backend/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/catalog-backend/src/schema/openapi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './generated';
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 92acd9e3ce..bb2ba3d587 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -76,6 +76,7 @@ describe('DefaultEntitiesCatalog', () => {
 
     await knex<DbFinalEntitiesRow>('final_entities').insert({
       entity_id: id,
+      entity_ref: entityRef,
       final_entity: entityJson,
       hash: 'h',
       stitch_ticket: '',
@@ -113,6 +114,7 @@ describe('DefaultEntitiesCatalog', () => {
 
     await knex<DbFinalEntitiesRow>('final_entities').insert({
       entity_id: id,
+      entity_ref: entityRef,
       final_entity: entityJson,
       hash: 'h',
       stitch_ticket: '',
@@ -574,6 +576,63 @@ describe('DefaultEntitiesCatalog', () => {
       },
     );
 
+    it.each(databases.eachSupportedId())(
+      'handles inversion both for existing and missing keys, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        const entity1: Entity = {
+          apiVersion: 'a',
+          kind: 'k',
+          metadata: { name: 'n1' },
+          spec: { a: 'foo' },
+        };
+        const entity2: Entity = {
+          apiVersion: 'a',
+          kind: 'k',
+          metadata: { name: 'n2' },
+          spec: { a: 'bar', b: 'lonely' },
+        };
+        const entity3: Entity = {
+          apiVersion: 'a',
+          kind: 'k',
+          metadata: { name: 'n3' },
+          spec: { a: 'baz', b: 'only' },
+        };
+        await addEntityToSearch(entity1);
+        await addEntityToSearch(entity2);
+        await addEntityToSearch(entity3);
+
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          stitcher,
+        });
+
+        function f(
+          request: Omit<EntitiesRequest, 'credentials'>,
+        ): Promise<string[]> {
+          return catalog
+            .entities({ ...request, credentials: mockCredentials.none() })
+            .then(response =>
+              response.entities.map(e => e.metadata.name).toSorted(),
+            );
+        }
+
+        await expect(
+          f({
+            filter: { key: 'spec.b', values: ['lonely'] },
+          }),
+        ).resolves.toEqual(['n2']);
+
+        await expect(
+          f({
+            filter: { not: { key: 'spec.b', values: ['lonely'] } },
+          }),
+        ).resolves.toEqual(['n1', 'n3']);
+      },
+    );
+
     it.each(databases.eachSupportedId())(
       'can order and combine with filtering, %p',
       async databaseId => {
@@ -1124,7 +1183,6 @@ describe('DefaultEntitiesCatalog', () => {
         const request: QueryEntitiesInitialRequest = {
           filter,
           limit: 100,
-
           orderFields: [{ field: 'metadata.name', order: 'asc' }],
           fullTextFilter: { term: 'cAt ' },
           credentials: mockCredentials.none(),
@@ -1141,6 +1199,60 @@ describe('DefaultEntitiesCatalog', () => {
       },
     );
 
+    it.each(databases.eachSupportedId())(
+      'should filter the results when query is provided with fullTextFilter for camelCase fields, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        const entities: Entity[] = [
+          {
+            apiVersion: 'a',
+            kind: 'k',
+            metadata: {
+              name: 'camelCase',
+            },
+            spec: {
+              shouldSearchCamelCase: 'searched',
+            },
+          },
+        ];
+
+        const notFoundEntities: Entity[] = [
+          {
+            apiVersion: 'a',
+            kind: 'k',
+            metadata: { name: 'something' },
+            spec: {},
+          },
+        ];
+
+        await Promise.all(
+          entities.concat(notFoundEntities).map(e => addEntityToSearch(e)),
+        );
+
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          stitcher,
+        });
+
+        const request: QueryEntitiesInitialRequest = {
+          limit: 100,
+          orderFields: [{ field: 'metadata.name', order: 'asc' }],
+          fullTextFilter: {
+            term: 'sear',
+            fields: ['spec.shouldSearchCamelCase'],
+          },
+          credentials: mockCredentials.none(),
+        };
+        const response = await catalog.queryEntities(request);
+        expect(response.items).toEqual(entities);
+        expect(response.pageInfo.nextCursor).toBeUndefined();
+        expect(response.pageInfo.prevCursor).toBeUndefined();
+        expect(response.totalItems).toBe(1);
+      },
+    );
+
     it.each(databases.eachSupportedId())(
       'should filter the text results when sortOrder is not provided, %p',
       async databaseId => {
@@ -1366,6 +1478,52 @@ describe('DefaultEntitiesCatalog', () => {
       },
     );
 
+    it.each(databases.eachSupportedId())(
+      'can skip totalItems, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        await Promise.all(
+          Array(15)
+            .fill(0)
+            .map(() =>
+              addEntityToSearch({
+                apiVersion: 'a',
+                kind: 'k',
+                metadata: { name: v4() },
+              }),
+            ),
+        );
+
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          stitcher,
+        });
+
+        const request: QueryEntitiesInitialRequest = {
+          limit: 10,
+          credentials: mockCredentials.none(),
+          skipTotalItems: true,
+        };
+        let response = await catalog.queryEntities(request);
+        expect(response).toEqual({
+          totalItems: 0,
+          items: expect.objectContaining({ length: 10 }),
+          pageInfo: { nextCursor: expect.anything() },
+        });
+        response = await catalog.queryEntities({
+          ...request,
+          cursor: response.pageInfo.nextCursor!,
+        });
+        expect(response).toEqual({
+          totalItems: 0,
+          items: expect.objectContaining({ length: 5 }),
+          pageInfo: { prevCursor: expect.anything() },
+        });
+      },
+    );
+
     it.each(databases.eachSupportedId())(
       'should paginate results accordingly in case of clashing items, %p',
       async databaseId => {
@@ -1685,6 +1843,51 @@ describe('DefaultEntitiesCatalog', () => {
         ).resolves.toEqual(['BB', 'CC', 'AA']); // 'AA' has no title, ends up last
       },
     );
+
+    it.each(databases.eachSupportedId())(
+      'should silently skip over entities that are not yet stitched, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        const entity1 = entityFrom('AA', { uid: 'id1' });
+        const entity2 = entityFrom('BB', { uid: 'id2' });
+        await Promise.all([
+          addEntityToSearch(entity1),
+          addEntityToSearch(entity2),
+        ]);
+
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          stitcher,
+        });
+
+        await expect(
+          catalog
+            .queryEntities({
+              orderFields: [{ field: 'metadata.uid', order: 'asc' }],
+              limit: 10,
+              credentials: mockCredentials.none(),
+            })
+            .then(r => r.items.map(e => e.metadata.name)),
+        ).resolves.toEqual(['AA', 'BB']);
+
+        // simulate a situation where stitching is not yet complete
+        await knex('final_entities')
+          .update({ final_entity: null })
+          .where({ entity_ref: stringifyEntityRef(entity1) });
+
+        await expect(
+          catalog
+            .queryEntities({
+              orderFields: [{ field: 'metadata.uid', order: 'asc' }],
+              limit: 10,
+              credentials: mockCredentials.none(),
+            })
+            .then(r => r.items.map(e => e.metadata.name)),
+        ).resolves.toEqual(['BB']);
+      },
+    );
   });
 
   describe('removeEntityByUid', () => {
@@ -1823,6 +2026,21 @@ describe('DefaultEntitiesCatalog', () => {
           },
         });
 
+        await expect(
+          catalog.facets({
+            facets: ['kind'],
+            filter: { key: 'metadata.name', values: ['two'] },
+            credentials: mockCredentials.none(),
+          }),
+        ).resolves.toEqual({
+          facets: {
+            kind: [
+              { value: 'k', count: 1 },
+              { value: 'k2', count: 1 },
+            ],
+          },
+        });
+
         await expect(
           catalog.facets({
             facets: ['kind'],
@@ -1933,6 +2151,50 @@ describe('DefaultEntitiesCatalog', () => {
         });
       },
     );
+
+    it.each(databases.eachSupportedId())(
+      'works with a mixture of present and missing facets, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        await addEntityToSearch({
+          apiVersion: 'a',
+          kind: 'k',
+          metadata: {
+            name: 'one',
+          },
+          spec: {},
+        });
+        await addEntityToSearch({
+          apiVersion: 'a',
+          kind: 'k',
+          metadata: {
+            name: 'two',
+          },
+          spec: {},
+        });
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          stitcher,
+        });
+
+        await expect(
+          catalog.facets({
+            facets: ['metadata.name', 'missing'],
+            credentials: mockCredentials.none(),
+          }),
+        ).resolves.toEqual({
+          facets: {
+            'metadata.name': expect.arrayContaining([
+              { value: 'one', count: 1 },
+              { value: 'two', count: 1 },
+            ]),
+            missing: [],
+          },
+        });
+      },
+    );
   });
 });
 
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index c71f242969..633b485604 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  Entity,
-  parseEntityRef,
-  stringifyEntityRef,
-} from '@backstage/catalog-model';
+import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { InputError, NotFoundError } from '@backstage/errors';
 import { Knex } from 'knex';
 import { chunk as lodashChunk, isEqual } from 'lodash';
@@ -49,21 +45,15 @@ import {
 import { Stitcher } from '../stitching/types';
 
 import {
+  expandLegacyCompoundRelationRefsInResponse,
   isQueryEntitiesCursorRequest,
   isQueryEntitiesInitialRequest,
 } from './util';
-import {
-  EntitiesSearchFilter,
-  EntityFilter,
-} from '@backstage/plugin-catalog-node';
+import { EntityFilter } from '@backstage/plugin-catalog-node';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { applyEntityFilterToQuery } from './request/applyEntityFilterToQuery';
 
-const defaultSortField: EntityOrder = {
-  field: 'metadata.uid',
-  order: 'asc',
-};
-
-const DEFAULT_LIMIT = 20;
+const DEFAULT_LIMIT = 200;
 
 function parsePagination(input?: EntityPagination): EntityPagination {
   if (!input) {
@@ -110,84 +100,6 @@ function stringifyPagination(
   return base64;
 }
 
-function addCondition(
-  queryBuilder: Knex.QueryBuilder,
-  db: Knex,
-  filter: EntitiesSearchFilter,
-  negate: boolean = false,
-  entityIdField = 'entity_id',
-): void {
-  const key = filter.key.toLowerCase();
-  const values = filter.values?.map(v => v.toLowerCase());
-
-  // NOTE(freben): This used to be a set of OUTER JOIN, which may seem to
-  // make a lot of sense. However, it had abysmal performance on sqlite
-  // when datasets grew large, so we're using IN instead.
-  const matchQuery = db<DbSearchRow>('search')
-    .select('search.entity_id')
-    .where({ key })
-    .andWhere(function keyFilter() {
-      if (values?.length === 1) {
-        this.where({ value: values.at(0) });
-      } else if (values) {
-        this.andWhere('value', 'in', values);
-      }
-    });
-  queryBuilder.andWhere(entityIdField, negate ? 'not in' : 'in', matchQuery);
-}
-
-function isEntitiesSearchFilter(
-  filter: EntitiesSearchFilter | EntityFilter,
-): filter is EntitiesSearchFilter {
-  return filter.hasOwnProperty('key');
-}
-
-function isOrEntityFilter(
-  filter: { anyOf: EntityFilter[] } | EntityFilter,
-): filter is { anyOf: EntityFilter[] } {
-  return filter.hasOwnProperty('anyOf');
-}
-
-function isNegationEntityFilter(
-  filter: { not: EntityFilter } | EntityFilter,
-): filter is { not: EntityFilter } {
-  return filter.hasOwnProperty('not');
-}
-
-function parseFilter(
-  filter: EntityFilter,
-  query: Knex.QueryBuilder,
-  db: Knex,
-  negate: boolean = false,
-  entityIdField = 'entity_id',
-): Knex.QueryBuilder {
-  if (isNegationEntityFilter(filter)) {
-    return parseFilter(filter.not, query, db, !negate, entityIdField);
-  }
-
-  if (isEntitiesSearchFilter(filter)) {
-    return query.andWhere(function filterFunction() {
-      addCondition(this, db, filter, negate, entityIdField);
-    });
-  }
-
-  return query[negate ? 'andWhereNot' : 'andWhere'](function filterFunction() {
-    if (isOrEntityFilter(filter)) {
-      for (const subFilter of filter.anyOf ?? []) {
-        this.orWhere(subQuery =>
-          parseFilter(subFilter, subQuery, db, false, entityIdField),
-        );
-      }
-    } else {
-      for (const subFilter of filter.allOf ?? []) {
-        this.andWhere(subQuery =>
-          parseFilter(subFilter, subQuery, db, false, entityIdField),
-        );
-      }
-    }
-  });
-}
-
 export class DefaultEntitiesCatalog implements EntitiesCatalog {
   private readonly database: Knex;
   private readonly logger: LoggerService;
@@ -205,6 +117,7 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
 
   async entities(request?: EntitiesRequest): Promise<EntitiesResponse> {
     const db = this.database;
+    const { limit, offset } = parsePagination(request?.pagination);
 
     let entitiesQuery =
       db<DbFinalEntitiesRow>('final_entities').select('final_entities.*');
@@ -224,13 +137,13 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     entitiesQuery = entitiesQuery.whereNotNull('final_entities.final_entity');
 
     if (request?.filter) {
-      entitiesQuery = parseFilter(
-        request.filter,
-        entitiesQuery,
-        db,
-        false,
-        'final_entities.entity_id',
-      );
+      entitiesQuery = applyEntityFilterToQuery({
+        filter: request.filter,
+        targetQuery: entitiesQuery,
+        onEntityIdField: 'final_entities.entity_id',
+        knex: db,
+        strategy: limit !== undefined && limit <= 500 ? 'join' : 'in',
+      });
     }
 
     request?.order?.forEach(({ order }, index) => {
@@ -251,18 +164,11 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     });
 
     if (!request?.order) {
-      entitiesQuery = entitiesQuery
-        .leftOuterJoin(
-          'refresh_state',
-          'refresh_state.entity_id',
-          'final_entities.entity_id',
-        )
-        .orderBy('refresh_state.entity_ref', 'asc'); // default sort
+      entitiesQuery = entitiesQuery.orderBy('final_entities.entity_ref', 'asc'); // default sort
     } else {
       entitiesQuery.orderBy('final_entities.entity_id', 'asc'); // stable sort
     }
 
-    const { limit, offset } = parsePagination(request?.pagination);
     if (limit !== undefined) {
       entitiesQuery = entitiesQuery.limit(limit + 1);
     }
@@ -291,27 +197,7 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       entities = entities.map(e => request.fields!(e));
     }
 
-    // TODO(freben): This is added as a compatibility guarantee, until we can be
-    // sure that all adopters have re-stitched their entities so that the new
-    // targetRef field is present on them, and that they have stopped consuming
-    // the now-removed old field
-    // TODO(jhaals): Remove this in April 2022
-    for (const entity of entities) {
-      if (entity.relations) {
-        for (const relation of entity.relations as any) {
-          if (!relation.targetRef && relation.target) {
-            // This is the case where an old-form entity, not yet stitched with
-            // the updated code, was in the database
-            relation.targetRef = stringifyEntityRef(relation.target);
-          } else if (!relation.target && relation.targetRef) {
-            // This is the case where a new-form entity, stitched with the
-            // updated code, was in the database but we still want to produce
-            // the old data shape as well for compatibility reasons
-            relation.target = parseEntityRef(relation.targetRef);
-          }
-        }
-      }
-    }
+    expandLegacyCompoundRelationRefsInResponse(entities);
 
     return {
       entities,
@@ -326,25 +212,19 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
 
     for (const chunk of lodashChunk(request.entityRefs, 200)) {
       let query = this.database<DbFinalEntitiesRow>('final_entities')
-        .innerJoin<DbRefreshStateRow>(
-          'refresh_state',
-          'refresh_state.entity_id',
-          'final_entities.entity_id',
-        )
         .select({
-          entityRef: 'refresh_state.entity_ref',
+          entityRef: 'final_entities.entity_ref',
           entity: 'final_entities.final_entity',
         })
-        .whereIn('refresh_state.entity_ref', chunk);
+        .whereIn('final_entities.entity_ref', chunk);
 
       if (request?.filter) {
-        query = parseFilter(
-          request.filter,
-          query,
-          this.database,
-          false,
-          'refresh_state.entity_id',
-        );
+        query = applyEntityFilterToQuery({
+          filter: request.filter,
+          targetQuery: query,
+          onEntityIdField: 'final_entities.entity_id',
+          knex: this.database,
+        });
       }
 
       for (const row of await query) {
@@ -364,110 +244,174 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
   async queryEntities(
     request: QueryEntitiesRequest,
   ): Promise<QueryEntitiesResponse> {
-    const db = this.database;
-
     const limit = request.limit ?? DEFAULT_LIMIT;
 
     const cursor: Omit<Cursor, 'orderFieldValues'> & {
       orderFieldValues?: (string | null)[];
+      skipTotalItems: boolean;
     } = {
-      orderFields: [defaultSortField],
+      orderFields: [],
       isPrevious: false,
       ...parseCursorFromRequest(request),
     };
 
+    // For performance reasons we invoke the count query only on the first
+    // request. The result is then embedded into the cursor for subsequent
+    // requests. Threfore this can be undefined here, but will then get
+    // populated further down.
+    const shouldComputeTotalItems =
+      cursor.totalItems === undefined && !cursor.skipTotalItems;
     const isFetchingBackwards = cursor.isPrevious;
 
     if (cursor.orderFields.length > 1) {
       this.logger.warn(`Only one sort field is supported, ignoring the rest`);
     }
 
-    const sortField: EntityOrder = {
-      ...defaultSortField,
-      ...cursor.orderFields[0],
-    };
+    const sortField = cursor.orderFields.at(0);
 
-    const [prevItemOrderFieldValue, prevItemUid] =
-      cursor.orderFieldValues || [];
+    // The first part of the query builder is a subquery that applies all of the
+    // filtering.
+    const dbQuery = this.database.with(
+      'filtered',
+      ['entity_id', 'final_entity', ...(sortField ? ['value'] : [])],
+      inner => {
+        inner
+          .from<DbFinalEntitiesRow>('final_entities')
+          .whereNotNull('final_entity');
 
-    const dbQuery = db('final_entities').leftOuterJoin('search', qb =>
-      qb
-        .on('search.entity_id', 'final_entities.entity_id')
-        .andOnVal('search.key', sortField.field),
-    );
+        if (sortField) {
+          inner
+            .leftOuterJoin('search', qb =>
+              qb
+                .on('search.entity_id', 'final_entities.entity_id')
+                .andOnVal('search.key', sortField.field),
+            )
+            .select({
+              entity_id: 'final_entities.entity_id',
+              final_entity: 'final_entities.final_entity',
+              value: 'search.value',
+            });
+        } else {
+          inner.select({
+            entity_id: 'final_entities.entity_id',
+            final_entity: 'final_entities.final_entity',
+          });
+        }
 
-    if (cursor.filter) {
-      parseFilter(
-        cursor.filter,
-        dbQuery,
-        db,
-        false,
-        'final_entities.entity_id',
-      );
-    }
+        // Add regular filters, if given
+        if (cursor.filter) {
+          applyEntityFilterToQuery({
+            filter: cursor.filter,
+            targetQuery: inner,
+            onEntityIdField: 'final_entities.entity_id',
+            knex: this.database,
+            strategy: limit <= 500 ? 'join' : 'in',
+          });
+        }
 
-    const normalizedFullTextFilterTerm = cursor.fullTextFilter?.term?.trim();
-    const textFilterFields = cursor.fullTextFilter?.fields ?? [sortField.field];
-    if (normalizedFullTextFilterTerm) {
-      if (
-        textFilterFields.length === 1 &&
-        textFilterFields[0] === sortField.field
-      ) {
-        // If there is one item, apply the like query to the top level query which is already
-        //   filtered based on the singular sortField.
-        dbQuery.andWhereRaw(
-          'value like ?',
-          `%${normalizedFullTextFilterTerm.toLocaleLowerCase('en-US')}%`,
-        );
-      } else {
-        const matchQuery = db<DbSearchRow>('search')
-          .select('search.entity_id')
-          .whereIn('key', textFilterFields)
-          .andWhere(function keyFilter() {
-            this.andWhereRaw(
-              'value like ?',
+        // Add full text search filters, if given
+        const normalizedFullTextFilterTerm =
+          cursor.fullTextFilter?.term?.trim();
+        const textFilterFields = cursor.fullTextFilter?.fields ?? [
+          sortField?.field || 'metadata.uid',
+        ];
+        if (normalizedFullTextFilterTerm) {
+          if (
+            textFilterFields.length === 1 &&
+            textFilterFields[0] === sortField?.field
+          ) {
+            // If there is one item, apply the like query to the top level query which is already
+            //   filtered based on the singular sortField.
+            inner.andWhereRaw(
+              'search.value like ?',
               `%${normalizedFullTextFilterTerm.toLocaleLowerCase('en-US')}%`,
             );
-          });
-        dbQuery.andWhere('final_entities.entity_id', 'in', matchQuery);
+          } else {
+            const matchQuery = this.database<DbSearchRow>('search')
+              .select('search.entity_id')
+              // textFilterFields must be lowercased to match searchable keys in database, i.e. spec.profile.displayName -> spec.profile.displayname
+              .whereIn(
+                'search.key',
+                textFilterFields.map(field => field.toLocaleLowerCase('en-US')),
+              )
+              .andWhere(function keyFilter() {
+                this.andWhereRaw(
+                  'search.value like ?',
+                  `%${normalizedFullTextFilterTerm.toLocaleLowerCase(
+                    'en-US',
+                  )}%`,
+                );
+              });
+            inner.andWhere('final_entities.entity_id', 'in', matchQuery);
+          }
+        }
+      },
+    );
+
+    // Only pay the cost of counting the number of items if needed
+    if (shouldComputeTotalItems) {
+      // Note the intentional cross join here. The filtered_count dataset is
+      // always exactly one row, so it won't grow the result unnecessarily. But
+      // it's also important that there IS at least one row, because even if the
+      // filtered dataset is empty, we still want to know the total number of
+      // items.
+      dbQuery
+        .with('filtered_count', ['count'], inner =>
+          inner.from('filtered').count('*', { as: 'count' }),
+        )
+        .fromRaw('filtered_count, filtered')
+        .select('count', 'filtered.*');
+    } else {
+      dbQuery.from('filtered').select('*');
+    }
+
+    const isOrderingDescending = sortField?.order === 'desc';
+
+    // Move forward (or backward) in the set to the correct cursor position
+    if (cursor.orderFieldValues) {
+      if (cursor.orderFieldValues.length === 2) {
+        // The first will be the sortField value, the second the entity_id
+        const [first, second] = cursor.orderFieldValues;
+        dbQuery.andWhere(function nested() {
+          this.where(
+            'filtered.value',
+            isFetchingBackwards !== isOrderingDescending ? '<' : '>',
+            first,
+          )
+            .orWhere('filtered.value', '=', first)
+            .andWhere(
+              'filtered.entity_id',
+              isFetchingBackwards !== isOrderingDescending ? '<' : '>',
+              second,
+            );
+        });
+      } else if (cursor.orderFieldValues.length === 1) {
+        // This will be the entity_id
+        const [first] = cursor.orderFieldValues;
+        dbQuery.andWhere('entity_id', isFetchingBackwards ? '<' : '>', first);
       }
     }
 
-    const countQuery = dbQuery.clone();
-
-    const isOrderingDescending = sortField.order === 'desc';
-
-    if (prevItemOrderFieldValue) {
-      dbQuery.andWhere(function nested() {
-        this.where(
-          'value',
-          isFetchingBackwards !== isOrderingDescending ? '<' : '>',
-          prevItemOrderFieldValue,
-        )
-          .orWhere('value', '=', prevItemOrderFieldValue)
-          .andWhere(
-            'final_entities.entity_id',
-            isFetchingBackwards !== isOrderingDescending ? '<' : '>',
-            prevItemUid,
-          );
-      });
+    // Add the ordering
+    let order = sortField?.order ?? 'asc';
+    if (isFetchingBackwards) {
+      order = invertOrder(order);
     }
-
-    if (db.client.config.client === 'pg') {
+    if (this.database.client.config.client === 'pg') {
       // pg correctly orders by the column value and handling nulls in one go
       dbQuery.orderBy([
+        ...(sortField
+          ? [
+              {
+                column: 'filtered.value',
+                order,
+                nulls: 'last',
+              },
+            ]
+          : []),
         {
-          column: 'search.value',
-          order: isFetchingBackwards
-            ? invertOrder(sortField.order)
-            : sortField.order,
-          nulls: 'last',
-        },
-        {
-          column: 'final_entities.entity_id',
-          order: isFetchingBackwards
-            ? invertOrder(sortField.order)
-            : sortField.order,
+          column: 'filtered.entity_id',
+          order,
         },
       ]);
     } else {
@@ -475,26 +419,27 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       // no matter what the order is, for some reason, so we have to manually add back the statement
       // that translates to "order by value <order>" while avoiding to give an order
       dbQuery.orderBy([
+        ...(sortField
+          ? [
+              {
+                column: 'filtered.value',
+                order: undefined,
+                nulls: 'last',
+              },
+              {
+                column: 'filtered.value',
+                order,
+              },
+            ]
+          : []),
         {
-          column: 'search.value',
-          order: undefined,
-          nulls: 'last',
-        },
-        {
-          column: 'search.value',
-          order: isFetchingBackwards
-            ? invertOrder(sortField.order)
-            : sortField.order,
-        },
-        {
-          column: 'final_entities.entity_id',
-          order: isFetchingBackwards
-            ? invertOrder(sortField.order)
-            : sortField.order,
+          column: 'filtered.entity_id',
+          order,
         },
       ]);
     }
 
+    // Apply a manually set initial offset
     if (
       isQueryEntitiesInitialRequest(request) &&
       request.offset !== undefined
@@ -504,20 +449,18 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     // fetch an extra item to check if there are more items.
     dbQuery.limit(isFetchingBackwards ? limit : limit + 1);
 
-    countQuery.count('final_entities.entity_id', { as: 'count' });
+    const rows = shouldComputeTotalItems || limit > 0 ? await dbQuery : [];
 
-    const [rows, [{ count }]] = await Promise.all([
-      limit > 0 ? dbQuery : [],
-      // for performance reasons we invoke the countQuery
-      // only on the first request.
-      // The result is then embedded into the cursor
-      // for subsequent requests.
-      typeof cursor.totalItems === 'undefined'
-        ? countQuery
-        : [{ count: cursor.totalItems }],
-    ]);
-
-    const totalItems = Number(count);
+    let totalItems: number;
+    if (cursor.totalItems !== undefined) {
+      totalItems = cursor.totalItems;
+    } else if (cursor.skipTotalItems) {
+      totalItems = 0;
+    } else if (rows.length) {
+      totalItems = Number(rows[0].count);
+    } else {
+      totalItems = 0;
+    }
 
     if (isFetchingBackwards) {
       rows.reverse();
@@ -535,15 +478,13 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     const firstRow = rows[0];
     const lastRow = rows[rows.length - 1];
 
-    const firstSortFieldValues = cursor.firstSortFieldValues || [
-      firstRow?.value,
-      firstRow?.entity_id,
-    ];
+    const firstSortFieldValues =
+      cursor.firstSortFieldValues || sortFieldsFromRow(firstRow, sortField);
 
     const nextCursor: Cursor | undefined = hasMoreResults
       ? {
           ...cursor,
-          orderFieldValues: sortFieldsFromRow(lastRow),
+          orderFieldValues: sortFieldsFromRow(lastRow, sortField),
           firstSortFieldValues,
           isPrevious: false,
           totalItems,
@@ -553,10 +494,13 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     const prevCursor: Cursor | undefined =
       !isInitialRequest &&
       rows.length > 0 &&
-      !isEqual(sortFieldsFromRow(firstRow), cursor.firstSortFieldValues)
+      !isEqual(
+        sortFieldsFromRow(firstRow, sortField),
+        cursor.firstSortFieldValues,
+      )
         ? {
             ...cursor,
-            orderFieldValues: sortFieldsFromRow(firstRow),
+            orderFieldValues: sortFieldsFromRow(firstRow, sortField),
             firstSortFieldValues: cursor.firstSortFieldValues,
             isPrevious: true,
             totalItems,
@@ -669,11 +613,8 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
   }
 
   async entityAncestry(rootRef: string): Promise<EntityAncestryResponse> {
-    const [rootRow] = await this.database<DbRefreshStateRow>('refresh_state')
-      .leftJoin<DbFinalEntitiesRow>('final_entities', {
-        'refresh_state.entity_id': 'final_entities.entity_id',
-      })
-      .where('refresh_state.entity_ref', '=', rootRef)
+    const [rootRow] = await this.database<DbFinalEntitiesRow>('final_entities')
+      .where('final_entities.entity_ref', '=', rootRef)
       .select({
         entityJson: 'final_entities.final_entity',
       });
@@ -698,16 +639,13 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       const parentRows = await this.database<DbRefreshStateReferencesRow>(
         'refresh_state_references',
       )
-        .innerJoin<DbRefreshStateRow>('refresh_state', {
-          'refresh_state_references.source_entity_ref':
-            'refresh_state.entity_ref',
-        })
         .innerJoin<DbFinalEntitiesRow>('final_entities', {
-          'refresh_state.entity_id': 'final_entities.entity_id',
+          'refresh_state_references.source_entity_ref':
+            'final_entities.entity_ref',
         })
         .where('refresh_state_references.target_entity_ref', '=', currentRef)
         .select({
-          parentEntityRef: 'refresh_state.entity_ref',
+          parentEntityRef: 'final_entities.entity_ref',
           parentEntityJson: 'final_entities.final_entity',
         });
 
@@ -733,26 +671,39 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
   }
 
   async facets(request: EntityFacetsRequest): Promise<EntityFacetsResponse> {
+    const query = this.database<DbSearchRow>('search')
+      .whereIn(
+        'search.key',
+        request.facets.map(f => f.toLocaleLowerCase('en-US')),
+      )
+      .whereNotNull('search.original_value')
+      .select({
+        facet: 'search.key',
+        value: 'search.original_value',
+        count: this.database.raw('count(*)'),
+      })
+      .groupBy(['search.key', 'search.original_value']);
+
+    if (request.filter) {
+      applyEntityFilterToQuery({
+        filter: request.filter,
+        targetQuery: query,
+        onEntityIdField: 'search.entity_id',
+        knex: this.database,
+      });
+    }
+
+    const rows = await query;
+
     const facets: EntityFacetsResponse['facets'] = {};
-    const db = this.database;
-
     for (const facet of request.facets) {
-      const dbQuery = db<DbSearchRow>('search')
-        .where('search.key', facet.toLocaleLowerCase('en-US'))
-        .whereNotNull('search.original_value')
-        .select({ value: 'search.original_value', count: db.raw('count(*)') })
-        .groupBy('search.original_value');
-
-      if (request?.filter) {
-        parseFilter(request.filter, dbQuery, db, false, 'search.entity_id');
-      }
-
-      const result = await dbQuery;
-
-      facets[facet] = result.map(data => ({
-        value: String(data.value),
-        count: Number(data.count),
-      }));
+      const facetLowercase = facet.toLocaleLowerCase('en-US');
+      facets[facet] = rows
+        .filter(row => row.facet === facetLowercase)
+        .map(row => ({
+          value: String(row.value),
+          count: Number(row.count),
+        }));
     }
 
     return { facets };
@@ -784,25 +735,35 @@ export const cursorParser: z.ZodSchema<Cursor> = z.object({
 
 function parseCursorFromRequest(
   request?: QueryEntitiesRequest,
-): Partial<Cursor> {
+): Partial<Cursor> & { skipTotalItems: boolean } {
   if (isQueryEntitiesInitialRequest(request)) {
     const {
       filter,
-      orderFields: sortFields = [defaultSortField],
+      orderFields: sortFields = [],
       fullTextFilter,
+      skipTotalItems = false,
     } = request;
-    return { filter, orderFields: sortFields, fullTextFilter };
+    return { filter, orderFields: sortFields, fullTextFilter, skipTotalItems };
   }
   if (isQueryEntitiesCursorRequest(request)) {
-    return request.cursor;
+    return {
+      ...request.cursor,
+      // Doesn't matter here
+      skipTotalItems: false,
+    };
   }
-  return {};
+  return {
+    skipTotalItems: false,
+  };
 }
 
 function invertOrder(order: EntityOrder['order']) {
   return order === 'asc' ? 'desc' : 'asc';
 }
 
-function sortFieldsFromRow(row: DbSearchRow) {
-  return [row.value, row.entity_id];
+function sortFieldsFromRow(
+  row: DbSearchRow & DbFinalEntitiesRow,
+  sortField?: EntityOrder | undefined,
+) {
+  return sortField ? [row?.value, row?.entity_id] : [row?.entity_id];
 }
diff --git a/plugins/catalog-backend/src/service/createRouter.test.ts b/plugins/catalog-backend/src/service/createRouter.test.ts
index 6654187526..e728017f0b 100644
--- a/plugins/catalog-backend/src/service/createRouter.test.ts
+++ b/plugins/catalog-backend/src/service/createRouter.test.ts
@@ -135,9 +135,10 @@ describe('createRouter readonly disabled', () => {
         { apiVersion: 'a', kind: 'b', metadata: { name: 'n' } },
       ];
 
-      entitiesCatalog.entities.mockResolvedValueOnce({
-        entities: [entities[0]],
-        pageInfo: { hasNextPage: false },
+      entitiesCatalog.queryEntities.mockResolvedValueOnce({
+        items: [entities[0]],
+        pageInfo: {},
+        totalItems: 1,
       });
 
       const response = await request(app).get('/entities');
@@ -147,17 +148,18 @@ describe('createRouter readonly disabled', () => {
     });
 
     it('parses single and multiple request parameters and passes them down', async () => {
-      entitiesCatalog.entities.mockResolvedValueOnce({
-        entities: [],
-        pageInfo: { hasNextPage: false },
+      entitiesCatalog.queryEntities.mockResolvedValueOnce({
+        items: [],
+        pageInfo: {},
+        totalItems: 0,
       });
       const response = await request(app).get(
         '/entities?filter=a=1,a=2,b=3&filter=c=4',
       );
 
       expect(response.status).toEqual(200);
-      expect(entitiesCatalog.entities).toHaveBeenCalledTimes(1);
-      expect(entitiesCatalog.entities).toHaveBeenCalledWith({
+      expect(entitiesCatalog.queryEntities).toHaveBeenCalledTimes(1);
+      expect(entitiesCatalog.queryEntities).toHaveBeenCalledWith({
         filter: {
           anyOf: [
             {
@@ -166,10 +168,12 @@ describe('createRouter readonly disabled', () => {
                 { key: 'b', values: ['3'] },
               ],
             },
-            { allOf: [{ key: 'c', values: ['4'] }] },
+            { key: 'c', values: ['4'] },
           ],
         },
+        limit: 10000,
         credentials: mockCredentials.user(),
+        skipTotalItems: true,
       });
     });
   });
@@ -218,7 +222,7 @@ describe('createRouter readonly disabled', () => {
                 { key: 'b', values: ['3'] },
               ],
             },
-            { allOf: [{ key: 'c', values: ['4'] }] },
+            { key: 'c', values: ['4'] },
           ],
         },
         orderFields: [
@@ -258,7 +262,7 @@ describe('createRouter readonly disabled', () => {
                 { key: 'b', values: ['3'] },
               ],
             },
-            { allOf: [{ key: 'c', values: ['4'] }] },
+            { key: 'c', values: ['4'] },
           ],
         },
         orderFields: [
@@ -441,20 +445,15 @@ describe('createRouter readonly disabled', () => {
           namespace: 'ns',
         },
       };
-      entitiesCatalog.entities.mockResolvedValue({
-        entities: [entity],
-        pageInfo: { hasNextPage: false },
+      entitiesCatalog.entitiesBatch.mockResolvedValue({
+        items: [entity],
       });
 
       const response = await request(app).get('/entities/by-name/k/ns/n');
 
-      expect(entitiesCatalog.entities).toHaveBeenCalledTimes(1);
-      expect(entitiesCatalog.entities).toHaveBeenCalledWith({
-        filter: basicEntityFilter({
-          kind: 'k',
-          'metadata.namespace': 'ns',
-          'metadata.name': 'n',
-        }),
+      expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledTimes(1);
+      expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledWith({
+        entityRefs: ['k:ns/n'],
         credentials: mockCredentials.user(),
       });
       expect(response.status).toEqual(200);
@@ -462,20 +461,15 @@ describe('createRouter readonly disabled', () => {
     });
 
     it('responds with a 404 for missing entities', async () => {
-      entitiesCatalog.entities.mockResolvedValue({
-        entities: [],
-        pageInfo: { hasNextPage: false },
+      entitiesCatalog.entitiesBatch.mockResolvedValue({
+        items: [null],
       });
 
       const response = await request(app).get('/entities/by-name/b/d/c');
 
-      expect(entitiesCatalog.entities).toHaveBeenCalledTimes(1);
-      expect(entitiesCatalog.entities).toHaveBeenCalledWith({
-        filter: basicEntityFilter({
-          kind: 'b',
-          'metadata.namespace': 'd',
-          'metadata.name': 'c',
-        }),
+      expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledTimes(1);
+      expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledWith({
+        entityRefs: ['b:d/c'],
         credentials: mockCredentials.user(),
       });
       expect(response.status).toEqual(404);
@@ -554,13 +548,7 @@ describe('createRouter readonly disabled', () => {
         entityRefs: [entityRef],
         fields: expect.any(Function),
         credentials: mockCredentials.user(),
-        filter: {
-          anyOf: [
-            {
-              allOf: [{ key: 'kind', values: ['Component'] }],
-            },
-          ],
-        },
+        filter: { key: 'kind', values: ['Component'] },
       });
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({ items: [entity] });
@@ -919,9 +907,10 @@ describe('createRouter readonly enabled', () => {
         { apiVersion: 'a', kind: 'b', metadata: { name: 'n' } },
       ];
 
-      entitiesCatalog.entities.mockResolvedValueOnce({
-        entities: [entities[0]],
-        pageInfo: { hasNextPage: false },
+      entitiesCatalog.queryEntities.mockResolvedValueOnce({
+        items: [entities[0]],
+        pageInfo: {},
+        totalItems: 1,
       });
 
       const response = await request(app).get('/entities');
diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index 4a89cfc6cb..d70419c565 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -27,7 +27,7 @@ import { InputError, NotFoundError, serializeError } from '@backstage/errors';
 import express from 'express';
 import yn from 'yn';
 import { z } from 'zod';
-import { EntitiesCatalog } from '../catalog/types';
+import { Cursor, EntitiesCatalog } from '../catalog/types';
 import { CatalogProcessingOrchestrator } from '../processing/types';
 import { validateEntityEnvelope } from '../processing/util';
 import {
@@ -41,12 +41,14 @@ import { parseEntityFacetParams } from './request/parseEntityFacetParams';
 import { parseEntityOrderParams } from './request/parseEntityOrderParams';
 import { LocationService, RefreshService } from './types';
 import {
+  createEntityArrayJsonStream,
   disallowReadonlyMode,
   encodeCursor,
+  expandLegacyCompoundRelationRefsInResponse,
   locationInput,
   validateRequestBody,
 } from './util';
-import { createOpenApiRouter } from '../schema/openapi.generated';
+import { createOpenApiRouter } from '../schema/openapi';
 import { parseEntityPaginationParams } from './request/parseEntityPaginationParams';
 import {
   AuthService,
@@ -57,6 +59,7 @@ import {
 } from '@backstage/backend-plugin-api';
 import { LocationAnalyzer } from '@backstage/plugin-catalog-node';
 import { AuthorizedValidationService } from './AuthorizedValidationService';
+import { DeferredPromise, createDeferred } from '@backstage/types';
 
 /**
  * Options used by {@link createRouter}.
@@ -135,24 +138,99 @@ export async function createRouter(
   if (entitiesCatalog) {
     router
       .get('/entities', async (req, res) => {
-        const { entities, pageInfo } = await entitiesCatalog.entities({
-          filter: parseEntityFilterParams(req.query),
-          fields: parseEntityTransformParams(req.query),
-          order: parseEntityOrderParams(req.query),
-          pagination: parseEntityPaginationParams(req.query),
-          credentials: await httpAuth.credentials(req),
-        });
+        const filter = parseEntityFilterParams(req.query);
+        const fields = parseEntityTransformParams(req.query);
+        const order = parseEntityOrderParams(req.query);
+        const pagination = parseEntityPaginationParams(req.query);
+        const credentials = await httpAuth.credentials(req);
 
-        // Add a Link header to the next page
-        if (pageInfo.hasNextPage) {
-          const url = new URL(`http://ignored${req.url}`);
-          url.searchParams.delete('offset');
-          url.searchParams.set('after', pageInfo.endCursor);
-          res.setHeader('link', `<${url.pathname}${url.search}>; rel="next"`);
+        // When pagination parameters are passed in, use the legacy slow path
+        // that loads all entities into memory
+
+        if (pagination) {
+          const { entities, pageInfo } = await entitiesCatalog.entities({
+            filter,
+            fields,
+            order,
+            pagination,
+            credentials,
+          });
+
+          // Add a Link header to the next page
+          if (pageInfo.hasNextPage) {
+            const url = new URL(`http://ignored${req.url}`);
+            url.searchParams.delete('offset');
+            url.searchParams.set('after', pageInfo.endCursor);
+            res.setHeader('link', `<${url.pathname}${url.search}>; rel="next"`);
+          }
+
+          res.json(entities);
+          return;
         }
 
-        // TODO(freben): encode the pageInfo in the response
-        res.json(entities);
+        // For other read-the-entire-world cases, use queryEntities and stream
+        // out results.
+
+        // The write lock is used for back pressure, preventing slow readers
+        // from forcing our read loop to pile up response data in userspace
+        // buffers faster than the kernel buffer is emptied.
+        // https://nodejs.org/api/http.html#http_response_write_chunk_encoding_callback
+        const locks: { writeLock?: DeferredPromise } = {};
+        const controller = new AbortController();
+        const signal = controller.signal;
+        req.on('end', () => {
+          controller.abort(new Error('Client closed connection'));
+          locks.writeLock?.resolve();
+          delete locks.writeLock;
+        });
+
+        const responseStream = createEntityArrayJsonStream(res);
+        const limit = 10000;
+        let cursor: Cursor | undefined;
+
+        try {
+          do {
+            const result = await entitiesCatalog.queryEntities(
+              !cursor
+                ? {
+                    credentials,
+                    fields,
+                    limit,
+                    filter,
+                    orderFields: order,
+                    skipTotalItems: true,
+                  }
+                : { credentials, fields, limit, cursor },
+            );
+
+            if (result.items.length) {
+              await locks?.writeLock;
+
+              signal.throwIfAborted();
+
+              expandLegacyCompoundRelationRefsInResponse(result.items);
+              if (!responseStream.send(result.items)) {
+                // The kernel buffer is full. Create the lock but do not await it
+                // yet - we can better spend our time going to the next round of
+                // the loop and read from the database while we wait for it to
+                // drain.
+                locks.writeLock = createDeferred();
+                res.once('drain', () => {
+                  locks.writeLock?.resolve();
+                  delete locks.writeLock;
+                });
+              }
+            }
+
+            signal.throwIfAborted();
+
+            cursor = result.pageInfo?.nextCursor;
+          } while (cursor);
+
+          responseStream.complete();
+        } finally {
+          responseStream.close();
+        }
       })
       .get('/entities/by-query', async (req, res) => {
         const { items, pageInfo, totalItems } =
@@ -196,20 +274,16 @@ export async function createRouter(
       })
       .get('/entities/by-name/:kind/:namespace/:name', async (req, res) => {
         const { kind, namespace, name } = req.params;
-        const { entities } = await entitiesCatalog.entities({
-          filter: basicEntityFilter({
-            kind: kind,
-            'metadata.namespace': namespace,
-            'metadata.name': name,
-          }),
+        const { items } = await entitiesCatalog.entitiesBatch({
+          entityRefs: [stringifyEntityRef({ kind, namespace, name })],
           credentials: await httpAuth.credentials(req),
         });
-        if (!entities.length) {
+        if (!items[0]) {
           throw new NotFoundError(
             `No entity named '${name}' found, with kind '${kind}' in namespace '${namespace}'`,
           );
         }
-        res.status(200).json(entities[0]);
+        res.status(200).json(items[0]);
       })
       .get(
         '/entities/by-name/:kind/:namespace/:name/ancestry',
diff --git a/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.test.ts b/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.test.ts
new file mode 100644
index 0000000000..ea64f5b400
--- /dev/null
+++ b/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.test.ts
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TestDatabases } from '@backstage/backend-test-utils';
+import { applyEntityFilterToQuery } from './applyEntityFilterToQuery';
+import {
+  DbFinalEntitiesRow,
+  DbRefreshStateRow,
+  DbSearchRow,
+} from '../../database/tables';
+import { Knex } from 'knex';
+import { applyDatabaseMigrations } from '../../database/migrations';
+import { EntityFilter } from '@backstage/plugin-catalog-node';
+import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
+import { v4 as uuid } from 'uuid';
+import { buildEntitySearch } from '../../database/operations/stitcher/buildEntitySearch';
+
+jest.setTimeout(60_000);
+
+const databases = TestDatabases.create();
+const strategies = ['in', 'join'] as const;
+
+describe.each(databases.eachSupportedId())(
+  'applyEntityFilterToQuery, %p',
+  databaseId => {
+    // #region setup
+    let knex: Knex;
+
+    beforeAll(async () => {
+      knex = await databases.init(databaseId);
+      await applyDatabaseMigrations(knex);
+      await addEntity({
+        apiVersion: 'a',
+        kind: 'k',
+        metadata: { name: '1', namespace: 'default' },
+        spec: {
+          foo: 'a',
+          unique: true,
+        },
+      });
+      await addEntity({
+        apiVersion: 'a',
+        kind: 'k',
+        metadata: { name: '2', namespace: 'default' },
+        spec: {
+          foo: 'a',
+        },
+      });
+      await addEntity({
+        apiVersion: 'a',
+        kind: 'k',
+        metadata: { name: '3', namespace: 'default' },
+        spec: {
+          foo: 'b',
+        },
+      });
+      await addEntity({
+        apiVersion: 'a',
+        kind: 'k',
+        metadata: { name: '4', namespace: 'default' },
+        spec: {},
+      });
+    });
+
+    afterAll(async () => {
+      knex.destroy();
+    });
+
+    async function addEntity(entity: Entity) {
+      const id = uuid();
+      const entityRef = stringifyEntityRef(entity);
+      const entityJson = JSON.stringify(entity);
+
+      await knex<DbRefreshStateRow>('refresh_state').insert({
+        entity_id: id,
+        entity_ref: entityRef,
+        unprocessed_entity: entityJson,
+        errors: '[]',
+        next_update_at: '2031-01-01 23:00:00',
+        last_discovery_at: '2021-04-01 13:37:00',
+      });
+
+      await knex<DbFinalEntitiesRow>('final_entities').insert({
+        entity_id: id,
+        entity_ref: entityRef,
+        final_entity: entityJson,
+        hash: 'h',
+        stitch_ticket: '',
+      });
+
+      const search = await buildEntitySearch(id, entity);
+      await knex<DbSearchRow>('search').insert(search);
+
+      return id;
+    }
+    // #endregion
+
+    describe.each(strategies)('with strategy %p', strategy => {
+      async function query(filter: EntityFilter): Promise<string[]> {
+        const q =
+          knex<DbFinalEntitiesRow>('final_entities').whereNotNull(
+            'final_entity',
+          );
+        applyEntityFilterToQuery({
+          filter: filter,
+          targetQuery: q,
+          onEntityIdField: 'final_entities.entity_id',
+          knex,
+          strategy,
+        });
+        return await q.then(rows =>
+          rows
+            .map(row => JSON.parse(row.final_entity!).metadata.name)
+            .toSorted(),
+        );
+      }
+
+      it('filters correctly', async () => {
+        await expect(query({ key: 'spec.foo' })).resolves.toEqual([
+          '1',
+          '2',
+          '3',
+        ]);
+
+        await expect(
+          query({ key: 'spec.foo', values: ['a'] }),
+        ).resolves.toEqual(['1', '2']);
+
+        await expect(
+          query({ key: 'spec.foo', values: ['b'] }),
+        ).resolves.toEqual(['3']);
+
+        await expect(
+          query({ key: 'spec.foo', values: ['a', 'b'] }),
+        ).resolves.toEqual(['1', '2', '3']);
+
+        await expect(
+          query({
+            anyOf: [
+              { key: 'spec.foo', values: ['a'] },
+              { key: 'spec.foo', values: ['b'] },
+            ],
+          }),
+        ).resolves.toEqual(['1', '2', '3']);
+
+        await expect(
+          query({ not: { key: 'spec.foo', values: ['a'] } }),
+        ).resolves.toEqual(['3', '4']);
+
+        await expect(
+          query({
+            not: {
+              anyOf: [
+                { key: 'spec.foo', values: ['a'] },
+                { key: 'spec.foo', values: ['b'] },
+              ],
+            },
+          }),
+        ).resolves.toEqual(['4']);
+
+        await expect(
+          query({
+            allOf: [
+              { key: 'spec.foo' },
+              { not: { key: 'spec.foo', values: ['a'] } },
+            ],
+          }),
+        ).resolves.toEqual(['3']);
+
+        await expect(query({ key: 'spec.unique' })).resolves.toEqual(['1']);
+
+        await expect(
+          query({
+            allOf: [
+              { key: 'spec.foo', values: ['a'] },
+              { not: { key: 'spec.unique' } },
+            ],
+          }),
+        ).resolves.toEqual(['2']);
+      });
+    });
+  },
+);
diff --git a/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.ts b/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.ts
new file mode 100644
index 0000000000..bf5c69d6b3
--- /dev/null
+++ b/plugins/catalog-backend/src/service/request/applyEntityFilterToQuery.ts
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  EntitiesSearchFilter,
+  EntityFilter,
+} from '@backstage/plugin-catalog-node';
+import { Knex } from 'knex';
+import { DbSearchRow } from '../../database/tables';
+
+function isEntitiesSearchFilter(
+  filter: EntitiesSearchFilter | EntityFilter,
+): filter is EntitiesSearchFilter {
+  return filter.hasOwnProperty('key');
+}
+
+function isOrEntityFilter(
+  filter: EntityFilter,
+): filter is { anyOf: EntityFilter[] } {
+  return filter.hasOwnProperty('anyOf');
+}
+
+function isAndEntityFilter(
+  filter: EntityFilter,
+): filter is { allOf: EntityFilter[] } {
+  return filter.hasOwnProperty('allOf');
+}
+
+function isNegationEntityFilter(
+  filter: EntityFilter,
+): filter is { not: EntityFilter } {
+  return filter.hasOwnProperty('not');
+}
+
+/**
+ * Applies filtering through a number of WHERE IN subqueries. Example:
+ *
+ * ```
+ * SELECT * FROM final_entities
+ * WHERE
+ *   entity_id IN (
+ *     SELECT entity_id FROM search
+ *     WHERE key = 'kind' AND value = 'component'
+ *   )
+ *   AND entity_id IN (
+ *     SELECT entity_id FROM search
+ *     WHERE key = 'spec.lifecycle' AND value = 'production'
+ *   )
+ *   AND final_entities.final_entity IS NOT NULL
+ * ```
+ *
+ * This strategy is a good all-rounder, in the sense that it has medium-good
+ * performance on most queries on all database engines. However, it does not
+ * scale well down to very short runtimes as well as the JOIN strategy.
+ */
+function applyInStrategy(
+  filter: EntityFilter,
+  targetQuery: Knex.QueryBuilder,
+  onEntityIdField: string,
+  knex: Knex,
+  negate: boolean,
+): Knex.QueryBuilder {
+  if (isNegationEntityFilter(filter)) {
+    return applyInStrategy(
+      filter.not,
+      targetQuery,
+      onEntityIdField,
+      knex,
+      !negate,
+    );
+  }
+
+  if (isEntitiesSearchFilter(filter)) {
+    const key = filter.key.toLowerCase();
+    const values = filter.values?.map(v => v.toLowerCase());
+    const matchQuery = knex<DbSearchRow>('search')
+      .select('search.entity_id')
+      .where({ key })
+      .andWhere(function keyFilter() {
+        if (values?.length === 1) {
+          this.where({ value: values.at(0) });
+        } else if (values) {
+          this.andWhere('value', 'in', values);
+        }
+      });
+    return targetQuery.andWhere(
+      onEntityIdField,
+      negate ? 'not in' : 'in',
+      matchQuery,
+    );
+  }
+
+  return targetQuery[negate ? 'andWhereNot' : 'andWhere'](
+    function filterFunction() {
+      if (isOrEntityFilter(filter)) {
+        for (const subFilter of filter.anyOf ?? []) {
+          this.orWhere(subQuery =>
+            applyInStrategy(subFilter, subQuery, onEntityIdField, knex, false),
+          );
+        }
+      } else {
+        for (const subFilter of filter.allOf ?? []) {
+          this.andWhere(subQuery =>
+            applyInStrategy(subFilter, subQuery, onEntityIdField, knex, false),
+          );
+        }
+      }
+    },
+  );
+}
+
+/**
+ * Applies filtering through a number of JOINs with the search table. Example:
+ *
+ * ```
+ * SELECT * FROM final_entities
+ * LEFT OUTER JOIN search AS filter_0
+ *   ON filter_0.entity_id = final_entities.entity_id
+ *   AND filter_0.key = 'kind'
+ * LEFT OUTER JOIN search AS filter_1
+ *   ON filter_1.entity_id = final_entities.entity_id
+ *   AND filter_1.key = 'spec.lifecycle'
+ * WHERE (filter_0.value = 'component' AND filter_1.value = 'production')
+ *   AND final_entities.final_entity IS NOT NULL
+ * ```
+ *
+ * This strategy has very good performance on nested medium complexity queries
+ * on pg, but can be slow on sqlite. It also has much larger variance than the
+ * IN strategy: for small page sizes (< 500 or so, depending on circumstances)
+ * it generates a fast plan, but then at some threshold switches over to scans
+ * which suddenly lead to much worse performance than IN. Therefore it can be
+ * important to pick carefully between the strategies.
+ */
+function applyJoinStrategy(
+  filter: EntityFilter,
+  targetQuery: Knex.QueryBuilder,
+  onEntityIdField: string,
+): Knex.QueryBuilder {
+  // First we traverse the entire query tree to gather up all of the unique keys
+  // that are tested against, and make sure to make an outer join on the search
+  // table for each of them. As we do so, collect the table aliases made along
+  // the way. In the end, this map may contain for example
+  // `{ 'kind': 'filter_0', 'spec.lifecycle': 'filter_1' }`
+  const keyToSearchTableAlias = new Map<string, string>();
+  function recursiveMakeJoinAliases(filterNode: EntityFilter) {
+    if (isNegationEntityFilter(filterNode)) {
+      recursiveMakeJoinAliases(filterNode.not);
+    } else if (isOrEntityFilter(filterNode)) {
+      filterNode.anyOf.forEach(recursiveMakeJoinAliases);
+    } else if (isAndEntityFilter(filterNode)) {
+      filterNode.allOf.forEach(recursiveMakeJoinAliases);
+    } else {
+      const key = filterNode.key.toLowerCase();
+      if (!keyToSearchTableAlias.has(key)) {
+        const alias = `filter_${keyToSearchTableAlias.size}`;
+        keyToSearchTableAlias.set(key, alias);
+        targetQuery.leftOuterJoin({ [alias]: 'search' }, inner =>
+          inner
+            .on(`${alias}.entity_id`, onEntityIdField)
+            .andOnVal(`${alias}.key`, key),
+        );
+      }
+    }
+  }
+  recursiveMakeJoinAliases(filter);
+
+  // Then we traverse the query tree again, this time building up the actual
+  // WHERE query based on values from the aliases above
+  function recursiveBuildQuery(
+    queryBuilder: Knex.QueryBuilder,
+    filterNode: EntityFilter,
+  ) {
+    if (isNegationEntityFilter(filterNode)) {
+      queryBuilder.whereNot(inner =>
+        recursiveBuildQuery(inner, filterNode.not),
+      );
+    } else if (isOrEntityFilter(filterNode)) {
+      // This extra nesting is needed to make sure that the ORs are grouped
+      // separately and not "leak" next to ANDs in the caller's query.
+      queryBuilder.andWhere(inner => {
+        for (const subFilter of filterNode.anyOf) {
+          inner.orWhere(inner2 => recursiveBuildQuery(inner2, subFilter));
+        }
+      });
+    } else if (isAndEntityFilter(filterNode)) {
+      for (const subFilter of filterNode.allOf) {
+        queryBuilder.andWhere(inner => recursiveBuildQuery(inner, subFilter));
+      }
+    } else {
+      const key = filterNode.key.toLowerCase();
+      const values = filterNode.values?.map(v => v.toLowerCase());
+      const column = `${keyToSearchTableAlias.get(key)}.value`;
+      if (!values) {
+        queryBuilder.whereNotNull(column);
+      } else if (values.length === 1) {
+        // Null check needed since NULL = 'string' evaluates to NULL, not FALSE
+        queryBuilder.whereNotNull(column).andWhere(column, values[0]);
+      } else {
+        queryBuilder.whereIn(column, values);
+      }
+    }
+  }
+  recursiveBuildQuery(targetQuery, filter);
+
+  return targetQuery;
+}
+
+// The actual exported function
+export function applyEntityFilterToQuery(options: {
+  filter: EntityFilter;
+  targetQuery: Knex.QueryBuilder;
+  onEntityIdField: string;
+  knex: Knex;
+  strategy?: 'in' | 'join';
+}): Knex.QueryBuilder {
+  const {
+    filter,
+    targetQuery,
+    onEntityIdField,
+    knex,
+    strategy = 'in',
+  } = options;
+  if (strategy === 'in') {
+    return applyInStrategy(filter, targetQuery, onEntityIdField, knex, false);
+  } else if (strategy === 'join') {
+    return applyJoinStrategy(filter, targetQuery, onEntityIdField);
+  }
+  throw new Error(`Unsupported filtering strategy ${strategy}`);
+}
diff --git a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
index f9fc596cb9..85e0d9caa1 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.test.ts
@@ -27,9 +27,7 @@ describe('parseEntityFilterParams', () => {
 
   it('supports single-string format', () => {
     const result = parseEntityFilterParams({ filter: 'a=1' })!;
-    expect(result).toEqual({
-      anyOf: [{ allOf: [{ key: 'a', values: ['1'] }] }],
-    });
+    expect(result).toEqual({ key: 'a', values: ['1'] });
   });
 
   it('supports array-of-strings format', () => {
@@ -38,8 +36,8 @@ describe('parseEntityFilterParams', () => {
     });
     expect(result).toEqual({
       anyOf: [
-        { allOf: [{ key: 'a', values: ['1'] }] },
-        { allOf: [{ key: 'b', values: ['2'] }] },
+        { key: 'a', values: ['1'] },
+        { key: 'b', values: ['2'] },
       ],
     });
   });
@@ -50,7 +48,7 @@ describe('parseEntityFilterParams', () => {
     });
     expect(result).toEqual({
       anyOf: [
-        { allOf: [{ key: 'a', values: ['1'] }] },
+        { key: 'a', values: ['1'] },
         {
           allOf: [
             { key: 'b', values: ['2', '3'] },
diff --git a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
index 8666712f80..aabb24ff3f 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityFilterParams.ts
@@ -36,12 +36,17 @@ export function parseEntityFilterParams(
 
   // Outer array: "any of the inner ones"
   // Inner arrays: "all of these must match"
-  const filters = filterStrings.map(parseEntityFilterString).filter(Boolean);
+  const filters = filterStrings
+    .map(parseEntityFilterString)
+    .filter((r): r is EntitiesSearchFilter[] => Boolean(r));
   if (!filters.length) {
     return undefined;
   }
 
-  return { anyOf: filters.map(f => ({ allOf: f! })) };
+  const outer = filters.map(inner =>
+    inner.length === 1 ? inner[0] : { allOf: inner },
+  );
+  return outer.length === 1 ? outer[0] : { anyOf: outer };
 }
 
 /**
diff --git a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
index 919e97a1f7..aef28c0b32 100644
--- a/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseQueryEntitiesParams.ts
@@ -23,11 +23,10 @@ import { decodeCursor } from '../util';
 import { parseEntityFilterParams } from './parseEntityFilterParams';
 import { parseEntityOrderFieldParams } from './parseEntityOrderFieldParams';
 import { parseEntityTransformParams } from './parseEntityTransformParams';
-import { spec } from '../../schema/openapi.generated';
-import { internal } from '@backstage/backend-openapi-utils';
+import { GetEntitiesByQuery } from '../../schema/openapi';
 
 export function parseQueryEntitiesParams(
-  params: internal.QuerySchema<typeof spec, '/entities/by-query', 'get'>,
+  params: GetEntitiesByQuery['query'],
 ): Omit<QueryEntitiesRequest, 'credentials' | 'limit'> {
   const fields = parseEntityTransformParams(params);
 
diff --git a/plugins/catalog-backend/src/service/util.ts b/plugins/catalog-backend/src/service/util.ts
index 4b041d1a70..c05fb14558 100644
--- a/plugins/catalog-backend/src/service/util.ts
+++ b/plugins/catalog-backend/src/service/util.ts
@@ -15,7 +15,7 @@
  */
 
 import { InputError, NotAllowedError } from '@backstage/errors';
-import { Request } from 'express';
+import { Request, Response } from 'express';
 import lodash from 'lodash';
 import { z } from 'zod';
 import {
@@ -25,6 +25,11 @@ import {
   QueryEntitiesRequest,
 } from '../catalog/types';
 import { EntityFilter } from '@backstage/plugin-catalog-node';
+import {
+  Entity,
+  parseEntityRef,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
 
 export async function requireRequestBody(req: Request): Promise<unknown> {
   const contentType = req.header('content-type');
@@ -138,3 +143,80 @@ export function decodeCursor(encodedCursor: string) {
     throw new InputError(`Malformed cursor: ${e}`);
   }
 }
+
+// TODO(freben): This is added as a compatibility guarantee, until we can be
+// sure that all adopters have re-stitched their entities so that the new
+// targetRef field is present on them, and that they have stopped consuming
+// the now-removed old field
+// TODO(jhaals): Remove this in April 2022
+export function expandLegacyCompoundRelationRefsInResponse(
+  entities: Entity[],
+): void {
+  for (const entity of entities) {
+    if (entity.relations) {
+      for (const relation of entity.relations as any) {
+        if (!relation.targetRef && relation.target) {
+          // This is the case where an old-form entity, not yet stitched with
+          // the updated code, was in the database
+          relation.targetRef = stringifyEntityRef(relation.target);
+        } else if (!relation.target && relation.targetRef) {
+          // This is the case where a new-form entity, stitched with the
+          // updated code, was in the database but we still want to produce
+          // the old data shape as well for compatibility reasons
+          relation.target = parseEntityRef(relation.targetRef);
+        }
+      }
+    }
+  }
+}
+
+export interface EntityArrayJsonStream {
+  send(entities: Entity[]): boolean;
+  complete(): void;
+  close(): void;
+}
+
+// Helps stream Entity[] as a JSON response stream to avoid performance issues
+export function createEntityArrayJsonStream(
+  res: Response,
+): EntityArrayJsonStream {
+  // Imitate the httpRouter behavior of pretty-printing in development
+  const prettyPrint = process.env.NODE_ENV === 'development';
+  let firstSend = true;
+  let completed = false;
+
+  return {
+    send(entities) {
+      if (firstSend) {
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        res.status(200);
+        res.flushHeaders();
+      }
+
+      let data: string;
+      if (prettyPrint) {
+        data = JSON.stringify(entities, null, 2);
+        data = firstSend ? data.slice(0, -2) : `,\n${data.slice(2, -2)}`;
+      } else {
+        data = JSON.stringify(entities);
+        data = firstSend ? data.slice(0, -1) : `,${data.slice(1, -1)}`;
+      }
+
+      firstSend = false;
+      return res.write(data);
+    },
+    complete() {
+      if (firstSend) {
+        res.json([]);
+      } else {
+        res.end(prettyPrint ? '\n]' : ']');
+      }
+      completed = true;
+    },
+    close() {
+      if (!completed) {
+        res.end();
+      }
+    },
+  };
+}
diff --git a/plugins/catalog-backend/src/stitching/progressTracker.ts b/plugins/catalog-backend/src/stitching/progressTracker.ts
index 8c305b4978..9e00a1a01b 100644
--- a/plugins/catalog-backend/src/stitching/progressTracker.ts
+++ b/plugins/catalog-backend/src/stitching/progressTracker.ts
@@ -54,8 +54,7 @@ export function progressTracker(knex: Knex, logger: LoggerService) {
   stitchingQueueCount.addCallback(async result => {
     const total = await knex<DbRefreshStateRow>('refresh_state')
       .count({ count: '*' })
-      .whereNotNull('next_stitch_at')
-      .where('next_stitch_at', '<=', knex.fn.now());
+      .whereNotNull('next_stitch_at');
     result.observe(Number(total[0].count));
   });
 
diff --git a/plugins/catalog-backend/src/stitching/types.ts b/plugins/catalog-backend/src/stitching/types.ts
index 7064dd1a1c..bbb6223968 100644
--- a/plugins/catalog-backend/src/stitching/types.ts
+++ b/plugins/catalog-backend/src/stitching/types.ts
@@ -70,15 +70,12 @@ export function stitchingStrategyFromConfig(config: Config): StitchingStrategy {
     const stitchTimeoutKey = 'catalog.stitchingStrategy.stitchTimeout';
 
     const pollingInterval = config.has(pollingIntervalKey)
-      ? readDurationFromConfig(config, {
-          key: pollingIntervalKey,
-        })
+      ? readDurationFromConfig(config, { key: pollingIntervalKey })
       : { seconds: 1 };
     const stitchTimeout = config.has(stitchTimeoutKey)
-      ? readDurationFromConfig(config, {
-          key: stitchTimeoutKey,
-        })
+      ? readDurationFromConfig(config, { key: stitchTimeoutKey })
       : { seconds: 60 };
+
     return {
       mode: 'deferred',
       pollingInterval: pollingInterval,
diff --git a/plugins/catalog-backend/src/tests/integration.test.ts b/plugins/catalog-backend/src/tests/integration.test.ts
index d278fb4f0a..737bb107ca 100644
--- a/plugins/catalog-backend/src/tests/integration.test.ts
+++ b/plugins/catalog-backend/src/tests/integration.test.ts
@@ -442,7 +442,6 @@ describe('Catalog Backend Integration', () => {
                 cause: {
                   name: 'Error',
                   message: 'NOPE',
-                  stack: expect.stringMatching(/^Error: NOPE/),
                 },
               },
             },
diff --git a/plugins/catalog-backend/src/tests/migrations.test.ts b/plugins/catalog-backend/src/tests/migrations.test.ts
index 873746ac2b..bb840f7a21 100644
--- a/plugins/catalog-backend/src/tests/migrations.test.ts
+++ b/plugins/catalog-backend/src/tests/migrations.test.ts
@@ -93,6 +93,7 @@ describe('migrations', () => {
           hash: 'h',
           stitch_ticket: '',
           final_entity: '{}',
+          entity_ref: 'k:ns/n1',
         })
         .into('final_entities');
 
@@ -395,4 +396,129 @@ describe('migrations', () => {
       await knex.destroy();
     },
   );
+
+  it.each(databases.eachSupportedId())(
+    '20241024104700_add_entity_ref_to_final_entities.js, %p',
+    async databaseId => {
+      const knex = await databases.init(databaseId);
+
+      await migrateUntilBefore(
+        knex,
+        '20241024104700_add_entity_ref_to_final_entities.js',
+      );
+
+      await knex
+        .insert({
+          entity_id: 'id1',
+          entity_ref: 'k:ns/n',
+          unprocessed_entity: '{}',
+          processed_entity: '{}',
+          errors: '[]',
+          next_update_at: knex.fn.now(),
+          last_discovery_at: knex.fn.now(),
+        })
+        .into('refresh_state');
+      await knex
+        .insert({
+          entity_id: 'id2',
+          entity_ref: 'k:ns/n2',
+          unprocessed_entity: '{}',
+          processed_entity: '{}',
+          errors: '[]',
+          next_update_at: knex.fn.now(),
+          last_discovery_at: knex.fn.now(),
+        })
+        .into('refresh_state');
+
+      // Insert a simple entity before the migration
+      await knex
+        .insert({
+          entity_id: 'id1',
+          hash: '3f5a4d6ba8507be297bb7cd87c4b55b63e3f4c14',
+          stitch_ticket: '52367ed7-120b-405f-b7e0-cdd90f956312',
+          final_entity: '{}',
+        })
+        .into('final_entities');
+
+      // verify that the entity_ref column is not present
+      const preColumnInfo = await knex('final_entities').columnInfo();
+      expect(preColumnInfo.entity_ref).toBeUndefined();
+
+      await migrateUpOnce(knex);
+
+      // verify that the entity_ref column has been added
+      const afterColumnInfo = await knex('final_entities').columnInfo();
+      expect(afterColumnInfo.entity_ref).not.toBeUndefined();
+
+      // verify that the contents of the entity_ref column are correct
+      await expect(knex('final_entities')).resolves.toEqual(
+        expect.arrayContaining([
+          {
+            entity_id: 'id1',
+            hash: '3f5a4d6ba8507be297bb7cd87c4b55b63e3f4c14',
+            stitch_ticket: '52367ed7-120b-405f-b7e0-cdd90f956312',
+            final_entity: '{}',
+            entity_ref: 'k:ns/n',
+            last_updated_at: null,
+          },
+        ]),
+      );
+
+      // Verify that duplicates of entity_ref are not allowed. We lie about the
+      // ref to make it easier to trigger the problem. Also using a weak
+      // expectation due to sqlite flakiness; it rejects, but not necessarily
+      // with a valid error.
+      await expect(
+        knex
+          .insert({
+            entity_id: 'id2',
+            entity_ref: 'k:ns/n',
+            hash: 'other',
+            stitch_ticket: 'other',
+            final_entity: '{}',
+          })
+          .into('final_entities'),
+      ).rejects.toEqual(expect.anything());
+
+      await migrateDownOnce(knex);
+
+      // verify that the entity_ref column has been removed
+      const revertedColumnInfo = await knex('final_entities').columnInfo();
+      expect(revertedColumnInfo.entity_ref).toBeUndefined();
+
+      // verify that the contents are correct
+      await expect(knex('final_entities')).resolves.toEqual(
+        expect.arrayContaining([
+          {
+            entity_id: 'id1',
+            hash: '3f5a4d6ba8507be297bb7cd87c4b55b63e3f4c14',
+            stitch_ticket: '52367ed7-120b-405f-b7e0-cdd90f956312',
+            final_entity: '{}',
+            last_updated_at: null,
+          },
+        ]),
+      );
+
+      await knex.destroy();
+    },
+  );
+
+  it.each(databases.eachSupportedId())(
+    '20241111000000_drop_redundant_indices.js, %p',
+    async databaseId => {
+      const knex = await databases.init(databaseId);
+
+      await migrateUntilBefore(
+        knex,
+        '20241111000000_drop_redundant_indices.js',
+      );
+
+      await migrateUpOnce(knex);
+
+      await migrateDownOnce(knex);
+
+      expect(true).toBe(true);
+      await knex.destroy();
+    },
+  );
 });
diff --git a/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts
index 47fd664b71..9d1bb8d80a 100644
--- a/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts
+++ b/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts
@@ -14,133 +14,208 @@
  * limitations under the License.
  */
 
-import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
-import { startTestBackend, TestDatabases } from '@backstage/backend-test-utils';
-import { applyDatabaseMigrations } from '../../database/migrations';
+import { createBackendModule } from '@backstage/backend-plugin-api';
+import {
+  TestDatabases,
+  mockServices,
+  startTestBackend,
+} from '@backstage/backend-test-utils';
+import {
+  CatalogApi,
+  CatalogClient,
+  GetEntitiesResponse,
+} from '@backstage/catalog-client';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
+import { Knex } from 'knex';
+import { default as catalogPlugin } from '../..';
 import {
   SyntheticLoadEntitiesProcessor,
   SyntheticLoadEntitiesProvider,
   SyntheticLoadOptions,
 } from './lib/catalogModuleSyntheticLoadEntities';
-import { CatalogClient } from '@backstage/catalog-client';
-import {
-  coreServices,
-  createBackendModule,
-  createServiceFactory,
-} from '@backstage/backend-plugin-api';
-import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-import { Knex } from 'knex';
+import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
+
+// #region Helpers
 
 jest.setTimeout(600_000);
 
+const databases = TestDatabases.create({
+  ids: [/* 'MYSQL_8', */ 'POSTGRES_16', /* 'POSTGRES_12',*/ 'SQLITE_3'],
+  disableDocker: false,
+});
+
 const traceLog: typeof console.log = performanceTraceEnabled
   ? console.log
   : () => {};
 
-const completionPolling = async (load: SyntheticLoadOptions, knex: Knex) => {
-  const { baseEntitiesCount, childrenCount } = load;
-  const expectedTotal = baseEntitiesCount + baseEntitiesCount * childrenCount;
+async function createBackend(
+  knex: Knex,
+  load: SyntheticLoadOptions,
+): Promise<{
+  client: CatalogApi;
+  numberOfEntities: number;
+  stop: () => Promise<void>;
+}> {
+  const numberOfEntities =
+    load.baseEntitiesCount + load.baseEntitiesCount * load.childrenCount;
 
-  return new Promise<void>((resolve, reject) => {
-    const interval = setInterval(async () => {
-      try {
-        const stitchedCount = await knex('final_entities')
-          .count({ count: '*' })
-          .whereNotNull('final_entity')
-          .then(rows => Number(rows[0].count));
+  traceLog(`Creating test backend with ${numberOfEntities} entities`);
 
-        if (stitchedCount === expectedTotal) {
-          clearInterval(interval);
-          resolve();
-        }
-      } catch (error) {
-        clearInterval(interval);
-        reject(error);
-      }
-    }, 1000);
-  });
-};
-
-describePerformanceTest('getEntitiesPerformanceTest', () => {
-  const databases = TestDatabases.create({
-    ids: [/* 'MYSQL_8', */ 'POSTGRES_16', /* 'POSTGRES_12',*/ 'SQLITE_3'],
-    disableDocker: false,
+  const backend = await startTestBackend({
+    features: [
+      catalogPlugin,
+      mockServices.database.factory({ knex }),
+      createBackendModule({
+        pluginId: 'catalog',
+        moduleId: 'synthetic-load-entities',
+        register(reg) {
+          reg.registerInit({
+            deps: {
+              catalog: catalogProcessingExtensionPoint,
+            },
+            async init({ catalog }) {
+              catalog.addEntityProvider(
+                new SyntheticLoadEntitiesProvider(load, {}),
+              );
+              catalog.addProcessor(new SyntheticLoadEntitiesProcessor(load));
+            },
+          });
+        },
+      }),
+    ],
   });
 
-  it.each(databases.eachSupportedId())(
-    'fetch entities, %p',
-    async databaseId => {
-      const knex = await databases.init(databaseId);
-      await applyDatabaseMigrations(knex);
+  while (
+    (await knex('final_entities')
+      .count({ count: '*' })
+      .whereNotNull('final_entity')
+      .then(rows => Number(rows[0].count))) !== numberOfEntities
+  ) {
+    await new Promise(resolve => setTimeout(resolve, 200));
+  }
 
-      const load: SyntheticLoadOptions = {
+  const client = new CatalogClient({
+    discoveryApi: {
+      getBaseUrl: jest
+        .fn()
+        .mockResolvedValue(
+          `http://localhost:${backend.server.port()}/api/catalog`,
+        ),
+    },
+  });
+
+  return {
+    client,
+    numberOfEntities,
+    stop: backend.stop.bind(backend),
+  };
+}
+
+// #endregion
+// #region Tests
+
+describePerformanceTest('getEntities', () => {
+  let knex: Knex;
+  let backend: Awaited<ReturnType<typeof createBackend>>;
+
+  describe.each(databases.eachSupportedId())('burst reads, %p', databaseId => {
+    beforeAll(async () => {
+      knex = await databases.init(databaseId);
+      backend = await createBackend(knex, {
         baseEntitiesCount: 2000,
         baseRelationsCount: 3,
         baseRelationsSkew: 0.3,
         childrenCount: 3,
-      };
-
-      traceLog('Starting test backend');
-
-      const backend = await startTestBackend({
-        features: [
-          import('@backstage/plugin-catalog-backend/alpha'),
-          createServiceFactory({
-            service: coreServices.database,
-            deps: {},
-            factory: () => ({ getClient: async () => knex }),
-          }),
-          createBackendModule({
-            pluginId: 'catalog',
-            moduleId: 'synthetic-load-entities',
-            register(reg) {
-              reg.registerInit({
-                deps: {
-                  catalog: catalogProcessingExtensionPoint,
-                },
-                async init({ catalog }) {
-                  catalog.addEntityProvider(
-                    new SyntheticLoadEntitiesProvider(load, {}),
-                  );
-                  catalog.addProcessor(
-                    new SyntheticLoadEntitiesProcessor(load),
-                  );
-                },
-              });
-            },
-          }),
-        ],
       });
+    });
 
-      const expectedTotal =
-        load.baseEntitiesCount + load.baseEntitiesCount * load.childrenCount;
-      traceLog(`Waiting for completion polling of ${expectedTotal} entities`);
-
-      await expect(completionPolling(load, knex)).resolves.toBeUndefined();
-
-      const client = new CatalogClient({
-        discoveryApi: {
-          getBaseUrl: jest
-            .fn()
-            .mockResolvedValue(
-              `http://localhost:${backend.server.port()}/api/catalog`,
-            ),
-        },
-      });
-      const start = Date.now();
-      traceLog(`[${databaseId}] Starting to fetch ${expectedTotal} entities`);
-
-      // Fetch all entities
-      const response = await client.getEntities();
-      expect(response.items).toHaveLength(expectedTotal);
-
-      const fetchDuration = Date.now() - start;
-      traceLog(
-        `[${databaseId}] Fetched ${expectedTotal} entities in ${fetchDuration}ms`,
-      );
-
+    afterAll(async () => {
       await backend.stop();
       await knex.destroy();
-    },
-  );
+    });
+
+    it('does a large burst read', async () => {
+      let response;
+      for (let i = 0; i < 10; ++i) {
+        response = await backend.client.getEntities();
+      }
+      expect(response!.items).toHaveLength(backend.numberOfEntities);
+    });
+  });
+
+  describe.each(databases.eachSupportedId())('filtering, %p', databaseId => {
+    beforeAll(async () => {
+      knex = await databases.init(databaseId);
+      backend = await createBackend(knex, {
+        baseEntitiesCount: 20000,
+        baseRelationsCount: 0,
+        baseRelationsSkew: 0,
+        childrenCount: 0,
+      });
+    });
+
+    afterAll(async () => {
+      await backend.stop();
+      await knex.destroy();
+    });
+
+    it('single matching filter, all fields', async () => {
+      let response: GetEntitiesResponse;
+      for (let i = 0; i < 20; ++i) {
+        response = await backend.client.getEntities({
+          filter: { kind: 'Location' },
+        });
+      }
+      expect(response!.items).toHaveLength(backend.numberOfEntities);
+    });
+
+    it('single matching filter, one field', async () => {
+      let response: GetEntitiesResponse;
+      for (let i = 0; i < 20; ++i) {
+        response = await backend.client.getEntities({
+          filter: { kind: 'Location' },
+          fields: ['kind'],
+        });
+      }
+      expect(response!.items).toHaveLength(backend.numberOfEntities);
+    });
+
+    it('single non-matching filter', async () => {
+      let response: GetEntitiesResponse;
+      for (let i = 0; i < 20; ++i) {
+        response = await backend.client.getEntities({
+          filter: { kind: 'NotALocation' },
+        });
+      }
+      expect(response!.items).toHaveLength(0);
+    });
+
+    it('complex filter, all fields', async () => {
+      let response: GetEntitiesResponse;
+      for (let i = 0; i < 20; ++i) {
+        response = await backend.client.getEntities({
+          filter: [
+            {
+              kind: 'Location',
+            },
+            {
+              kind: 'Location',
+              'metadata.name': new Array(100)
+                .fill(0)
+                .map((_, j) => `synthetic-${j}`),
+            },
+            ...new Array(10).fill(0).map((_, j) => ({
+              kind: 'NotALocation',
+              'metadata.name': new Array(10)
+                .fill(0)
+                .map((__, k) => `no-match-${i}-${j}-${k}`),
+            })),
+          ],
+        });
+      }
+      expect(response!.items).toHaveLength(backend.numberOfEntities);
+    });
+  });
 });
+
+// #endregion
diff --git a/plugins/catalog-backend/src/tests/performance/getProcessableEntitiesPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/getProcessableEntitiesPerformance.test.ts
new file mode 100644
index 0000000000..8218ae82cc
--- /dev/null
+++ b/plugins/catalog-backend/src/tests/performance/getProcessableEntitiesPerformance.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TestDatabases, mockServices } from '@backstage/backend-test-utils';
+import { Knex } from 'knex';
+import { DefaultProcessingDatabase } from '../../database/DefaultProcessingDatabase';
+import { applyDatabaseMigrations } from '../../database/migrations';
+import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
+
+// #region Helpers
+
+jest.setTimeout(600_000);
+
+const databases = TestDatabases.create({
+  ids: [/* 'MYSQL_8', */ 'POSTGRES_16', /* 'POSTGRES_12',*/ 'SQLITE_3'],
+  disableDocker: false,
+});
+
+const traceLog: typeof console.log = performanceTraceEnabled
+  ? console.log
+  : () => {};
+
+async function setupDatabase(knex: Knex): Promise<void> {
+  await applyDatabaseMigrations(knex);
+
+  traceLog(`Creating test dataset`);
+
+  const now = knex.fn.now();
+  const largeEntity = `"${'x'.repeat(3 * 1024)}"`;
+
+  for (let i = 0; i < 100; ++i) {
+    await knex.batchInsert(
+      'refresh_state',
+      new Array(100).fill(null).map((_, j) => ({
+        entity_id: `id-${i}-${j}`,
+        entity_ref: `entity-${i}-${j}`,
+        unprocessed_entity: largeEntity,
+        processed_entity: largeEntity,
+        errors: '{}',
+        next_update_at: now,
+        last_discovery_at: now,
+      })),
+    );
+  }
+}
+
+// #endregion
+// #region Tests
+
+describePerformanceTest('getProcessableEntities', () => {
+  let knex: Knex;
+
+  describe.each(databases.eachSupportedId())('%p', databaseId => {
+    beforeAll(async () => {
+      knex = await databases.init(databaseId);
+      await setupDatabase(knex);
+    });
+
+    afterAll(async () => {
+      await knex.destroy();
+    });
+
+    it.each([2, 5, 10])(
+      'reads as fast as possible, batch size %p',
+      async processBatchSize => {
+        const sut = new DefaultProcessingDatabase({
+          database: knex,
+          logger: mockServices.logger.mock(),
+          refreshInterval: () => 0,
+        });
+
+        const start = Date.now();
+        let total = 0;
+        while (total < 10000) {
+          const result = await sut.getProcessableEntities(knex, {
+            processBatchSize,
+          });
+          total += result.items.length;
+        }
+
+        const perSecond = Math.round(total / ((Date.now() - start) / 1000));
+        traceLog(
+          `${databaseId} processed ${perSecond} entities per second at a batch size of ${processBatchSize}`,
+        );
+
+        expect(true).toBe(true);
+      },
+    );
+  });
+});
+
+// #endregion
diff --git a/plugins/catalog-backend/src/tests/performance/providerDeltaMutations.test.ts b/plugins/catalog-backend/src/tests/performance/providerDeltaMutations.test.ts
new file mode 100644
index 0000000000..6e95c2535a
--- /dev/null
+++ b/plugins/catalog-backend/src/tests/performance/providerDeltaMutations.test.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TestDatabases, mockServices } from '@backstage/backend-test-utils';
+import { Knex } from 'knex';
+import { applyDatabaseMigrations } from '../../database/migrations';
+import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
+import { DefaultProviderDatabase } from '../../database/DefaultProviderDatabase';
+import { DeferredEntity } from '@backstage/plugin-catalog-node';
+
+// #region Helpers
+
+jest.setTimeout(600_000);
+
+const databases = TestDatabases.create({
+  ids: [/* 'MYSQL_8', */ 'POSTGRES_16', /* 'POSTGRES_12',*/ 'SQLITE_3'],
+  disableDocker: false,
+});
+
+const traceLog: typeof console.log = performanceTraceEnabled
+  ? console.log
+  : () => {};
+
+// #endregion
+// #region Tests
+
+describePerformanceTest('providerDeltaMutations', () => {
+  let knex: Knex;
+
+  describe.each(databases.eachSupportedId())('%p', databaseId => {
+    beforeAll(async () => {
+      knex = await databases.init(databaseId);
+      await applyDatabaseMigrations(knex);
+    });
+
+    afterAll(async () => {
+      await knex.destroy();
+    });
+
+    it.each([200, 50_000])(
+      'inserts and then overwrites identical sets using delta mutations, batch size %p',
+      async batchSize => {
+        const sut = new DefaultProviderDatabase({
+          database: knex,
+          logger: mockServices.logger.mock(),
+        });
+
+        const sourceKey = 'source-key';
+        const entities: DeferredEntity[] = Array.from(
+          { length: batchSize },
+          (_, i) => ({
+            entity: {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Component',
+              metadata: {
+                name: `component-${i}`,
+                namespace: 'default',
+              },
+              spec: {
+                type: 'service',
+                lifecycle: 'production',
+              },
+            },
+          }),
+        );
+
+        let start = Date.now();
+        await sut.replaceUnprocessedEntities(knex, {
+          type: 'delta',
+          sourceKey,
+          added: entities,
+          removed: [],
+        });
+        let perSecond = Math.round(batchSize / ((Date.now() - start) / 1000));
+        traceLog(
+          `${databaseId} inserted ${perSecond} entities per second at a batch size of ${batchSize}`,
+        );
+
+        start = Date.now();
+        const rounds = 20;
+        for (let i = 0; i < rounds; i++) {
+          await sut.replaceUnprocessedEntities(knex, {
+            type: 'delta',
+            sourceKey,
+            added: entities,
+            removed: [],
+          });
+        }
+        perSecond = Math.round(
+          (batchSize * rounds) / ((Date.now() - start) / 1000),
+        );
+        traceLog(
+          `${databaseId} updated ${perSecond} entities per second at a batch size of ${batchSize}`,
+        );
+
+        expect(true).toBe(true);
+      },
+    );
+  });
+});
+
+// #endregion
diff --git a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
index e0d3f87124..a4d843649e 100644
--- a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
+++ b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
+import { createBackendModule } from '@backstage/backend-plugin-api';
 import {
-  coreServices,
-  createBackendModule,
-  createServiceFactory,
-} from '@backstage/backend-plugin-api';
-import {
+  TestDatabases,
   mockServices,
   startTestBackend,
-  TestDatabases,
 } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
+import { createDeferred } from '@backstage/types';
 import { Knex } from 'knex';
+import { default as catalogPlugin } from '../..';
 import { applyDatabaseMigrations } from '../../database/migrations';
 import {
   SyntheticLoadEntitiesProcessor,
@@ -37,16 +35,6 @@ import { describePerformanceTest, performanceTraceEnabled } from './lib/env';
 
 jest.setTimeout(600_000);
 
-function defer<T>() {
-  let resolve: (value: T | PromiseLike<T>) => void;
-  let reject: (error?: unknown) => void;
-  const promise = new Promise<T>((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  return { promise, resolve: resolve!, reject: reject! };
-}
-
 const traceLog: typeof console.log = performanceTraceEnabled
   ? console.log
   : () => {};
@@ -54,7 +42,7 @@ const traceLog: typeof console.log = performanceTraceEnabled
 class Tracker {
   private insertBaseEntitiesStart: number | undefined;
   private insertBaseEntitiesEnd: number | undefined;
-  private readonly deferred = defer<void>();
+  private readonly deferred = createDeferred();
 
   constructor(
     private readonly knex: Knex,
@@ -97,7 +85,7 @@ class Tracker {
   }
 
   async completion(): Promise<void> {
-    return this.deferred.promise;
+    return this.deferred;
   }
 
   private completionPolling() {
@@ -180,13 +168,9 @@ describePerformanceTest('stitchingPerformance', () => {
 
       const backend = await startTestBackend({
         features: [
-          import('@backstage/plugin-catalog-backend/alpha'),
+          catalogPlugin,
           mockServices.rootConfig.factory({ data: config }),
-          createServiceFactory({
-            service: coreServices.database,
-            deps: {},
-            factory: () => ({ getClient: async () => knex }),
-          }),
+          mockServices.database.factory({ knex }),
           createBackendModule({
             pluginId: 'catalog',
             moduleId: 'synthetic-load-entities',
@@ -237,13 +221,9 @@ describePerformanceTest('stitchingPerformance', () => {
 
       const backend = await startTestBackend({
         features: [
-          import('@backstage/plugin-catalog-backend/alpha'),
+          import('@backstage/plugin-catalog-backend'),
           mockServices.rootConfig.factory({ data: config }),
-          createServiceFactory({
-            service: coreServices.database,
-            deps: {},
-            factory: () => ({ getClient: async () => knex }),
-          }),
+          mockServices.database.factory({ knex }),
           createBackendModule({
             pluginId: 'catalog',
             moduleId: 'synthetic-load-entities',
diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md
index ca71821feb..21f0f63e42 100644
--- a/plugins/catalog-common/CHANGELOG.md
+++ b/plugins/catalog-common/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-common
 
+## 1.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 1.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-search-common@1.2.15
+
 ## 1.1.0
 
 ### Minor Changes
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 6e69dd0ef8..c7ba0aba6e 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-common",
-  "version": "1.1.0",
+  "version": "1.1.2-next.0",
   "description": "Common functionalities for the catalog plugin",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index 48aaebab8f..90cb575797 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,117 @@
 # @backstage/plugin-catalog-graph
 
+## 0.4.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+
+## 0.4.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+
+## 0.4.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+
+## 0.4.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## 0.4.12-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+
+## 0.4.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+
+## 0.4.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.4.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
 ## 0.4.11
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/README.md b/plugins/catalog-graph/README.md
index 0862abbc96..b9400e8e8b 100644
--- a/plugins/catalog-graph/README.md
+++ b/plugins/catalog-graph/README.md
@@ -137,6 +137,20 @@ return (
 );
 ```
 
+Once you have your custom implementation, you can follow these steps to modify the required components:
+
+- In the `app.tsx` update the `CatalogGraphPage` component to include your custom styles:
+
+```tsx
+<Route path=“/catalog-graph” element={<CatalogGraphPage renderNode={MyCustomRenderNode} />} />
+```
+
+- In the `Entity.tsx` file, update the `EntityCatalogGraphCard` component to this:
+
+```tsx
+<EntityCatalogGraphCard variant=“gridItem” renderNode={MyCustomRenderNode} height={400} />
+```
+
 ## Development
 
 Run `yarn` in the root of this plugin to install all dependencies and then `yarn start` to run a [development version](./dev/index.tsx) of this plugin.
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 2b3401785f..aa7649e01f 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graph",
-  "version": "0.4.11",
+  "version": "0.4.14-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-graph",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index 1fb61e3680..323aaa0803 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,151 @@
 # @backstage/plugin-catalog-import
 
+## 0.12.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.12.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.12.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.12.6
+
+### Patch Changes
+
+- ea5b7f3: Fixed parsing of catalog-info.yaml when creating a PR to register a repository if the file contains more than one document
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.12.6-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.12.6-next.2
+
+### Patch Changes
+
+- ea5b7f3: Fixed parsing of catalog-info.yaml when creating a PR to register a repository if the file contains more than one document
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.12.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.12.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
 ## 0.12.5
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 73653c8e39..42929d872d 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.12.5",
+  "version": "0.12.8-next.2",
   "description": "A Backstage plugin the helps you import entities into your catalog",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md
index 1706404b94..c13f7a1a4a 100644
--- a/plugins/catalog-import/report-alpha.api.md
+++ b/plugins/catalog-import/report-alpha.api.md
@@ -18,21 +18,6 @@ const _default: FrontendPlugin<
   },
   {},
   {
-    'api:catalog-import': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'page:catalog-import': ExtensionDefinition<{
       kind: 'page';
       name: undefined;
@@ -63,6 +48,21 @@ const _default: FrontendPlugin<
         routeRef?: RouteRef<AnyRouteRefParams> | undefined;
       };
     }>;
+    'api:catalog-import': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
   }
 >;
 export default _default;
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.test.ts b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
index fb78066ac0..4c61d4f6a0 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.test.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
@@ -61,12 +61,12 @@ import { MockFetchApi, registerMswTestHooks } from '@backstage/test-utils';
 import { Octokit } from '@octokit/rest';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { CatalogImportClient } from './CatalogImportClient';
 import {
   AzurePrOptions,
   AzurePrResult,
   createAzurePullRequest,
 } from './AzureRepoApiClient';
+import { CatalogImportClient } from './CatalogImportClient';
 
 describe('CatalogImportClient', () => {
   const server = setupServer();
@@ -775,6 +775,75 @@ describe('CatalogImportClient', () => {
         }),
       );
     });
+    it('should create GitHub pull request and validate all documents inside the YAML file', async () => {
+      catalogApi.validateEntity.mockResolvedValue({
+        valid: true,
+      });
+      await expect(
+        catalogImportClient.submitPullRequest({
+          repositoryUrl: 'https://github.com/backstage/backstage',
+          fileContent: `apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: reg-graphql-shopping
+  annotations:
+    github.com/project-slug: tkww/reg-graphql-shopping
+    backstage.io/techdocs-ref: dir:.
+spec:
+  type: service
+  lifecycle: production
+  owner: registry-pandora
+  system: system
+---
+
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: system
+spec:
+  owner: registry-pandora
+  lifecycle: production
+`,
+          title: 'A title/message',
+          body: 'A body',
+        }),
+      ).resolves.toEqual({
+        link: 'http://pull/request/0',
+        location:
+          'https://github.com/backstage/backstage/blob/main/catalog-info.yaml',
+      });
+      expect(catalogApi.validateEntity).toHaveBeenCalledTimes(2);
+      expect(
+        (new Octokit().git.createRef as any as jest.Mock).mock.calls[0][0],
+      ).toEqual({
+        owner: 'backstage',
+        repo: 'backstage',
+        ref: 'refs/heads/backstage-integration',
+        sha: 'any',
+      });
+      expect(
+        (new Octokit().repos.createOrUpdateFileContents as any as jest.Mock)
+          .mock.calls[0][0],
+      ).toEqual({
+        owner: 'backstage',
+        repo: 'backstage',
+        path: 'catalog-info.yaml',
+        message: 'A title/message',
+        content:
+          'YXBpVmVyc2lvbjogYmFja3N0YWdlLmlvL3YxYWxwaGExCmtpbmQ6IENvbXBvbmVudAptZXRhZGF0YToKICBuYW1lOiByZWctZ3JhcGhxbC1zaG9wcGluZwogIGFubm90YXRpb25zOgogICAgZ2l0aHViLmNvbS9wcm9qZWN0LXNsdWc6IHRrd3cvcmVnLWdyYXBocWwtc2hvcHBpbmcKICAgIGJhY2tzdGFnZS5pby90ZWNoZG9jcy1yZWY6IGRpcjouCnNwZWM6CiAgdHlwZTogc2VydmljZQogIGxpZmVjeWNsZTogcHJvZHVjdGlvbgogIG93bmVyOiByZWdpc3RyeS1wYW5kb3JhCiAgc3lzdGVtOiBzeXN0ZW0KLS0tCgphcGlWZXJzaW9uOiBiYWNrc3RhZ2UuaW8vdjFhbHBoYTEKa2luZDogU3lzdGVtCm1ldGFkYXRhOgogIG5hbWU6IHN5c3RlbQpzcGVjOgogIG93bmVyOiByZWdpc3RyeS1wYW5kb3JhCiAgbGlmZWN5Y2xlOiBwcm9kdWN0aW9uCg==',
+        branch: 'backstage-integration',
+      });
+      expect(
+        (new Octokit().pulls.create as any as jest.Mock).mock.calls[0][0],
+      ).toEqual({
+        owner: 'backstage',
+        repo: 'backstage',
+        title: 'A title/message',
+        head: 'backstage-integration',
+        body: 'A body',
+        base: 'main',
+      });
+    });
   });
 
   describe('preparePullRequest', () => {
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts
index 78e54ac98c..0cd1268522 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.ts
@@ -174,14 +174,17 @@ the component will become available.\n\nFor more information, read an \
     body: string;
   }): Promise<{ link: string; location: string }> {
     const { repositoryUrl, fileContent, title, body } = options;
-    const parseData = YAML.parse(fileContent);
 
-    const validationResponse = await this.catalogApi.validateEntity(
-      parseData,
-      `url:${repositoryUrl}`,
-    );
-    if (!validationResponse.valid) {
-      throw new Error(validationResponse.errors[0].message);
+    const parseData = YAML.parseAllDocuments(fileContent);
+
+    for (const document of parseData) {
+      const validationResponse = await this.catalogApi.validateEntity(
+        document.toJS(),
+        `url:${repositoryUrl}`,
+      );
+      if (!validationResponse.valid) {
+        throw new Error(validationResponse.errors[0].message);
+      }
     }
 
     const provider = this.scmIntegrationsApi.byUrl(repositoryUrl);
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 947a878f25..a0c09fdc48 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,119 @@
 # @backstage/plugin-catalog-node
 
+## 1.15.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.15.0-next.1
+
+### Minor Changes
+
+- 8edc4cd: Updated the `catalogServiceMock` return type to match both `CatalogService` and `CatalogApi`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## 1.14.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 1.14.0
+
+### Minor Changes
+
+- bc13b42: The `catalogServiceRef` now has its own accompanying `CatalogService` interface that requires Backstage `credentials` objects to be passed. This new version of the `catalogServiceRef` has been promoted and is now available via the main `@backstage/plugin-catalog-node` entry point.
+
+  The old `catalogServiceRef` with the old `CatalogApi` type is still available from the `/alpha` entry point.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-node@0.8.5
+
+## 1.14.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 1.14.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 1.14.0-next.0
+
+### Minor Changes
+
+- bc13b42: The `catalogServiceRef` now has its own accompanying `CatalogService` interface that requires Backstage `credentials` objects to be passed. This new version of the `catalogServiceRef` has been promoted and is now available via the main `@backstage/plugin-catalog-node` entry point.
+
+  The old `catalogServiceRef` with the old `CatalogApi` type is still available from the `/alpha` entry point.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 1.13.1
 
 ### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 351b0cd58b..fbcdc1d95a 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-node",
-  "version": "1.13.1",
+  "version": "1.15.0-next.2",
   "description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
   "backstage": {
     "role": "node-library",
@@ -71,6 +71,7 @@
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
-    "@backstage/cli": "workspace:^"
+    "@backstage/cli": "workspace:^",
+    "msw": "^1.0.0"
   }
 }
diff --git a/plugins/catalog-node/report-alpha.api.md b/plugins/catalog-node/report-alpha.api.md
index ba02079ceb..044bc14de3 100644
--- a/plugins/catalog-node/report-alpha.api.md
+++ b/plugins/catalog-node/report-alpha.api.md
@@ -95,7 +95,7 @@ export interface CatalogProcessingExtensionPoint {
 // @alpha (undocumented)
 export const catalogProcessingExtensionPoint: ExtensionPoint<CatalogProcessingExtensionPoint>;
 
-// @alpha
+// @alpha @deprecated (undocumented)
 export const catalogServiceRef: ServiceRef<CatalogApi, 'plugin', 'singleton'>;
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/catalog-node/report-testUtils.api.md b/plugins/catalog-node/report-testUtils.api.md
index ec50d835be..35dee113c0 100644
--- a/plugins/catalog-node/report-testUtils.api.md
+++ b/plugins/catalog-node/report-testUtils.api.md
@@ -3,23 +3,116 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { AddLocationRequest } from '@backstage/catalog-client';
+import { AddLocationResponse } from '@backstage/catalog-client';
 import { CatalogApi } from '@backstage/catalog-client';
+import { CatalogRequestOptions } from '@backstage/catalog-client';
+import { CatalogService } from '@backstage/plugin-catalog-node';
+import { CatalogServiceRequestOptions } from '@backstage/plugin-catalog-node';
+import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Entity } from '@backstage/catalog-model';
+import { GetEntitiesByRefsRequest } from '@backstage/catalog-client';
+import { GetEntitiesByRefsResponse } from '@backstage/catalog-client';
+import { GetEntitiesRequest } from '@backstage/catalog-client';
+import { GetEntitiesResponse } from '@backstage/catalog-client';
+import { GetEntityAncestorsRequest } from '@backstage/catalog-client';
+import { GetEntityAncestorsResponse } from '@backstage/catalog-client';
+import { GetEntityFacetsRequest } from '@backstage/catalog-client';
+import { GetEntityFacetsResponse } from '@backstage/catalog-client';
+import { Location as Location_2 } from '@backstage/catalog-client';
+import { QueryEntitiesRequest } from '@backstage/catalog-client';
+import { QueryEntitiesResponse } from '@backstage/catalog-client';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 import { ServiceMock } from '@backstage/backend-test-utils';
+import { ValidateEntityResponse } from '@backstage/catalog-client';
+
+// @public
+export interface CatalogServiceMock extends CatalogService, CatalogApi {
+  // (undocumented)
+  addLocation(
+    location: AddLocationRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<AddLocationResponse>;
+  // (undocumented)
+  getEntities(
+    request?: GetEntitiesRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntitiesResponse>;
+  // (undocumented)
+  getEntitiesByRefs(
+    request: GetEntitiesByRefsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntitiesByRefsResponse>;
+  // (undocumented)
+  getEntityAncestors(
+    request: GetEntityAncestorsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntityAncestorsResponse>;
+  // (undocumented)
+  getEntityByRef(
+    entityRef: string | CompoundEntityRef,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Entity | undefined>;
+  // (undocumented)
+  getEntityFacets(
+    request: GetEntityFacetsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntityFacetsResponse>;
+  // (undocumented)
+  getLocationByEntity(
+    entityRef: string | CompoundEntityRef,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getLocationById(
+    id: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getLocationByRef(
+    locationRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  queryEntities(
+    request?: QueryEntitiesRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<QueryEntitiesResponse>;
+  // (undocumented)
+  refreshEntity(
+    entityRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  removeEntityByUid(
+    uid: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  removeLocationById(
+    id: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  validateEntity(
+    entity: Entity,
+    locationRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<ValidateEntityResponse>;
+}
 
 // @public
 export function catalogServiceMock(options?: {
   entities?: Entity[];
-}): CatalogApi;
+}): CatalogServiceMock;
 
 // @public
 export namespace catalogServiceMock {
   const factory: (options?: {
     entities?: Entity[];
-  }) => ServiceFactory<CatalogApi, 'plugin', 'singleton'>;
+  }) => ServiceFactory<CatalogServiceMock, 'plugin', 'singleton'>;
   const mock: (
-    partialImpl?: Partial<CatalogApi> | undefined,
-  ) => ServiceMock<CatalogApi>;
+    partialImpl?: Partial<CatalogServiceMock> | undefined,
+  ) => ServiceMock<CatalogServiceMock>;
 }
 ```
diff --git a/plugins/catalog-node/report.api.md b/plugins/catalog-node/report.api.md
index 43209aa862..e196fff230 100644
--- a/plugins/catalog-node/report.api.md
+++ b/plugins/catalog-node/report.api.md
@@ -5,15 +5,30 @@
 ```ts
 /// <reference types="node" />
 
+import { AddLocationRequest } from '@backstage/catalog-client';
+import { AddLocationResponse } from '@backstage/catalog-client';
 import { AnalyzeLocationExistingEntity } from '@backstage/plugin-catalog-common';
 import { AnalyzeLocationRequest } from '@backstage/plugin-catalog-common';
 import { AnalyzeLocationResponse } from '@backstage/plugin-catalog-common';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Entity } from '@backstage/catalog-model';
+import { GetEntitiesByRefsRequest } from '@backstage/catalog-client';
+import { GetEntitiesByRefsResponse } from '@backstage/catalog-client';
+import { GetEntitiesRequest } from '@backstage/catalog-client';
+import { GetEntitiesResponse } from '@backstage/catalog-client';
+import { GetEntityAncestorsRequest } from '@backstage/catalog-client';
+import { GetEntityAncestorsResponse } from '@backstage/catalog-client';
+import { GetEntityFacetsRequest } from '@backstage/catalog-client';
+import { GetEntityFacetsResponse } from '@backstage/catalog-client';
 import { JsonValue } from '@backstage/types';
+import { Location as Location_2 } from '@backstage/catalog-client';
 import { LocationEntityV1alpha1 } from '@backstage/catalog-model';
 import { LocationSpec as LocationSpec_2 } from '@backstage/plugin-catalog-common';
+import { QueryEntitiesRequest } from '@backstage/catalog-client';
+import { QueryEntitiesResponse } from '@backstage/catalog-client';
+import { ServiceRef } from '@backstage/backend-plugin-api';
+import { ValidateEntityResponse } from '@backstage/catalog-client';
 
 // @public (undocumented)
 export type AnalyzeOptions = {
@@ -102,6 +117,94 @@ export type CatalogProcessorResult =
   | CatalogProcessorErrorResult
   | CatalogProcessorRefreshKeysResult;
 
+// @public
+export interface CatalogService {
+  // (undocumented)
+  addLocation(
+    location: AddLocationRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<AddLocationResponse>;
+  // (undocumented)
+  getEntities(
+    request: GetEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesResponse>;
+  // (undocumented)
+  getEntitiesByRefs(
+    request: GetEntitiesByRefsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesByRefsResponse>;
+  // (undocumented)
+  getEntityAncestors(
+    request: GetEntityAncestorsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityAncestorsResponse>;
+  // (undocumented)
+  getEntityByRef(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Entity | undefined>;
+  // (undocumented)
+  getEntityFacets(
+    request: GetEntityFacetsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityFacetsResponse>;
+  // (undocumented)
+  getLocationByEntity(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  getLocationByRef(
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location_2 | undefined>;
+  // (undocumented)
+  queryEntities(
+    request: QueryEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<QueryEntitiesResponse>;
+  // (undocumented)
+  refreshEntity(
+    entityRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  removeEntityByUid(
+    uid: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  removeLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+  // (undocumented)
+  validateEntity(
+    entity: Entity,
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<ValidateEntityResponse>;
+}
+
+// @public
+export const catalogServiceRef: ServiceRef<
+  CatalogService,
+  'plugin',
+  'singleton'
+>;
+
+// @public (undocumented)
+export interface CatalogServiceRequestOptions {
+  // (undocumented)
+  credentials: BackstageCredentials;
+}
+
 // @public
 export type DeferredEntity = {
   entity: Entity;
diff --git a/plugins/catalog-node/src/alpha.ts b/plugins/catalog-node/src/alpha.ts
index b75ec48a7f..63b817fbb3 100644
--- a/plugins/catalog-node/src/alpha.ts
+++ b/plugins/catalog-node/src/alpha.ts
@@ -14,7 +14,32 @@
  * limitations under the License.
  */
 
-export { catalogServiceRef } from './catalogService';
+import {
+  coreServices,
+  createServiceFactory,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+import { catalogServiceRef as _catalogServiceRef } from './catalogService';
+import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
+
+/**
+ * @alpha
+ * @deprecated Use {@link @backstage/plugin-catalog-node#catalogServiceRef} instead
+ */
+export const catalogServiceRef = createServiceRef<CatalogApi>({
+  id: 'catalog-client',
+  defaultFactory: async service =>
+    createServiceFactory({
+      service,
+      deps: {
+        discoveryApi: coreServices.discovery,
+      },
+      async factory({ discoveryApi }) {
+        return new CatalogClient({ discoveryApi });
+      },
+    }),
+});
+
 export type { CatalogLocationsExtensionPoint } from './extensions';
 export { catalogLocationsExtensionPoint } from './extensions';
 export type { CatalogProcessingExtensionPoint } from './extensions';
diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts
index cf7b10009c..b34de6c17c 100644
--- a/plugins/catalog-node/src/catalogService.test.ts
+++ b/plugins/catalog-node/src/catalogService.test.ts
@@ -14,12 +14,26 @@
  * limitations under the License.
  */
 
-import { createBackendModule } from '@backstage/backend-plugin-api';
-import { startTestBackend } from '@backstage/backend-test-utils';
-import { CatalogClient } from '@backstage/catalog-client';
+import {
+  createBackendModule,
+  createServiceFactory,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+import {
+  ServiceFactoryTester,
+  mockCredentials,
+  mockServices,
+  registerMswTestHooks,
+  startTestBackend,
+} from '@backstage/backend-test-utils';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
 import { catalogServiceRef } from './catalogService';
 
 describe('catalogServiceRef', () => {
+  const server = setupServer();
+  registerMswTestHooks(server);
+
   it('should return a catalogClient', async () => {
     expect.assertions(1);
     const testModule = createBackendModule({
@@ -31,7 +45,7 @@ describe('catalogServiceRef', () => {
             catalog: catalogServiceRef,
           },
           async init({ catalog }) {
-            expect(catalog).toBeInstanceOf(CatalogClient);
+            expect(catalog.getEntities).toBeDefined();
           },
         });
       },
@@ -41,4 +55,66 @@ describe('catalogServiceRef', () => {
       features: [testModule],
     });
   });
+
+  it('should inject token from user credentials', async () => {
+    expect.assertions(1);
+
+    server.use(
+      rest.get('http://localhost/api/catalog/entities', (req, res, ctx) => {
+        expect(req.headers.get('authorization')).toBe(
+          mockCredentials.service.header({
+            onBehalfOf: mockCredentials.user(),
+            targetPluginId: 'catalog',
+          }),
+        );
+        return res(ctx.json({}));
+      }),
+    );
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: createServiceRef<void>({ id: 'unused-dummy' }),
+        deps: {},
+        factory() {},
+      }),
+      { dependencies: [mockServices.discovery.factory()] },
+    );
+
+    const catalogService = await tester.getService(catalogServiceRef);
+
+    await catalogService.getEntities(
+      {},
+      { credentials: mockCredentials.user() },
+    );
+  });
+
+  it('should inject token from service credentials', async () => {
+    expect.assertions(1);
+
+    server.use(
+      rest.get('http://localhost/api/catalog/entities', (req, res, ctx) => {
+        expect(req.headers.get('authorization')).toBe(
+          mockCredentials.service.header({
+            onBehalfOf: mockCredentials.service(),
+            targetPluginId: 'catalog',
+          }),
+        );
+        return res(ctx.json({}));
+      }),
+    );
+    const tester = ServiceFactoryTester.from(
+      createServiceFactory({
+        service: createServiceRef<void>({ id: 'unused-dummy' }),
+        deps: {},
+        factory() {},
+      }),
+      { dependencies: [mockServices.discovery.factory()] },
+    );
+
+    const catalogService = await tester.getService(catalogServiceRef);
+
+    await catalogService.getEntities(
+      {},
+      { credentials: mockCredentials.service() },
+    );
+  });
 });
diff --git a/plugins/catalog-node/src/catalogService.ts b/plugins/catalog-node/src/catalogService.ts
index 9a8ff55e1a..5e8c920dad 100644
--- a/plugins/catalog-node/src/catalogService.ts
+++ b/plugins/catalog-node/src/catalogService.ts
@@ -18,23 +18,302 @@ import {
   createServiceFactory,
   createServiceRef,
   coreServices,
+  BackstageCredentials,
+  AuthService,
 } from '@backstage/backend-plugin-api';
-import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
+import {
+  AddLocationRequest,
+  AddLocationResponse,
+  CatalogApi,
+  CatalogClient,
+  CatalogRequestOptions,
+  GetEntitiesByRefsRequest,
+  GetEntitiesByRefsResponse,
+  GetEntitiesRequest,
+  GetEntitiesResponse,
+  GetEntityAncestorsRequest,
+  GetEntityAncestorsResponse,
+  GetEntityFacetsRequest,
+  GetEntityFacetsResponse,
+  Location,
+  QueryEntitiesRequest,
+  QueryEntitiesResponse,
+  ValidateEntityResponse,
+} from '@backstage/catalog-client';
+import { CompoundEntityRef, Entity } from '@backstage/catalog-model';
+
+/**
+ * @public
+ */
+export interface CatalogServiceRequestOptions {
+  credentials: BackstageCredentials;
+}
+
+/**
+ * A version of the {@link @backstage/catalog-client#CatalogApi | CatalogApi} that
+ * requires backend credentials to be passed instead of a token.
+ *
+ * @public
+ */
+export interface CatalogService {
+  getEntities(
+    request: GetEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesResponse>;
+
+  getEntitiesByRefs(
+    request: GetEntitiesByRefsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesByRefsResponse>;
+
+  queryEntities(
+    request: QueryEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<QueryEntitiesResponse>;
+
+  getEntityAncestors(
+    request: GetEntityAncestorsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityAncestorsResponse>;
+
+  getEntityByRef(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Entity | undefined>;
+
+  removeEntityByUid(
+    uid: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+
+  refreshEntity(
+    entityRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+
+  getEntityFacets(
+    request: GetEntityFacetsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityFacetsResponse>;
+
+  getLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined>;
+
+  getLocationByRef(
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined>;
+
+  addLocation(
+    location: AddLocationRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<AddLocationResponse>;
+
+  removeLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void>;
+
+  getLocationByEntity(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined>;
+
+  validateEntity(
+    entity: Entity,
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<ValidateEntityResponse>;
+}
+
+class DefaultCatalogService implements CatalogService {
+  readonly #auth: AuthService;
+  readonly #catalogApi: CatalogApi;
+
+  constructor({
+    catalogApi,
+    auth,
+  }: {
+    catalogApi: CatalogApi;
+    auth: AuthService;
+  }) {
+    this.#catalogApi = catalogApi;
+    this.#auth = auth;
+  }
+
+  async getEntities(
+    request: GetEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesResponse> {
+    return this.#catalogApi.getEntities(
+      request,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getEntitiesByRefs(
+    request: GetEntitiesByRefsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntitiesByRefsResponse> {
+    return this.#catalogApi.getEntitiesByRefs(
+      request,
+      await this.#getOptions(options),
+    );
+  }
+
+  async queryEntities(
+    request: QueryEntitiesRequest | undefined,
+    options: CatalogServiceRequestOptions,
+  ): Promise<QueryEntitiesResponse> {
+    return this.#catalogApi.queryEntities(
+      request,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getEntityAncestors(
+    request: GetEntityAncestorsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityAncestorsResponse> {
+    return this.#catalogApi.getEntityAncestors(
+      request,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getEntityByRef(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Entity | undefined> {
+    return this.#catalogApi.getEntityByRef(
+      entityRef,
+      await this.#getOptions(options),
+    );
+  }
+
+  async removeEntityByUid(
+    uid: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void> {
+    return this.#catalogApi.removeEntityByUid(
+      uid,
+      await this.#getOptions(options),
+    );
+  }
+
+  async refreshEntity(
+    entityRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void> {
+    return this.#catalogApi.refreshEntity(
+      entityRef,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getEntityFacets(
+    request: GetEntityFacetsRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<GetEntityFacetsResponse> {
+    return this.#catalogApi.getEntityFacets(
+      request,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined> {
+    return this.#catalogApi.getLocationById(
+      id,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getLocationByRef(
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined> {
+    return this.#catalogApi.getLocationByRef(
+      locationRef,
+      await this.#getOptions(options),
+    );
+  }
+
+  async addLocation(
+    location: AddLocationRequest,
+    options: CatalogServiceRequestOptions,
+  ): Promise<AddLocationResponse> {
+    return this.#catalogApi.addLocation(
+      location,
+      await this.#getOptions(options),
+    );
+  }
+
+  async removeLocationById(
+    id: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<void> {
+    return this.#catalogApi.removeLocationById(
+      id,
+      await this.#getOptions(options),
+    );
+  }
+
+  async getLocationByEntity(
+    entityRef: string | CompoundEntityRef,
+    options: CatalogServiceRequestOptions,
+  ): Promise<Location | undefined> {
+    return this.#catalogApi.getLocationByEntity(
+      entityRef,
+      await this.#getOptions(options),
+    );
+  }
+
+  async validateEntity(
+    entity: Entity,
+    locationRef: string,
+    options: CatalogServiceRequestOptions,
+  ): Promise<ValidateEntityResponse> {
+    return this.#catalogApi.validateEntity(
+      entity,
+      locationRef,
+      await this.#getOptions(options),
+    );
+  }
+
+  async #getOptions(
+    options: CatalogServiceRequestOptions,
+  ): Promise<CatalogRequestOptions> {
+    return this.#auth.getPluginRequestToken({
+      onBehalfOf: options.credentials,
+      targetPluginId: 'catalog',
+    });
+  }
+}
 
 /**
  * The catalogService provides the catalog API.
- * @alpha
+ *
+ * @public
  */
-export const catalogServiceRef = createServiceRef<CatalogApi>({
+export const catalogServiceRef = createServiceRef<CatalogService>({
   id: 'catalog-client',
   defaultFactory: async service =>
     createServiceFactory({
       service,
       deps: {
+        auth: coreServices.auth,
         discoveryApi: coreServices.discovery,
       },
-      async factory({ discoveryApi }) {
-        return new CatalogClient({ discoveryApi });
+      async factory({ auth, discoveryApi }) {
+        return new DefaultCatalogService({
+          auth,
+          catalogApi: new CatalogClient({ discoveryApi }),
+        });
       },
     }),
 });
diff --git a/plugins/catalog-node/src/index.ts b/plugins/catalog-node/src/index.ts
index 2dd8b5fd5a..9a95b708ba 100644
--- a/plugins/catalog-node/src/index.ts
+++ b/plugins/catalog-node/src/index.ts
@@ -23,3 +23,8 @@
 export * from './api';
 export * from './conversion';
 export * from './processing';
+export {
+  catalogServiceRef,
+  type CatalogService,
+  type CatalogServiceRequestOptions,
+} from './catalogService';
diff --git a/plugins/catalog-node/src/testUtils.ts b/plugins/catalog-node/src/testUtils.ts
index fd1134daf4..6719d77146 100644
--- a/plugins/catalog-node/src/testUtils.ts
+++ b/plugins/catalog-node/src/testUtils.ts
@@ -21,3 +21,4 @@
  */
 
 export { catalogServiceMock } from './testUtils/catalogServiceMock';
+export type { CatalogServiceMock } from './testUtils/types';
diff --git a/plugins/catalog-node/src/testUtils/catalogServiceMock.ts b/plugins/catalog-node/src/testUtils/catalogServiceMock.ts
index b9988572ac..2e8a772dc3 100644
--- a/plugins/catalog-node/src/testUtils/catalogServiceMock.ts
+++ b/plugins/catalog-node/src/testUtils/catalogServiceMock.ts
@@ -15,15 +15,16 @@
  */
 
 import {
+  ServiceFactory,
   ServiceRef,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { InMemoryCatalogClient } from '@backstage/catalog-client/testUtils';
 import { Entity } from '@backstage/catalog-model';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node';
 // eslint-disable-next-line @backstage/no-undeclared-imports
 import { ServiceMock } from '@backstage/backend-test-utils';
-import { CatalogApi } from '@backstage/catalog-client';
+import { CatalogServiceMock } from './types';
 
 /** @internal */
 function simpleMock<TService>(
@@ -60,7 +61,7 @@ function simpleMock<TService>(
  */
 export function catalogServiceMock(options?: {
   entities?: Entity[];
-}): CatalogApi {
+}): CatalogServiceMock {
   return new InMemoryCatalogClient(options);
 }
 
@@ -80,12 +81,12 @@ export namespace catalogServiceMock {
       service: catalogServiceRef,
       deps: {},
       factory: () => new InMemoryCatalogClient(options),
-    });
+    }) as ServiceFactory<CatalogServiceMock, 'plugin', 'singleton'>;
   /**
    * Creates a catalog client whose methods are mock functions, possibly with
    * some of them overloaded by the caller.
    */
-  export const mock = simpleMock(catalogServiceRef, () => ({
+  export const mock = simpleMock<CatalogServiceMock>(catalogServiceRef, () => ({
     getEntities: jest.fn(),
     getEntitiesByRefs: jest.fn(),
     queryEntities: jest.fn(),
diff --git a/plugins/catalog-node/src/testUtils/types.ts b/plugins/catalog-node/src/testUtils/types.ts
new file mode 100644
index 0000000000..1fbbec98f1
--- /dev/null
+++ b/plugins/catalog-node/src/testUtils/types.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  AddLocationRequest,
+  AddLocationResponse,
+  CatalogApi,
+  CatalogRequestOptions,
+  GetEntitiesByRefsRequest,
+  GetEntitiesByRefsResponse,
+  GetEntitiesRequest,
+  GetEntitiesResponse,
+  GetEntityAncestorsRequest,
+  GetEntityAncestorsResponse,
+  GetEntityFacetsRequest,
+  GetEntityFacetsResponse,
+  Location,
+  QueryEntitiesRequest,
+  QueryEntitiesResponse,
+  ValidateEntityResponse,
+} from '@backstage/catalog-client';
+import { CompoundEntityRef, Entity } from '@backstage/catalog-model';
+import {
+  CatalogService,
+  CatalogServiceRequestOptions,
+} from '@backstage/plugin-catalog-node';
+
+/**
+ * A mock friendly version of `CatalogService` /
+ * {@link @backstage/catalog-client#CatalogApi | CatalogApi}.
+ *
+ * @public
+ * @remarks
+ *
+ * This interface supports both API types at the same time, and has an optional
+ * second argument to simplify testing since the mock implementation does not
+ * care about credentials.
+ */
+export interface CatalogServiceMock extends CatalogService, CatalogApi {
+  getEntities(
+    request?: GetEntitiesRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntitiesResponse>;
+
+  getEntitiesByRefs(
+    request: GetEntitiesByRefsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntitiesByRefsResponse>;
+
+  queryEntities(
+    request?: QueryEntitiesRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<QueryEntitiesResponse>;
+
+  getEntityAncestors(
+    request: GetEntityAncestorsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntityAncestorsResponse>;
+
+  getEntityByRef(
+    entityRef: string | CompoundEntityRef,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Entity | undefined>;
+
+  removeEntityByUid(
+    uid: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+
+  refreshEntity(
+    entityRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+
+  getEntityFacets(
+    request: GetEntityFacetsRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<GetEntityFacetsResponse>;
+
+  getLocationById(
+    id: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location | undefined>;
+
+  getLocationByRef(
+    locationRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location | undefined>;
+
+  addLocation(
+    location: AddLocationRequest,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<AddLocationResponse>;
+
+  removeLocationById(
+    id: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<void>;
+
+  getLocationByEntity(
+    entityRef: string | CompoundEntityRef,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<Location | undefined>;
+
+  validateEntity(
+    entity: Entity,
+    locationRef: string,
+    options?: CatalogServiceRequestOptions | CatalogRequestOptions,
+  ): Promise<ValidateEntityResponse>;
+}
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 87eb50645c..15f549c248 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,174 @@
 # @backstage/plugin-catalog-react
 
+## 1.14.3-next.2
+
+### Patch Changes
+
+- 95092a6: Fixed an issue where `<CatalogFilterLayout.Filters />` would re-render its children on page load for smaller screens, potentially leading to unnecessary additional backend requests.
+- 4a43398: Fixed an issue where the `EntityOwnerPicker` component failed to load when the `mode` prop was set to `owners-only`. In this mode, the `EntityOwnerPicker` does not load details about the owners, such as `displayName` or `title`. To display these details, use `mode=all` instead.
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/frontend-test-utils@0.2.4-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 1.14.3-next.1
+
+### Patch Changes
+
+- d97a2cd: Fixed an issue causing the `EntityOwnerPicker` to reset scrolling when more elements are loaded.
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/frontend-test-utils@0.2.4-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.14.3-next.0
+
+### Patch Changes
+
+- f18c67d: Fix catalog filtering to allow searching entities by display name
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-test-utils@0.2.4-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.14.1
+
+### Patch Changes
+
+- 9cc82c0: Fixed bug in `EntityDisplayName` where text was overflowing.
+- 6fcbb3b: Ensure EntityDisplayName component link receives underline on hover.
+- 9670906: Improve UI consistency of default catalog filters
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/frontend-test-utils@0.2.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.14.1-next.3
+
+### Patch Changes
+
+- 6fcbb3b: Ensure EntityDisplayName component link receives underline on hover.
+- 9670906: Improve UI consistency of default catalog filters
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/frontend-test-utils@0.2.2-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.14.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/frontend-test-utils@0.2.2-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.14.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/frontend-test-utils@0.2.2-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.14.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/frontend-test-utils@0.2.2-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 1.14.0
 
 ### Minor Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index ebc2d8e0b5..243ffa483b 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.14.0",
+  "version": "1.14.3-next.2",
   "description": "A frontend library that helps other Backstage plugins interact with the catalog",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx b/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
index ee51020cbb..793d4741ad 100644
--- a/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
+++ b/plugins/catalog-react/src/components/CatalogFilterLayout/CatalogFilterLayout.tsx
@@ -34,8 +34,10 @@ export const Filters = (props: {
     drawerAnchor?: 'left' | 'right' | 'top' | 'bottom';
   };
 }) => {
-  const isScreenSmallerThanBreakpoint = useMediaQuery((theme: Theme) =>
-    theme.breakpoints.down(props.options?.drawerBreakpoint ?? 'md'),
+  const isScreenSmallerThanBreakpoint = useMediaQuery(
+    (theme: Theme) =>
+      theme.breakpoints.down(props.options?.drawerBreakpoint ?? 'md'),
+    { noSsr: true },
   );
   const theme = useTheme();
   const [filterDrawerOpen, setFilterDrawerOpen] = useState<boolean>(false);
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
index 4bd9f100f9..eba4cc3a7a 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
@@ -63,7 +63,10 @@ export type CatalogReactEntityAutocompletePickerClassKey = 'root' | 'label';
 const useStyles = makeStyles(
   {
     root: {},
-    label: {},
+    label: {
+      textTransform: 'none',
+      fontWeight: 'bold',
+    },
   },
   { name: 'CatalogReactEntityAutocompletePicker' },
 );
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx
index 47ef76e8e2..133024330c 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 import TextField, { TextFieldProps } from '@material-ui/core/TextField';
-import { makeStyles } from '@material-ui/core/styles';
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import React from 'react';
 import classnames from 'classnames';
 
 const useStyles = makeStyles(
-  {
-    input: {},
-  },
+  (theme: Theme) =>
+    createStyles({
+      input: {
+        backgroundColor: theme.palette.background.paper,
+      },
+    }),
   {
     name: 'CatalogReactEntityAutocompletePickerInput',
   },
diff --git a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.test.tsx b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.test.tsx
index 3a3816e1e3..33991ff758 100644
--- a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.test.tsx
+++ b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.test.tsx
@@ -15,6 +15,7 @@
  */
 
 import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
+import { createDeferred } from '@backstage/types';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import ObservableImpl from 'zen-observable';
@@ -25,14 +26,6 @@ import {
 } from '../../apis';
 import { EntityDisplayName } from './EntityDisplayName';
 
-function defer<T>() {
-  let resolve = (_value: T) => {};
-  const promise = new Promise<T>(_resolve => {
-    resolve = _resolve;
-  });
-  return { promise, resolve };
-}
-
 describe('<EntityDisplayName />', () => {
   const entityPresentationApi = {
     forEntity: jest.fn(),
@@ -63,7 +56,7 @@ describe('<EntityDisplayName />', () => {
   });
 
   it('works with the async the happy path', async () => {
-    const { promise, resolve } = defer<EntityRefPresentationSnapshot>();
+    const promise = createDeferred<EntityRefPresentationSnapshot>();
 
     entityPresentationApi.forEntity.mockReturnValue({
       snapshot: {
@@ -89,7 +82,7 @@ describe('<EntityDisplayName />', () => {
 
     expect(screen.getByText('foo')).toBeInTheDocument();
 
-    resolve({
+    promise.resolve({
       entityRef: 'component:default/foo',
       primaryTitle: 'bar',
     });
diff --git a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
index 68d5ecefdb..2b9f3307ef 100644
--- a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
+++ b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
@@ -34,6 +34,7 @@ const useStyles = makeStyles(
     root: {
       display: 'inline-flex',
       alignItems: 'center',
+      textDecoration: 'inherit',
     },
     icon: {
       marginRight: theme.spacing(0.5),
@@ -78,7 +79,6 @@ export const EntityDisplayName = (
 
   // The innermost "body" content
   let content = <>{primaryTitle}</>;
-
   // Optionally an icon, and wrapper around them both
   content = (
     <Box component="span" className={classes.root}>
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
index 9d9c25a233..7591d4c3ae 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
@@ -402,17 +402,16 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
 
     fireEvent.click(screen.getByTestId('owner-picker-expand'));
 
+    // // some-owner, some-owner-2, another-owner, another-owner-2
     await waitFor(() =>
-      expect(screen.getByText('Another Owner')).toBeInTheDocument(),
+      expect(screen.getByText('some-owner')).toBeInTheDocument(),
     );
 
-    [
-      'some-owner',
-      'Some Owner 2',
-      'Another Owner in Another Namespace',
-    ].forEach(owner => {
-      expect(screen.getByText(owner)).toBeInTheDocument();
-    });
+    ['some-owner-2', 'another-owner', 'test-namespace/another-owner-2'].forEach(
+      owner => {
+        expect(screen.getByText(owner)).toBeInTheDocument();
+      },
+    );
 
     expect(mockCatalogApi.getEntityFacets).toHaveBeenCalledTimes(1);
 
@@ -423,9 +422,9 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
     );
 
     [
-      'some-owner-batch-2',
-      'Some Owner Batch 2',
-      'Another Owner in Another Namespace Batch 2',
+      'some-owner-2-batch-2',
+      'another-owner-batch-2',
+      'test-namespace/another-owner-2-batch-2',
     ].forEach(owner => {
       expect(screen.getByText(owner)).toBeInTheDocument();
     });
@@ -465,10 +464,8 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
         </MockEntityListContextProvider>
       </ApiProvider>,
     );
-    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
-      entityRefs: [...ownerEntitiesBatch1, ...ownerEntitiesBatch2].map(entity =>
-        stringifyEntityRef(entity),
-      ),
+    expect(mockCatalogApi.getEntityFacets).toHaveBeenCalledWith({
+      facets: ['relations.ownedBy'],
     });
     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 565472b152..ecbdae1d63 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx
@@ -25,7 +25,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
 import TextField from '@material-ui/core/TextField';
 import Typography from '@material-ui/core/Typography';
 import Tooltip from '@material-ui/core/Tooltip';
-import { makeStyles } from '@material-ui/core/styles';
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import CheckBoxIcon from '@material-ui/icons/CheckBox';
 import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -42,22 +42,29 @@ import { withStyles } from '@material-ui/core/styles';
 import { useEntityPresentation } from '../../apis';
 import { catalogReactTranslationRef } from '../../translation';
 import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { PopperProps } from '@material-ui/core/Popper';
 
 /** @public */
 export type CatalogReactEntityOwnerPickerClassKey = 'input';
 
 const useStyles = makeStyles(
-  {
-    root: {},
-    label: {},
-    input: {},
-    fullWidth: { width: '100%' },
-    boxLabel: {
-      width: '100%',
-      textOverflow: 'ellipsis',
-      overflow: 'hidden',
-    },
-  },
+  (theme: Theme) =>
+    createStyles({
+      root: {},
+      label: {
+        textTransform: 'none',
+        fontWeight: 'bold',
+      },
+      input: {
+        backgroundColor: theme.palette.background.paper,
+      },
+      fullWidth: { width: '100%' },
+      boxLabel: {
+        width: '100%',
+        textOverflow: 'ellipsis',
+        overflow: 'hidden',
+      },
+    }),
   { name: 'CatalogReactEntityOwnerPicker' },
 );
 
@@ -182,9 +189,7 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => {
       <Typography className={classes.label} variant="button" component="label">
         {t('entityOwnerPicker.title')}
         <Autocomplete
-          PopperComponent={popperProps => (
-            <div {...popperProps}>{popperProps.children as ReactNode}</div>
-          )}
+          PopperComponent={Popper}
           multiple
           disableCloseOnSelect
           loading={loading}
@@ -258,3 +263,7 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => {
     </Box>
   );
 };
+
+function Popper({ children }: PopperProps) {
+  return <div>{children as ReactNode}</div>;
+}
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
index a3901825b3..a714b31327 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
@@ -17,7 +17,6 @@
 import { renderHook, waitFor } from '@testing-library/react';
 import { useFacetsEntities } from './useFacetsEntities';
 import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
-import { Entity, parseEntityRef } from '@backstage/catalog-model';
 
 const mockCatalogApi = catalogApiMock.mock();
 
@@ -37,25 +36,6 @@ describe('useFacetsEntities', () => {
     },
   });
 
-  const entitiesFromEntityRefs = (
-    entityRefs: string[],
-    enrichedEntities: { [key: string]: Entity } = {},
-  ) => ({
-    items: entityRefs.map(ref => {
-      const compoundRef = parseEntityRef(ref);
-      return (
-        enrichedEntities[ref] || {
-          apiVersion: 'backstage.io/v1beta1',
-          kind: compoundRef.kind,
-          metadata: {
-            name: compoundRef.name,
-            namespace: compoundRef.namespace,
-          },
-        }
-      );
-    }),
-  });
-
   it(`should return empty items when facets are loading`, () => {
     mockCatalogApi.getEntityFacets.mockReturnValue(new Promise(() => {}));
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
@@ -82,9 +62,6 @@ describe('useFacetsEntities', () => {
     mockCatalogApi.getEntityFacets.mockResolvedValue(
       facetsFromEntityRefs(entityRefs),
     );
-    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
-      entitiesFromEntityRefs(entityRefs),
-    );
 
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
 
@@ -110,48 +87,20 @@ describe('useFacetsEntities', () => {
     });
   });
 
-  it(`should return the owners sorted by namespace, (displayName or title or name) and kind`, async () => {
+  it(`should return the owners sorted by kind, namespace and name`, async () => {
     const entityRefs = [
       'group:namespace/team-b',
-      'component:default/c',
+      'user:default/c',
       'group:default/a',
-      'component:default/a',
-      'component:default/b',
+      'user:default/a',
+      'user:default/b',
       'group:default/d',
       'group:default/e',
     ];
 
-    const enrichedEntities: { [key: string]: Entity } = {
-      'group:default/a': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'group',
-        metadata: { name: 'a', namespace: 'default', title: 'My title A' },
-      },
-      'component:default/a': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'component',
-        metadata: { name: 'a', namespace: 'default', title: 'My title B' },
-      },
-      'group:default/d': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'group',
-        metadata: { name: 'd', namespace: 'default' },
-        spec: { profile: { displayName: 'My display name D' } },
-      },
-      'group:default/e': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'group',
-        metadata: { name: 'e', namespace: 'default' },
-        spec: { profile: { displayName: 'My display name E' } },
-      },
-    };
-
     mockCatalogApi.getEntityFacets.mockResolvedValue(
       facetsFromEntityRefs(entityRefs),
     );
-    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
-      entitiesFromEntityRefs(entityRefs, enrichedEntities),
-    );
 
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
 
@@ -162,49 +111,48 @@ describe('useFacetsEntities', () => {
           items: [
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'b', namespace: 'default' },
-            },
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'c', namespace: 'default' },
+              kind: 'group',
+              metadata: { name: 'a', namespace: 'default' },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
               metadata: { name: 'd', namespace: 'default' },
-              spec: { profile: { displayName: 'My display name D' } },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
               metadata: { name: 'e', namespace: 'default' },
-              spec: { profile: { displayName: 'My display name E' } },
-            },
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'group',
-              metadata: {
-                name: 'a',
-                namespace: 'default',
-                title: 'My title A',
-              },
-            },
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: {
-                name: 'a',
-                namespace: 'default',
-                title: 'My title B',
-              },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
               metadata: { name: 'team-b', namespace: 'namespace' },
             },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: {
+                name: 'a',
+                namespace: 'default',
+              },
+            },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: {
+                name: 'b',
+                namespace: 'default',
+              },
+            },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: {
+                name: 'c',
+                namespace: 'default',
+              },
+            },
           ],
         },
         loading: false,
@@ -215,18 +163,15 @@ describe('useFacetsEntities', () => {
   it(`should paginate the data accordingly`, async () => {
     const entityRefs = [
       'group:namespace/team-b',
-      'component:default/c',
+      'user:default/c',
       'group:default/a',
-      'component:default/a',
-      'component:default/b',
+      'user:default/a',
+      'user:default/b',
     ];
 
     mockCatalogApi.getEntityFacets.mockResolvedValue(
       facetsFromEntityRefs(entityRefs),
     );
-    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
-      entitiesFromEntityRefs(entityRefs),
-    );
 
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
 
@@ -237,13 +182,13 @@ describe('useFacetsEntities', () => {
           items: [
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
+              kind: 'group',
               metadata: { name: 'a', namespace: 'default' },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
-              metadata: { name: 'a', namespace: 'default' },
+              metadata: { name: 'team-b', namespace: 'namespace' },
             },
           ],
           cursor: 'eyJ0ZXh0IjoiIiwic3RhcnQiOjJ9',
@@ -257,11 +202,6 @@ describe('useFacetsEntities', () => {
       expect(result.current[0]).toEqual({
         value: {
           items: [
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'a', namespace: 'default' },
-            },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
@@ -269,13 +209,18 @@ describe('useFacetsEntities', () => {
             },
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'b', namespace: 'default' },
+              kind: 'group',
+              metadata: { name: 'team-b', namespace: 'namespace' },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'c', namespace: 'default' },
+              kind: 'user',
+              metadata: { name: 'a', namespace: 'default' },
+            },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: { name: 'b', namespace: 'default' },
             },
           ],
           cursor: 'eyJ0ZXh0IjoiIiwic3RhcnQiOjR9',
@@ -289,31 +234,31 @@ describe('useFacetsEntities', () => {
       expect(result.current[0]).toEqual({
         value: {
           items: [
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'a', namespace: 'default' },
-            },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
               metadata: { name: 'a', namespace: 'default' },
             },
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'b', namespace: 'default' },
-            },
-            {
-              apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'c', namespace: 'default' },
-            },
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'group',
               metadata: { name: 'team-b', namespace: 'namespace' },
             },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: { name: 'a', namespace: 'default' },
+            },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: { name: 'b', namespace: 'default' },
+            },
+            {
+              apiVersion: 'backstage.io/v1beta1',
+              kind: 'user',
+              metadata: { name: 'c', namespace: 'default' },
+            },
           ],
         },
         loading: false,
@@ -337,34 +282,15 @@ describe('useFacetsEntities', () => {
     mockCatalogApi.getEntityFacets.mockResolvedValue(
       facetsFromEntityRefs(entityRefs),
     );
-    const enrichedEntities: { [key: string]: Entity } = {
-      'group:default/go': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'group',
-        metadata: { name: 'go', namespace: 'default', title: 'Hidden Spider' },
-      },
-      'component:default/lemon': {
-        apiVersion: 'backstage.io/v1beta1',
-        kind: 'component',
-        metadata: { name: 'lemon', namespace: 'default' },
-        spec: {
-          profile: { displayName: 'Lemon Spider' },
-        },
-      },
-    };
-    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
-      entitiesFromEntityRefs(entityRefs, enrichedEntities),
-    );
 
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
 
     result.current[1]({ text: 'der  ' });
+
     await waitFor(() => {
       expect(result.current[0]).toEqual({
         value: {
           items: [
-            enrichedEntities['group:default/go'],
-            enrichedEntities['component:default/lemon'],
             {
               apiVersion: 'backstage.io/v1beta1',
               kind: 'component',
@@ -372,13 +298,13 @@ describe('useFacetsEntities', () => {
             },
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'group',
-              metadata: { name: 'spiderman', namespace: 'namespace' },
+              kind: 'component',
+              metadata: { name: 'a-component', namespace: 'spiders' },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
-              kind: 'component',
-              metadata: { name: 'a-component', namespace: 'spiders' },
+              kind: 'group',
+              metadata: { name: 'spiderman', namespace: 'namespace' },
             },
             {
               apiVersion: 'backstage.io/v1beta1',
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.ts b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.ts
index f43bba97c7..a1d7693c1d 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.ts
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.ts
@@ -17,8 +17,7 @@ import { useApi } from '@backstage/core-plugin-api';
 import useAsyncFn from 'react-use/esm/useAsyncFn';
 import { catalogApiRef } from '../../api';
 import { useState } from 'react';
-import { Entity } from '@backstage/catalog-model';
-import get from 'lodash/get';
+import { Entity, parseEntityRef } from '@backstage/catalog-model';
 
 type FacetsCursor = {
   start: number;
@@ -34,15 +33,13 @@ type FacetsInitialRequest = {
   text: string;
 };
 
-const maybeString = (value: unknown): string | undefined =>
-  typeof value === 'string' ? value : undefined;
-
 /**
  * This hook asynchronously loads the entity owners using the facets endpoint.
  * EntityOwnerPicker uses this hook when mode="owners-only" is passed as prop.
  * All the owners are kept internally in memory and rendered in batches once requested
  * by the frontend. The values returned by this hook are compatible with `useQueryEntities`
  * hook, which is also used by EntityOwnerPicker.
+ * In this mode, the EntityOwnerPicker won't show detailed information of the owners.
  */
 export function useFacetsEntities({ enabled }: { enabled: boolean }) {
   const catalogApi = useApi(catalogApiRef);
@@ -52,37 +49,30 @@ export function useFacetsEntities({ enabled }: { enabled: boolean }) {
       return [];
     }
     const facet = 'relations.ownedBy';
-    const facetsResponse = await catalogApi.getEntityFacets({
-      facets: [facet],
-    });
-    const entityRefs = facetsResponse.facets[facet]?.map(e => e.value) ?? [];
 
     return catalogApi
-      .getEntitiesByRefs({ entityRefs })
-      .then(resp =>
-        resp.items
-          .filter(entity => entity !== undefined)
-          .map(entity => entity as Entity)
+      .getEntityFacets({ facets: [facet] })
+      .then(response =>
+        response.facets[facet]
+          .map(e => e.value)
+          .map(ref => {
+            const { kind, name, namespace } = parseEntityRef(ref);
+            return {
+              apiVersion: 'backstage.io/v1beta1',
+              kind,
+              metadata: { name, namespace },
+            };
+          })
           .sort(
             (a, b) =>
-              (a.metadata.namespace || '').localeCompare(
-                b.metadata.namespace || '',
+              a.kind.localeCompare(b.kind, 'en-US') ||
+              a.metadata.namespace.localeCompare(
+                b.metadata.namespace,
                 'en-US',
               ) ||
-              (
-                maybeString(get(a, 'spec.profile.displayName')) ||
-                a.metadata.title ||
-                a.metadata.name
-              ).localeCompare(
-                maybeString(get(b, 'spec.profile.displayName')) ||
-                  b.metadata.title ||
-                  b.metadata.name,
-                'en-US',
-              ) ||
-              a.kind.localeCompare(b.kind, 'en-US'),
+              a.metadata.name.localeCompare(b.metadata.name, 'en-US'),
           ),
       )
-      .then(entities => entities)
       .catch(() => []);
   });
 
@@ -161,10 +151,6 @@ function filterEntity(text: string, entity: Entity) {
   return (
     entity.kind.includes(normalizedText) ||
     entity.metadata.namespace?.includes(normalizedText) ||
-    entity.metadata.name.includes(normalizedText) ||
-    entity.metadata.title?.includes(normalizedText) ||
-    (get(entity, 'spec.profile.displayName') as unknown as string)?.includes(
-      normalizedText,
-    )
+    entity.metadata.name.includes(normalizedText)
   );
 }
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
index 76b7aa1885..a2f0c8f729 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
@@ -20,7 +20,7 @@ import Checkbox from '@material-ui/core/Checkbox';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import TextField from '@material-ui/core/TextField';
 import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import CheckBoxIcon from '@material-ui/icons/CheckBox';
 import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -34,11 +34,17 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 export type CatalogReactEntityProcessingStatusPickerClassKey = 'input';
 
 const useStyles = makeStyles(
-  {
-    root: {},
-    input: {},
-    label: {},
-  },
+  (theme: Theme) =>
+    createStyles({
+      root: {},
+      input: {
+        backgroundColor: theme.palette.background.paper,
+      },
+      label: {
+        textTransform: 'none',
+        fontWeight: 'bold',
+      },
+    }),
   { name: 'CatalogReactEntityProcessingStatusPickerPicker' },
 );
 
diff --git a/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
index a3230a0cc4..2f8e29a6e3 100644
--- a/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/useUnregisterEntityDialogState.test.tsx
@@ -22,14 +22,7 @@ import React from 'react';
 import { useUnregisterEntityDialogState } from './useUnregisterEntityDialogState';
 import { TestApiProvider } from '@backstage/test-utils';
 import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
-
-function defer<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
-  let resolve: (value: T) => void = () => {};
-  const promise = new Promise<T>(_resolve => {
-    resolve = _resolve;
-  });
-  return { promise, resolve };
-}
+import { createDeferred } from '@backstage/types';
 
 describe('useUnregisterEntityDialogState', () => {
   const catalogApi = catalogApiMock.mock();
@@ -47,15 +40,15 @@ describe('useUnregisterEntityDialogState', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    const deferredLocation = defer<Location | undefined>();
-    const deferredColocatedEntities = defer<Entity[]>();
+    const deferredLocation = createDeferred<Location | undefined>();
+    const deferredColocatedEntities = createDeferred<Entity[]>();
 
     resolveLocation = deferredLocation.resolve;
     resolveColocatedEntities = deferredColocatedEntities.resolve;
 
-    catalogApi.getLocationByRef.mockReturnValue(deferredLocation.promise);
+    catalogApi.getLocationByRef.mockReturnValue(deferredLocation);
     catalogApi.getEntities.mockReturnValue(
-      deferredColocatedEntities.promise.then(items => ({ items })),
+      deferredColocatedEntities.then(items => ({ items })),
     );
 
     entity = {
diff --git a/plugins/catalog-react/src/filters.test.ts b/plugins/catalog-react/src/filters.test.ts
index 8ddac7e53b..12ebc4ba04 100644
--- a/plugins/catalog-react/src/filters.test.ts
+++ b/plugins/catalog-react/src/filters.test.ts
@@ -72,6 +72,33 @@ const templates: TemplateEntityV1beta3[] = [
   },
 ];
 
+const users: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'User',
+    metadata: {
+      name: 'jd1234',
+    },
+    spec: {
+      profile: {
+        displayName: 'DOE, JOHN',
+      },
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'User',
+    metadata: {
+      name: 'fb3456',
+    },
+    spec: {
+      profile: {
+        displayName: 'BAR, FOO',
+      },
+    },
+  },
+];
+
 describe('EntityTextFilter', () => {
   it('should search name', () => {
     const filter = new EntityTextFilter('app');
@@ -96,6 +123,12 @@ describe('EntityTextFilter', () => {
     expect(filter.filterEntity(entities[0])).toBeFalsy();
     expect(filter.filterEntity(entities[1])).toBeTruthy();
   });
+
+  it('should search display name', () => {
+    const filter = new EntityTextFilter('doe');
+    expect(filter.filterEntity(users[0])).toBeTruthy();
+    expect(filter.filterEntity(users[1])).toBeFalsy();
+  });
 });
 
 describe('EntityOrphanFilter', () => {
diff --git a/plugins/catalog-react/src/filters.ts b/plugins/catalog-react/src/filters.ts
index 08be27a561..6c68dad9aa 100644
--- a/plugins/catalog-react/src/filters.ts
+++ b/plugins/catalog-react/src/filters.ts
@@ -94,6 +94,7 @@ export class EntityTextFilter implements EntityFilter {
     const partialMatch = this.toUpperArray([
       entity.metadata.name,
       entity.metadata.title,
+      (entity.spec?.profile as { displayName?: string })?.displayName,
     ]);
 
     for (const word of words) {
diff --git a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
index 6e254a9591..027c99666b 100644
--- a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-unprocessed-entities-common
 
+## 0.0.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
+
 ## 0.0.4
 
 ### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities-common/package.json b/plugins/catalog-unprocessed-entities-common/package.json
index 75a76166bd..4be731fc7d 100644
--- a/plugins/catalog-unprocessed-entities-common/package.json
+++ b/plugins/catalog-unprocessed-entities-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-unprocessed-entities-common",
-  "version": "0.0.4",
+  "version": "0.0.6-next.0",
   "description": "Common functionalities for the catalog-unprocessed-entities plugin",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/catalog-unprocessed-entities/CHANGELOG.md b/plugins/catalog-unprocessed-entities/CHANGELOG.md
index 58f9d491c2..f06c156ebd 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-catalog-unprocessed-entities
 
+## 0.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.2.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.2.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## 0.2.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
+## 0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index 625883bfb3..e83b13e26f 100644
--- a/plugins/catalog-unprocessed-entities/package.json
+++ b/plugins/catalog-unprocessed-entities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-unprocessed-entities",
-  "version": "0.2.9",
+  "version": "0.2.12-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-unprocessed-entities",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 80a96df051..4df5aa6fd7 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,195 @@
 # @backstage/plugin-catalog
 
+## 1.26.0-next.2
+
+### Minor Changes
+
+- 25beb82: Adds an optional columns attribute to HasSubdomainsCardProps and changes its default columns
+- 39f1abc: Consistent title behaviour across CatalogTable, CursorPaginatedCatalogTable, and OffsetPaginatedCatalogTable.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+
+## 1.25.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+
+## 1.25.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.25.0
+
+### Minor Changes
+
+- 50df3c8: - Updated EntityLayout component to implement breadcrumb navigation based on the entity relations.
+
+  - Added parentEntityRelations prop to EntityLayoutProps to specify relation types for parent entities.
+
+- 79e9631: Allow `OffsetPaginatedCatalogTable` to configure Table options and `CursorPaginatedCatalogTable` to configure `paginationPosition`.
+
+### Patch Changes
+
+- 2a67594: Fixed an issue causing the `CatalogIndexPage` to not properly filter results when using offset pagination.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+
+## 1.25.0-next.3
+
+### Minor Changes
+
+- 50df3c8: - Updated EntityLayout component to implement breadcrumb navigation based on the entity relations.
+
+  - Added parentEntityRelations prop to EntityLayoutProps to specify relation types for parent entities.
+
+- 79e9631: Allow `OffsetPaginatedCatalogTable` to configure Table options and `CursorPaginatedCatalogTable` to configure `paginationPosition`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+
+## 1.24.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## 1.24.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## 1.24.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+
 ## 1.24.0
 
 ### Minor Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index d87c1b3765..4e030cb90b 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "1.24.0",
+  "version": "1.26.0-next.2",
   "description": "The Backstage plugin for browsing the Backstage catalog",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md
index 1b1ce54d92..3a9f0c6c33 100644
--- a/plugins/catalog/report-alpha.api.md
+++ b/plugins/catalog/report-alpha.api.md
@@ -146,21 +146,6 @@ const _default: FrontendPlugin<
     unregisterRedirect: ExternalRouteRef<undefined>;
   },
   {
-    'api:catalog': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'nav-item:catalog': ExtensionDefinition<{
       kind: 'nav-item';
       name: undefined;
@@ -182,6 +167,21 @@ const _default: FrontendPlugin<
         routeRef: RouteRef<undefined>;
       };
     }>;
+    'api:catalog': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
     'api:catalog/starred-entities': ExtensionDefinition<{
       kind: 'api';
       name: 'starred-entities';
diff --git a/plugins/catalog/report.api.md b/plugins/catalog/report.api.md
index d817118e3a..3692a919b3 100644
--- a/plugins/catalog/report.api.md
+++ b/plugins/catalog/report.api.md
@@ -10,6 +10,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogApi } from '@backstage/plugin-catalog-react';
 import { ComponentEntity } from '@backstage/catalog-model';
 import { CompoundEntityRef } from '@backstage/catalog-model';
+import { DomainEntity } from '@backstage/catalog-model';
 import { Entity } from '@backstage/catalog-model';
 import { EntityListContextProps } from '@backstage/plugin-catalog-react';
 import { EntityListPagination } from '@backstage/plugin-catalog-react';
@@ -64,6 +65,8 @@ export interface AboutFieldProps {
   // (undocumented)
   children?: React_2.ReactNode;
   // (undocumented)
+  className?: string;
+  // (undocumented)
   gridSizes?: Record<string, number>;
   // (undocumented)
   label: string;
@@ -154,7 +157,7 @@ export interface CatalogSearchResultListItemProps {
   result?: IndexableDocument;
 }
 
-// @public (undocumented)
+// @public
 export const CatalogTable: {
   (props: CatalogTableProps): React_2.JSX.Element;
   columns: Readonly<{
@@ -212,6 +215,7 @@ export interface CatalogTableProps {
   subtitle?: string;
   // (undocumented)
   tableOptions?: TableProps<CatalogTableRow>['options'];
+  title?: string;
 }
 
 // @public (undocumented)
@@ -414,6 +418,7 @@ export interface EntityLayoutProps {
   children?: React_2.ReactNode;
   // (undocumented)
   NotFoundComponent?: React_2.ReactNode;
+  parentEntityRelations?: string[];
   // Warning: (ae-forgotten-export) The symbol "EntityContextMenuOptions" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
@@ -581,6 +586,8 @@ export interface HasSubcomponentsCardProps {
 
 // @public (undocumented)
 export interface HasSubdomainsCardProps {
+  // (undocumented)
+  columns?: TableColumn<DomainEntity>[];
   // (undocumented)
   tableOptions?: TableOptions;
   // (undocumented)
diff --git a/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.ts b/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.ts
index f4b7771d04..5c06dc1ca2 100644
--- a/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.ts
+++ b/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.ts
@@ -69,7 +69,7 @@ export class DefaultStarredEntitiesApi implements StarredEntitiesApi {
   >();
 
   private readonly observable = new ObservableImpl<Set<string>>(subscriber => {
-    // forward the the latest value
+    // forward the latest value
     subscriber.next(new Set(this.starredEntities));
 
     this.subscribers.add(subscriber);
diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
index f6d2d80264..07547c8949 100644
--- a/plugins/catalog/src/components/AboutCard/AboutContent.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
@@ -132,6 +132,7 @@ export function AboutContent(props: AboutContentProps) {
       <AboutField
         label={t('aboutCard.ownerField.label')}
         value={t('aboutCard.ownerField.value')}
+        className={classes.description}
         gridSizes={{ xs: 12, sm: 6, lg: 4 }}
       >
         {ownedByRelations.length > 0 && (
diff --git a/plugins/catalog/src/components/AboutCard/AboutField.tsx b/plugins/catalog/src/components/AboutCard/AboutField.tsx
index 7587867af0..15e02307f0 100644
--- a/plugins/catalog/src/components/AboutCard/AboutField.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutField.tsx
@@ -48,11 +48,12 @@ export interface AboutFieldProps {
   value?: string;
   gridSizes?: Record<string, number>;
   children?: React.ReactNode;
+  className?: string;
 }
 
 /** @public */
 export function AboutField(props: AboutFieldProps) {
-  const { label, value, gridSizes, children } = props;
+  const { label, value, gridSizes, children, className } = props;
   const classes = useStyles();
 
   const childElements = useElementFilter(children, c => c.getElements());
@@ -67,7 +68,7 @@ export function AboutField(props: AboutFieldProps) {
       </Typography>
     );
   return (
-    <Grid item {...gridSizes}>
+    <Grid item {...gridSizes} className={className}>
       <Typography variant="h2" className={classes.label}>
         {label}
       </Typography>
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
index 5b7f28e26a..13ee7593b9 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
@@ -84,6 +84,19 @@ describe('CatalogTable component', () => {
     ).resolves.toBeInTheDocument();
   });
 
+  it('should a custom title and subtitle when passed in', async () => {
+    await renderInTestApp(
+      <ApiProvider apis={mockApis}>
+        <MockEntityListContextProvider>
+          <CatalogTable title="My Title" subtitle="My Subtitle" />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    expect(screen.queryByText('My Title')).toBeInTheDocument();
+    expect(screen.queryByText('My Subtitle')).toBeInTheDocument();
+  });
+
   it('should display entity names when loading has finished and no error occurred', async () => {
     await renderInTestApp(
       <ApiProvider apis={mockApis}>
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index 2d5e78a0d6..944e795709 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -49,6 +49,7 @@ import { defaultCatalogTableColumnsFunc } from './defaultCatalogTableColumnsFunc
 import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { catalogTranslationRef } from '../../alpha/translation';
 import { FavoriteToggleIcon } from '@backstage/core-components';
+import { CatalogTableToolbar } from './CatalogTableToolbar';
 
 /**
  * Props for {@link CatalogTable}.
@@ -60,6 +61,11 @@ export interface CatalogTableProps {
   actions?: TableProps<CatalogTableRow>['actions'];
   tableOptions?: TableProps<CatalogTableRow>['options'];
   emptyContent?: ReactNode;
+  /**
+   * A static title to use for the table. If not provided, a title will be
+   * generated based on the current Kind and Type filters and total number of items.
+   */
+  title?: string;
   subtitle?: string;
 }
 
@@ -73,7 +79,16 @@ const refCompare = (a: Entity, b: Entity) => {
   return toRef(a).localeCompare(toRef(b));
 };
 
-/** @public */
+/**
+ * CatalogTable is a wrapper around the Table component that is pre-configured
+ * to display catalog entities.
+ *
+ * @remarks
+ *
+ * See {@link https://backstage.io/docs/features/software-catalog/catalog-customization}
+ *
+ * @public
+ */
 export const CatalogTable = (props: CatalogTableProps) => {
   const {
     columns = defaultCatalogTableColumnsFunc,
@@ -173,14 +188,11 @@ export const CatalogTable = (props: CatalogTableProps) => {
   const currentCount = typeof totalItems === 'number' ? `(${totalItems})` : '';
   // TODO(timbonicus): remove the title from the CatalogTable once using EntitySearchBar
   const titlePreamble = capitalize(filters.user?.value ?? 'all');
-  const title = [
-    titlePreamble,
-    currentType,
-    pluralize(currentKind),
-    currentCount,
-  ]
-    .filter(s => s)
-    .join(' ');
+  const title =
+    props.title ||
+    [titlePreamble, currentType, pluralize(currentKind), currentCount]
+      .filter(s => s)
+      .join(' ');
 
   const actions = props.actions || defaultActions;
   const options = {
@@ -235,6 +247,9 @@ export const CatalogTable = (props: CatalogTableProps) => {
         pageSizeOptions: [20, 50, 100],
         ...options,
       }}
+      components={{
+        Toolbar: CatalogTableToolbar,
+      }}
       title={title}
       data={rows}
       actions={actions}
diff --git a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.test.tsx
index adc69794ae..b0deec9679 100644
--- a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.test.tsx
@@ -63,6 +63,22 @@ describe('CursorPaginatedCatalogTable', () => {
     );
   };
 
+  it('should display the title and subtitle when passed in', async () => {
+    await renderInTestApp(
+      wrapInContext(
+        <CursorPaginatedCatalogTable
+          data={data}
+          columns={columns}
+          title="My Title"
+          subtitle="My Subtitle"
+        />,
+      ),
+    );
+
+    expect(screen.queryByText('My Title')).toBeInTheDocument();
+    expect(screen.queryByText('My Subtitle')).toBeInTheDocument();
+  });
+
   it('should display all the items', async () => {
     await renderInTestApp(
       wrapInContext(
diff --git a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx
index da9f13e85c..843d5be2c8 100644
--- a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx
@@ -30,18 +30,16 @@ type PaginatedCatalogTableProps = {
  */
 
 export function CursorPaginatedCatalogTable(props: PaginatedCatalogTableProps) {
-  const { columns, data, next, prev, title, isLoading, options, ...restProps } =
-    props;
+  const { columns, data, next, prev, options, ...restProps } = props;
 
   return (
     <Table
-      title={isLoading ? '' : title}
       columns={columns}
       data={data}
       options={{
+        paginationPosition: 'both',
         ...options,
         // These settings are configured to force server side pagination
-        paginationPosition: 'both',
         pageSizeOptions: [],
         showFirstLastPageButtons: false,
         pageSize: Number.MAX_SAFE_INTEGER,
@@ -62,7 +60,6 @@ export function CursorPaginatedCatalogTable(props: PaginatedCatalogTableProps) {
       /* this will enable the next button accordingly */
       totalCount={next ? Number.MAX_VALUE : Number.MAX_SAFE_INTEGER}
       localization={{ pagination: { labelDisplayedRows: '' } }}
-      isLoading={isLoading}
       {...restProps}
     />
   );
diff --git a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.test.tsx
index aad9b7cb3d..e2e73c5af8 100644
--- a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.test.tsx
@@ -62,6 +62,28 @@ describe('OffsetPaginatedCatalogTable', () => {
     );
   };
 
+  it('should display the title and subtitle when passed in', async () => {
+    await renderInTestApp(
+      wrapInContext(
+        <OffsetPaginatedCatalogTable
+          data={data}
+          columns={columns}
+          title="My Title"
+          subtitle="My Subtitle"
+        />,
+        {
+          setOffset: jest.fn(),
+          limit: Number.MAX_SAFE_INTEGER,
+          offset: 0,
+          totalItems: data.length,
+        },
+      ),
+    );
+
+    expect(screen.queryByText('My Title')).toBeInTheDocument();
+    expect(screen.queryByText('My Subtitle')).toBeInTheDocument();
+  });
+
   it('should display all the items', async () => {
     await renderInTestApp(
       wrapInContext(
diff --git a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
index 0faa0043a1..7ebf791046 100644
--- a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
@@ -18,10 +18,8 @@ import React, { useEffect } from 'react';
 
 import { Table, TableProps } from '@backstage/core-components';
 import { CatalogTableRow } from './types';
-import {
-  EntityTextFilter,
-  useEntityList,
-} from '@backstage/plugin-catalog-react';
+import { useEntityList } from '@backstage/plugin-catalog-react';
+import { CatalogTableToolbar } from './CatalogTableToolbar';
 
 /**
  * @internal
@@ -29,9 +27,9 @@ import {
 export function OffsetPaginatedCatalogTable(
   props: TableProps<CatalogTableRow>,
 ) {
-  const { columns, data, isLoading } = props;
-  const { updateFilters, setLimit, setOffset, limit, totalItems, offset } =
-    useEntityList();
+  const { columns, data, options, ...restProps } = props;
+  const { setLimit, setOffset, limit, totalItems, offset } = useEntityList();
+
   const [page, setPage] = React.useState(
     offset && limit ? Math.floor(offset / limit) : 0,
   );
@@ -53,12 +51,11 @@ export function OffsetPaginatedCatalogTable(
         pageSizeOptions: [5, 10, 20, 50, 100],
         pageSize: limit,
         emptyRowsWhenPaging: false,
+        ...options,
+      }}
+      components={{
+        Toolbar: CatalogTableToolbar,
       }}
-      onSearchChange={(searchText: string) =>
-        updateFilters({
-          text: searchText ? new EntityTextFilter(searchText) : undefined,
-        })
-      }
       page={page}
       onPageChange={newPage => {
         setPage(newPage);
@@ -68,7 +65,7 @@ export function OffsetPaginatedCatalogTable(
       }}
       totalCount={totalItems}
       localization={{ pagination: { labelDisplayedRows: '' } }}
-      isLoading={isLoading}
+      {...restProps}
     />
   );
 }
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
index 239b081051..ff38e53d96 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
@@ -169,6 +169,38 @@ describe('EntityLayout', () => {
     expect(screen.queryByText('tabbed-test-content')).not.toBeInTheDocument();
   });
 
+  it('renders the breadcrumbs if defined', async () => {
+    const mockEntityWithRelation = {
+      kind: 'MyKind',
+      metadata: {
+        name: 'my-entity',
+        namespace: 'default',
+        title: 'My Entity',
+      },
+      relations: [{ type: 'partOf', targetRef: 'system:default/my-system' }],
+    } as Entity;
+
+    await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityProvider entity={mockEntityWithRelation}>
+          <EntityLayout parentEntityRelations={['partOf']}>
+            <EntityLayout.Route path="/" title="tabbed-test-title">
+              <div>tabbed-test-content</div>
+            </EntityLayout.Route>
+          </EntityLayout>
+        </EntityProvider>
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+          '/catalog': rootRouteRef,
+        },
+      },
+    );
+
+    expect(screen.getByText('my-system')).toBeInTheDocument();
+  });
+
   it('navigates when user clicks different tab', async () => {
     await renderInTestApp(
       <ApiProvider apis={apis}>
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
index e8b957497d..c06344c2a6 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -15,11 +15,13 @@
  */
 
 import {
-  Entity,
   DEFAULT_NAMESPACE,
+  Entity,
+  EntityRelation,
   RELATION_OWNED_BY,
 } from '@backstage/catalog-model';
 import {
+  Breadcrumbs,
   Content,
   Header,
   HeaderLabel,
@@ -32,12 +34,16 @@ import {
 import {
   attachComponentData,
   IconComponent,
+  useApi,
   useElementFilter,
   useRouteRef,
   useRouteRefParams,
 } from '@backstage/core-plugin-api';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import {
+  catalogApiRef,
   EntityDisplayName,
+  EntityRefLink,
   EntityRefLinks,
   entityRouteRef,
   FavoriteEntity,
@@ -47,14 +53,15 @@ import {
   useAsyncEntity,
 } from '@backstage/plugin-catalog-react';
 import Box from '@material-ui/core/Box';
+import { makeStyles } from '@material-ui/core/styles';
 import { TabProps } from '@material-ui/core/Tab';
 import Alert from '@material-ui/lab/Alert';
 import React, { useEffect, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
-import { rootRouteRef, unregisterRedirectRouteRef } from '../../routes';
+import useAsync from 'react-use/esm/useAsync';
 import { catalogTranslationRef } from '../../alpha/translation';
-import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { rootRouteRef, unregisterRedirectRouteRef } from '../../routes';
+import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
 
 /** @public */
 export type EntityLayoutRouteProps = {
@@ -101,6 +108,7 @@ function headerProps(
   const namespace = paramNamespace ?? entity?.metadata.namespace ?? '';
   const name =
     entity?.metadata.title ?? paramName ?? entity?.metadata.name ?? '';
+
   return {
     headerTitle: `${name}${
       namespace && namespace !== DEFAULT_NAMESPACE ? ` in ${namespace}` : ''
@@ -167,8 +175,49 @@ export interface EntityLayoutProps {
   UNSTABLE_contextMenuOptions?: EntityContextMenuOptions;
   children?: React.ReactNode;
   NotFoundComponent?: React.ReactNode;
+  /**
+   * An array of relation types used to determine the parent entities in the hierarchy.
+   * These relations are prioritized in the order provided, allowing for flexible
+   * navigation through entity relationships.
+   *
+   * For example, use relation types like `["partOf", "memberOf", "ownedBy"]` to define how the entity is related to
+   * its parents in the Entity Catalog.
+   *
+   * It adds breadcrumbs in the Entity page to enhance user navigation and context awareness.
+   */
+  parentEntityRelations?: string[];
 }
 
+function findParentRelation(
+  entityRelations: EntityRelation[] = [],
+  relationTypes: string[] = [],
+) {
+  for (const type of relationTypes) {
+    const foundRelation = entityRelations.find(
+      relation => relation.type === type,
+    );
+    if (foundRelation) {
+      return foundRelation; // Return the first found relation and stop
+    }
+  }
+  return null;
+}
+
+const useStyles = makeStyles(theme => ({
+  breadcrumbs: {
+    color: theme.page.fontColor,
+    fontSize: theme.typography.caption.fontSize,
+    textTransform: 'uppercase',
+    marginTop: theme.spacing(1),
+    opacity: 0.8,
+    '& span ': {
+      color: theme.page.fontColor,
+      textDecoration: 'underline',
+      textUnderlineOffset: '3px',
+    },
+  },
+}));
+
 /**
  * EntityLayout is a compound component, which allows you to define a layout for
  * entities using a sub-navigation mechanism.
@@ -192,7 +241,9 @@ export const EntityLayout = (props: EntityLayoutProps) => {
     UNSTABLE_contextMenuOptions,
     children,
     NotFoundComponent,
+    parentEntityRelations,
   } = props;
+  const classes = useStyles();
   const { kind, namespace, name } = useRouteRefParams(entityRouteRef);
   const { entity, loading, error } = useAsyncEntity();
   const location = useLocation();
@@ -247,6 +298,22 @@ export const EntityLayout = (props: EntityLayoutProps) => {
     );
   };
 
+  const parentEntity = findParentRelation(
+    entity?.relations ?? [],
+    parentEntityRelations ?? [],
+  );
+
+  const catalogApi = useApi(catalogApiRef);
+  const { value: ancestorEntity } = useAsync(async () => {
+    if (parentEntity) {
+      return findParentRelation(
+        (await catalogApi.getEntityByRef(parentEntity?.targetRef))?.relations,
+        parentEntityRelations,
+      );
+    }
+    return null;
+  }, [parentEntity]);
+
   // Make sure to close the dialog if the user clicks links in it that navigate
   // to another entity.
   useEffect(() => {
@@ -261,6 +328,23 @@ export const EntityLayout = (props: EntityLayoutProps) => {
         title={<EntityLayoutTitle title={headerTitle} entity={entity!} />}
         pageTitleOverride={headerTitle}
         type={headerType}
+        subtitle={
+          parentEntity && (
+            <Breadcrumbs separator=">" className={classes.breadcrumbs}>
+              {ancestorEntity && (
+                <EntityRefLink
+                  entityRef={ancestorEntity.targetRef}
+                  disableTooltip
+                />
+              )}
+              <EntityRefLink
+                entityRef={parentEntity.targetRef}
+                disableTooltip
+              />
+              {name}
+            </Breadcrumbs>
+          )
+        }
       >
         {entity && (
           <>
diff --git a/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.tsx b/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.tsx
index 71705ea90f..b52f5eacf7 100644
--- a/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.tsx
+++ b/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.tsx
@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-import { RELATION_HAS_PART } from '@backstage/catalog-model';
-import { InfoCardVariants, TableOptions } from '@backstage/core-components';
+import { DomainEntity, RELATION_HAS_PART } from '@backstage/catalog-model';
+import {
+  InfoCardVariants,
+  TableColumn,
+  TableOptions,
+} from '@backstage/core-components';
 import React from 'react';
 import {
-  asComponentEntities,
-  componentEntityColumns,
+  asDomainEntities,
+  domainEntityColumns,
+  domainEntityHelpLink,
   RelatedEntitiesCard,
 } from '../RelatedEntitiesCard';
 import { catalogTranslationRef } from '../../alpha/translation';
@@ -29,6 +34,7 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 export interface HasSubdomainsCardProps {
   variant?: InfoCardVariants;
   tableOptions?: TableOptions;
+  columns?: TableColumn<DomainEntity>[];
   title?: string;
 }
 
@@ -36,8 +42,9 @@ export function HasSubdomainsCard(props: HasSubdomainsCardProps) {
   const { t } = useTranslationRef(catalogTranslationRef);
   const {
     variant = 'gridItem',
-    tableOptions = {},
     title = t('hasSubdomainsCard.title'),
+    columns = domainEntityColumns,
+    tableOptions = {},
   } = props;
   return (
     <RelatedEntitiesCard
@@ -45,10 +52,10 @@ export function HasSubdomainsCard(props: HasSubdomainsCardProps) {
       title={title}
       entityKind="Domain"
       relationType={RELATION_HAS_PART}
-      columns={componentEntityColumns}
-      asRenderableEntities={asComponentEntities}
+      columns={columns}
+      asRenderableEntities={asDomainEntities}
       emptyMessage={t('hasSubdomainsCard.emptyMessage')}
-      emptyHelpLink="https://backstage.io/docs/features/software-catalog/descriptor-format/#specsubdomainof-optional"
+      emptyHelpLink={domainEntityHelpLink}
       tableOptions={tableOptions}
     />
   );
diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
index 5b57cbd80e..40481614e2 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
@@ -33,10 +33,13 @@ import {
 } from '@backstage/core-components';
 import {
   asComponentEntities,
+  asDomainEntities,
   asResourceEntities,
   asSystemEntities,
   componentEntityColumns,
   componentEntityHelpLink,
+  domainEntityColumns,
+  domainEntityHelpLink,
   resourceEntityColumns,
   resourceEntityHelpLink,
   systemEntityColumns,
@@ -137,3 +140,6 @@ RelatedEntitiesCard.asResourceEntities = asResourceEntities;
 RelatedEntitiesCard.systemEntityColumns = systemEntityColumns;
 RelatedEntitiesCard.systemEntityHelpLink = systemEntityHelpLink;
 RelatedEntitiesCard.asSystemEntities = asSystemEntities;
+RelatedEntitiesCard.domainEntityColums = domainEntityColumns;
+RelatedEntitiesCard.domainEntityHelpLink = domainEntityHelpLink;
+RelatedEntitiesCard.asDomainEntities = asDomainEntities;
diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
index 8e3040ccf9..68930c578b 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
@@ -15,6 +15,7 @@
  */
 import {
   ComponentEntity,
+  DomainEntity,
   Entity,
   ResourceEntity,
   SystemEntity,
@@ -55,3 +56,13 @@ export const systemEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system';
 export const asSystemEntities = (entities: Entity[]): SystemEntity[] =>
   entities as SystemEntity[];
+
+export const domainEntityColumns: TableColumn<DomainEntity>[] = [
+  EntityTable.columns.createEntityRefColumn({ defaultKind: 'domain' }),
+  EntityTable.columns.createOwnerColumn(),
+  EntityTable.columns.createMetadataDescriptionColumn(),
+];
+export const domainEntityHelpLink: string =
+  'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-domain';
+export const asDomainEntities = (entities: Entity[]): DomainEntity[] =>
+  entities as DomainEntity[];
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 49639cfa38..b4393708db 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-config-schema
 
+## 0.1.63-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+
+## 0.1.63-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.1.63-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.1.61
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.1.61-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.1.61-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.1.61-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.1.60
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 14063e7755..d48ca8dbc3 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.60",
+  "version": "0.1.63-next.2",
   "description": "A Backstage plugin that lets you browse the configuration schema of your app",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/devtools-backend/CHANGELOG.md b/plugins/devtools-backend/CHANGELOG.md
index 6217e6c509..a634afb3da 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,118 @@
 # @backstage/plugin-devtools-backend
 
+## 0.5.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config-loader@1.9.3-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.14-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.5.0-next.1
+
+### Minor Changes
+
+- c781a9a: **BREAKING** Removed support for what is known as the legacy backend, please use the New Backend System.
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/config-loader@1.9.3-next.0
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 0.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/config-loader@1.9.2
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/cli-common@0.1.15
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-node@0.8.5
+
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/devtools-backend/README.md b/plugins/devtools-backend/README.md
index d9ffb3e076..13e749e8e3 100644
--- a/plugins/devtools-backend/README.md
+++ b/plugins/devtools-backend/README.md
@@ -25,54 +25,6 @@ Here's how to get the DevTools Backend up and running in the new backend system:
 3. Now run `yarn start-backend` from the repo root
 4. Finally open `http://localhost:7007/api/devtools/health` in a browser and it should return `{"status":"ok"}`
 
-## Old Backend System
-
-If you are still on the old backend system, please consider migrating to the new backend system. But to install this plugin in an old backend, see below.
-
-1. First we need to add the `@backstage/plugin-devtools-backend` package to your backend:
-
-   ```sh
-   # From the Backstage root directory
-   yarn --cwd packages/backend add @backstage/plugin-devtools-backend
-   ```
-
-2. Then we will create a new file named `packages/backend/src/plugins/devtools.ts`, and add the
-   following to it:
-
-   ```ts
-   import { createRouter } from '@backstage/plugin-devtools-backend';
-   import { Router } from 'express';
-   import type { PluginEnvironment } from '../types';
-
-   export default function createPlugin(
-     env: PluginEnvironment,
-   ): Promise<Router> {
-     return createRouter({
-       logger: env.logger,
-       config: env.config,
-       permissions: env.permissions,
-       discovery: env.discovery,
-     });
-   }
-   ```
-
-3. Next we wire this into the overall backend router, edit `packages/backend/src/index.ts`:
-
-   ```ts
-   import devTools from './plugins/devtools';
-   // ...
-   async function main() {
-     // ...
-     // Add this line under the other lines that follow the useHotMemoize pattern
-     const devToolsEnv = useHotMemoize(module, () => createEnv('devtools'));
-     // ...
-     // Insert this line under the other lines that add their routers to apiRouter in the same way
-     apiRouter.use('/devtools', await devTools(devToolsEnv));
-   ```
-
-4. Now run `yarn start-backend` from the repo root
-5. Finally open `http://localhost:7007/api/devtools/health` in a browser and it should return `{"status":"ok"}`
-
 ## Links
 
 - [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/devtools)
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index e7c0e88259..68c3f78e60 100644
--- a/plugins/devtools-backend/package.json
+++ b/plugins/devtools-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools-backend",
-  "version": "0.4.1",
+  "version": "0.5.0-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "devtools",
@@ -38,7 +38,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli-common": "workspace:^",
     "@backstage/config": "workspace:^",
@@ -49,14 +49,12 @@
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
-    "@types/express": "*",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0",
     "express": "^4.18.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "^11.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "ping": "^0.4.1",
     "semver": "^7.5.3",
     "yn": "^4.0.0"
@@ -65,6 +63,7 @@
     "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
+    "@types/express": "^4.17.6",
     "@types/ping": "^0.4.1",
     "@types/supertest": "^2.0.8",
     "@types/yarnpkg__lockfile": "^1.1.4",
diff --git a/plugins/devtools-backend/report.api.md b/plugins/devtools-backend/report.api.md
index 5fceda3d46..d4830e7a7b 100644
--- a/plugins/devtools-backend/report.api.md
+++ b/plugins/devtools-backend/report.api.md
@@ -7,16 +7,8 @@ import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { ConfigInfo } from '@backstage/plugin-devtools-common';
 import { DevToolsInfo } from '@backstage/plugin-devtools-common';
-import { DiscoveryService } from '@backstage/backend-plugin-api';
-import express from 'express';
 import { ExternalDependency } from '@backstage/plugin-devtools-common';
-import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
-import { PermissionsService } from '@backstage/backend-plugin-api';
-import { RootConfigService } from '@backstage/backend-plugin-api';
-
-// @public @deprecated (undocumented)
-export function createRouter(options: RouterOptions): Promise<express.Router>;
 
 // @public (undocumented)
 export class DevToolsBackendApi {
@@ -32,20 +24,4 @@ export class DevToolsBackendApi {
 // @public
 const devtoolsPlugin: BackendFeature;
 export default devtoolsPlugin;
-
-// @public @deprecated (undocumented)
-export interface RouterOptions {
-  // (undocumented)
-  config: RootConfigService;
-  // (undocumented)
-  devToolsBackendApi?: DevToolsBackendApi;
-  // (undocumented)
-  discovery: DiscoveryService;
-  // (undocumented)
-  httpAuth?: HttpAuthService;
-  // (undocumented)
-  logger: LoggerService;
-  // (undocumented)
-  permissions: PermissionsService;
-}
 ```
diff --git a/plugins/devtools-backend/src/api/DevToolsBackendApi.ts b/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
index ae687f3cb0..5ecc3327e0 100644
--- a/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
+++ b/plugins/devtools-backend/src/api/DevToolsBackendApi.ts
@@ -24,9 +24,7 @@ import {
   ExternalDependencyStatus,
   PackageDependency,
 } from '@backstage/plugin-devtools-common';
-
 import { JsonObject } from '@backstage/types';
-import fetch from 'node-fetch';
 import { findPaths } from '@backstage/cli-common';
 import { getPackages } from '@manypkg/get-packages';
 import ping from 'ping';
diff --git a/plugins/devtools-backend/src/index.ts b/plugins/devtools-backend/src/index.ts
index 58d4570163..3c73ef0e19 100644
--- a/plugins/devtools-backend/src/index.ts
+++ b/plugins/devtools-backend/src/index.ts
@@ -21,5 +21,4 @@
  */
 
 export { DevToolsBackendApi } from './api';
-export * from './service/router';
 export { devtoolsPlugin as default } from './plugin';
diff --git a/plugins/devtools-backend/src/service/router.test.ts b/plugins/devtools-backend/src/service/router.test.ts
index 9f9db0a8d4..a530f82adc 100644
--- a/plugins/devtools-backend/src/service/router.test.ts
+++ b/plugins/devtools-backend/src/service/router.test.ts
@@ -51,6 +51,7 @@ describe('createRouter', () => {
       }),
       discovery: mockServices.discovery(),
       permissions: permissionEvaluator,
+      httpAuth: mockServices.httpAuth(),
     });
     app = express().use(router);
   });
diff --git a/plugins/devtools-backend/src/service/router.ts b/plugins/devtools-backend/src/service/router.ts
index e3eb72c293..adcb79c4cd 100644
--- a/plugins/devtools-backend/src/service/router.ts
+++ b/plugins/devtools-backend/src/service/router.ts
@@ -24,10 +24,6 @@ import {
 import { DevToolsBackendApi } from '../api';
 import { NotAllowedError } from '@backstage/errors';
 import Router from 'express-promise-router';
-import {
-  createLegacyAuthAdapters,
-  errorHandler,
-} from '@backstage/backend-common';
 import express from 'express';
 import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-node';
 import {
@@ -37,10 +33,10 @@ import {
   PermissionsService,
   RootConfigService,
 } from '@backstage/backend-plugin-api';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
 
 /**
- * @public
- * @deprecated Please migrate to the new backend system as this will be removed in the future.
+ * @internal
  */
 export interface RouterOptions {
   devToolsBackendApi?: DevToolsBackendApi;
@@ -48,19 +44,16 @@ export interface RouterOptions {
   config: RootConfigService;
   permissions: PermissionsService;
   discovery: DiscoveryService;
-  httpAuth?: HttpAuthService;
+  httpAuth: HttpAuthService;
 }
 
 /**
- * @deprecated Please migrate to the new backend system as this will be removed in the future.
- * @public
+ * @internal
  * */
 export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {
-  const { logger, config, permissions } = options;
-
-  const { httpAuth } = createLegacyAuthAdapters(options);
+  const { logger, config, permissions, httpAuth } = options;
 
   const devToolsBackendApi =
     options.devToolsBackendApi || new DevToolsBackendApi(logger, config);
@@ -128,6 +121,8 @@ export async function createRouter(
     response.status(200).json(health);
   });
 
-  router.use(errorHandler());
+  const middleware = MiddlewareFactory.create({ logger, config });
+
+  router.use(middleware.error());
   return router;
 }
diff --git a/plugins/devtools-common/CHANGELOG.md b/plugins/devtools-common/CHANGELOG.md
index 5cc72c62ae..719d0a5dbc 100644
--- a/plugins/devtools-common/CHANGELOG.md
+++ b/plugins/devtools-common/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-devtools-common
 
+## 0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/devtools-common/package.json b/plugins/devtools-common/package.json
index 5a14202649..713f515400 100644
--- a/plugins/devtools-common/package.json
+++ b/plugins/devtools-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools-common",
-  "version": "0.1.12",
+  "version": "0.1.14-next.0",
   "description": "Common functionalities for the devtools plugin",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index a67473b9b1..8aac4d63cb 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @backstage/plugin-devtools
 
+## 0.1.22-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-devtools-common@0.1.14-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+
+## 0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-devtools-common@0.1.13
+  - @backstage/plugin-permission-react@0.4.28
+
+## 0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27
+
 ## 0.1.19
 
 ### Patch Changes
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index a130f51653..c1ea874878 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools",
-  "version": "0.1.19",
+  "version": "0.1.22-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "devtools",
diff --git a/plugins/devtools/report-alpha.api.md b/plugins/devtools/report-alpha.api.md
index 1b026d1f78..e3261e0f05 100644
--- a/plugins/devtools/report-alpha.api.md
+++ b/plugins/devtools/report-alpha.api.md
@@ -19,21 +19,6 @@ const _default: FrontendPlugin<
   },
   {},
   {
-    'api:devtools': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'page:devtools': ExtensionDefinition<{
       kind: 'page';
       name: undefined;
@@ -85,6 +70,21 @@ const _default: FrontendPlugin<
         routeRef: RouteRef<undefined>;
       };
     }>;
+    'api:devtools': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
   }
 >;
 export default _default;
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index 5330b1c41a..72260d13e4 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.4.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## 0.4.5
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.4.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## 0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## 0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/config.d.ts b/plugins/events-backend-module-aws-sqs/config.d.ts
index c2edfeae8e..f5a9457c82 100644
--- a/plugins/events-backend-module-aws-sqs/config.d.ts
+++ b/plugins/events-backend-module-aws-sqs/config.d.ts
@@ -48,12 +48,12 @@ export interface Config {
                 /**
                  * (Optional) Visibility timeout for messages in flight.
                  */
-                visibilityTimeout: HumanDuration;
+                visibilityTimeout: HumanDuration | string;
                 /**
                  * (Optional) Wait time when polling for available messages.
                  * Default: 20 seconds.
                  */
-                waitTime: HumanDuration;
+                waitTime: HumanDuration | string;
               };
               /**
                * (Optional) Timeout for the task execution which includes polling for messages
@@ -62,12 +62,12 @@ export interface Config {
                *
                * Must be greater than `queue.waitTime` + `waitTimeAfterEmptyReceive`.
                */
-              timeout: HumanDuration;
+              timeout: HumanDuration | string;
               /**
                * (Optional) Wait time before polling again if no message was received.
                * Default: 1 minute.
                */
-              waitTimeAfterEmptyReceive: HumanDuration;
+              waitTimeAfterEmptyReceive: HumanDuration | string;
             };
           };
         };
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index cd2f487fb9..dd051c85bd 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-aws-sqs",
-  "version": "0.4.3",
+  "version": "0.4.6-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-aws-sqs/src/publisher/config.ts b/plugins/events-backend-module-aws-sqs/src/publisher/config.ts
index 7bad1e38d1..fb553fde40 100644
--- a/plugins/events-backend-module-aws-sqs/src/publisher/config.ts
+++ b/plugins/events-backend-module-aws-sqs/src/publisher/config.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
-import { HumanDuration, JsonObject } from '@backstage/types';
+import { Config, readDurationFromConfig } from '@backstage/config';
+import { HumanDuration } from '@backstage/types';
 import { Duration } from 'luxon';
 
 const CONFIG_PREFIX_MODULE = 'events.modules.awsSqs.';
@@ -39,7 +39,7 @@ function readOptionalHumanDuration(
   config: Config,
   key: string,
 ): HumanDuration | undefined {
-  return config.getOptional<JsonObject>(key) as HumanDuration;
+  return config.has(key) ? readDurationFromConfig(config, { key }) : undefined;
 }
 
 function readOptionalDuration(
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index 4ab0e10451..a1072f96f3 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 62374cb8a9..2164f96939 100644
--- a/plugins/events-backend-module-azure/package.json
+++ b/plugins/events-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-azure",
-  "version": "0.2.12",
+  "version": "0.2.15-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index 54e53c18fe..1c363bdf7d 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 17e182d137..2d6b86abba 100644
--- a/plugins/events-backend-module-bitbucket-cloud/package.json
+++ b/plugins/events-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-bitbucket-cloud",
-  "version": "0.2.12",
+  "version": "0.2.15-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index c649c2ecfb..37fbc34575 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 08ac1c7e07..5cfd52ee0a 100644
--- a/plugins/events-backend-module-gerrit/package.json
+++ b/plugins/events-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gerrit",
-  "version": "0.2.12",
+  "version": "0.2.15-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index 332d80f2fa..8cf4a05752 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,85 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+
+## 0.2.14
+
+### Patch Changes
+
+- 9816f51: Fix the event request validation for incoming requests for GitHub webhook events
+  by using the raw body when verifying the signature.
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.14-next.3
+
+### Patch Changes
+
+- 9816f51: Fix the event request validation for incoming requests for GitHub webhook events
+  by using the raw body when verifying the signature.
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 3d12489ee9..17a920bc3c 100644
--- a/plugins/events-backend-module-github/package.json
+++ b/plugins/events-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-github",
-  "version": "0.2.12",
+  "version": "0.2.15-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.test.ts b/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.test.ts
index 32d67437a8..3c96c98996 100644
--- a/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.test.ts
+++ b/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.test.ts
@@ -47,8 +47,9 @@ describe('createGithubSignatureValidator', () => {
       },
     },
   });
-  const payload = { test: 'payload' };
-  const payloadString = JSON.stringify(payload);
+  const payloadString = '{"test": "payload", "score": 5.0}';
+  const payload = JSON.parse(payloadString);
+  const payloadBuffer = Buffer.from(payloadString);
   const validSignature = sign({ secret, algorithm: 'sha256' }, payloadString);
 
   const requestWithSignature = async (signature: string | undefined) => {
@@ -57,6 +58,10 @@ describe('createGithubSignatureValidator', () => {
       headers: {
         'x-hub-signature-256': signature,
       },
+      raw: {
+        body: payloadBuffer,
+        encoding: 'utf-8',
+      },
     } as RequestDetails;
   };
 
diff --git a/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.ts b/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.ts
index e977640ce8..87cb710697 100644
--- a/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.ts
+++ b/plugins/events-backend-module-github/src/http/createGithubSignatureValidator.ts
@@ -48,7 +48,11 @@ export function createGithubSignatureValidator(
 
     if (
       !signature ||
-      !(await verify(secret, JSON.stringify(request.body), signature))
+      !(await verify(
+        secret,
+        request.raw.body.toString(request.raw.encoding),
+        signature,
+      ))
     ) {
       context.reject({
         status: 403,
diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
index 460022b04d..ec5ec66946 100644
--- a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
+++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts
@@ -25,8 +25,9 @@ import { eventsModuleGithubWebhook } from './eventsModuleGithubWebhook';
 
 describe('eventsModuleGithubWebhook', () => {
   const secret = 'valid-secret';
-  const payload = { test: 'payload' };
-  const payloadString = JSON.stringify(payload);
+  const payloadString = '{"test": "payload", "score": 5.0}';
+  const payload = JSON.parse(payloadString);
+  const payloadBuffer = Buffer.from(payloadString);
   const validSignature = sign({ secret, algorithm: 'sha256' }, payloadString);
   const requestWithSignature = async (signature?: string) => {
     return {
@@ -34,6 +35,10 @@ describe('eventsModuleGithubWebhook', () => {
       headers: {
         'x-hub-signature-256': signature,
       },
+      raw: {
+        body: payloadBuffer,
+        encoding: 'utf-8',
+      },
     } as RequestDetails;
   };
 
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index f2366531ed..33c97e2ba3 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/config@1.3.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.2.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.2.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+
+## 0.2.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.2.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index 28a81d227d..3c28a76c43 100644
--- a/plugins/events-backend-module-gitlab/package.json
+++ b/plugins/events-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gitlab",
-  "version": "0.2.12",
+  "version": "0.2.15-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gitlab/src/http/createGitlabTokenValidator.test.ts b/plugins/events-backend-module-gitlab/src/http/createGitlabTokenValidator.test.ts
index 33e677450e..72fee279ea 100644
--- a/plugins/events-backend-module-gitlab/src/http/createGitlabTokenValidator.test.ts
+++ b/plugins/events-backend-module-gitlab/src/http/createGitlabTokenValidator.test.ts
@@ -49,11 +49,10 @@ describe('createGitlabTokenValidator', () => {
 
   const requestWithToken = (token: string | undefined) => {
     return {
-      body: undefined,
       headers: {
         'x-gitlab-token': token,
       },
-    } as RequestDetails;
+    } as Partial<RequestDetails> as unknown as RequestDetails;
   };
 
   it('no secret configured, throw error', async () => {
diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
index 9a4f4326da..d3452dd813 100644
--- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
+++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts
@@ -25,11 +25,10 @@ import { eventsModuleGitlabWebhook } from './eventsModuleGitlabWebhook';
 describe('gitlabWebhookEventsModule', () => {
   const requestWithToken = (token?: string) => {
     return {
-      body: undefined,
       headers: {
         'x-gitlab-token': token,
       },
-    } as RequestDetails;
+    } as Partial<RequestDetails> as unknown as RequestDetails;
   };
 
   it('should be correctly wired and set up', async () => {
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index 500ed93343..f219442710 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.39-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.2
+
+## 0.1.39-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.6-next.0
+
+## 0.1.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5
+
+## 0.1.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+
+## 0.1.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+
+## 0.1.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.1.38-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+
 ## 0.1.36
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 149d6a3d13..d6c40af29f 100644
--- a/plugins/events-backend-test-utils/package.json
+++ b/plugins/events-backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-test-utils",
-  "version": "0.1.36",
+  "version": "0.1.39-next.2",
   "description": "The plugin-events-backend-test-utils for @backstage/plugin-events-node",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/events-backend/CHANGELOG.md b/plugins/events-backend/CHANGELOG.md
index 6f9cafd675..fe8e168607 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,120 @@
 # @backstage/plugin-events-backend
 
+## 0.4.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.4.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.3.17-next.0
+
+### Patch Changes
+
+- 1577511: Allow configuring a timeout for event bus polling requests. This can be set like so in your app-config:
+
+  ```yaml
+  events:
+    notifyTimeoutMs: 30000
+  ```
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.16
+
+### Patch Changes
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- b7d0334: Cleaning up event subscriptions after the max age window
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/errors@1.2.5
+
+## 0.3.16-next.3
+
+### Patch Changes
+
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.3.16-next.2
+
+### Patch Changes
+
+- b7d0334: Cleaning up event subscriptions after the max age window
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.3.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.3.15-next.0
+
+### Patch Changes
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.3.13
 
 ### Patch Changes
diff --git a/plugins/events-backend/config.d.ts b/plugins/events-backend/config.d.ts
index 3d26661855..ffeafdcbd5 100644
--- a/plugins/events-backend/config.d.ts
+++ b/plugins/events-backend/config.d.ts
@@ -16,6 +16,12 @@
 
 export interface Config {
   events?: {
+    /**
+     * Timeout in milliseconds for how long to wait before closing subscription events
+     * requests to ensure they don't stall or that events get stuck. Defaults to 55 seconds.
+     */
+    notifyTimeoutMs?: number;
+
     http?: {
       /**
        * Topics for which a route has to be registered
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index 50de8f5cb5..39d6068d3b 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend",
-  "version": "0.3.13",
+  "version": "0.4.0-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "events",
@@ -61,6 +61,7 @@
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "@types/express": "^4.17.6",
+    "content-type": "^1.0.5",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "knex": "^3.0.0",
@@ -73,6 +74,7 @@
     "@backstage/cli": "workspace:^",
     "@backstage/plugin-events-backend-test-utils": "workspace:^",
     "@backstage/repo-tools": "workspace:^",
+    "@types/content-type": "^1.1.8",
     "supertest": "^7.0.0"
   },
   "configSchema": "config.d.ts"
diff --git a/plugins/events-backend/src/schema/openapi/generated/apis/Api.server.ts b/plugins/events-backend/src/schema/openapi/generated/apis/Api.server.ts
new file mode 100644
index 0000000000..4a1efdfe67
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/apis/Api.server.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { GetSubscriptionEvents200Response } from '../models/GetSubscriptionEvents200Response.model';
+import { PostEventRequest } from '../models/PostEventRequest.model';
+import { PutSubscriptionRequest } from '../models/PutSubscriptionRequest.model';
+
+/**
+ * @public
+ */
+export type GetSubscriptionEvents = {
+  path: {
+    subscriptionId: string;
+  };
+  response: GetSubscriptionEvents200Response | void | Error;
+};
+/**
+ * @public
+ */
+export type PostEvent = {
+  body: PostEventRequest;
+  response: void | void | Error;
+};
+/**
+ * @public
+ */
+export type PutSubscription = {
+  path: {
+    subscriptionId: string;
+  };
+  body: PutSubscriptionRequest;
+  response: void | Error;
+};
+
+export type EndpointMap = {
+  '#get|/bus/v1/subscriptions/{subscriptionId}/events': GetSubscriptionEvents;
+
+  '#post|/bus/v1/events': PostEvent;
+
+  '#put|/bus/v1/subscriptions/{subscriptionId}': PutSubscription;
+};
diff --git a/plugins/events-backend/src/schema/openapi/generated/apis/index.ts b/plugins/events-backend/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..a3cdbbebd2
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/apis/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+export * from './Api.server';
diff --git a/plugins/events-backend/src/schema/openapi/generated/index.ts b/plugins/events-backend/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..69c39313c6
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './apis';
+export * from './router';
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..0a51c67fef
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/Event.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/Event.model.ts
new file mode 100644
index 0000000000..edd88b0738
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/Event.model.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface Event {
+  /**
+   * The topic that the event is published on
+   */
+  topic: string;
+  /**
+   * The event payload
+   */
+  payload: any | null;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts
new file mode 100644
index 0000000000..3ca3282f47
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Event } from '../models/Event.model';
+
+/**
+ * @public
+ */
+export interface GetSubscriptionEvents200Response {
+  events: Array<Event>;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..3e6af947ec
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  error: ErrorError;
+  request: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/PostEventRequest.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/PostEventRequest.model.ts
new file mode 100644
index 0000000000..cfaf66ce4f
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/PostEventRequest.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Event } from '../models/Event.model';
+
+/**
+ * @public
+ */
+export interface PostEventRequest {
+  event: Event;
+  /**
+   * The IDs of subscriptions that have already received this event
+   */
+  notifiedSubscribers?: Array<string>;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts b/plugins/events-backend/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts
new file mode 100644
index 0000000000..a1dc298789
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface PutSubscriptionRequest {
+  /**
+   * The topics to subscribe to
+   */
+  topics: Array<string>;
+}
diff --git a/plugins/events-backend/src/schema/openapi/generated/models/index.ts b/plugins/events-backend/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..5044f65fff
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/Event.model';
+export * from '../models/GetSubscriptionEvents200Response.model';
+export * from '../models/ModelError.model';
+export * from '../models/PostEventRequest.model';
+export * from '../models/PutSubscriptionRequest.model';
diff --git a/plugins/events-backend/src/schema/openapi.generated.ts b/plugins/events-backend/src/schema/openapi/generated/router.ts
similarity index 95%
rename from plugins/events-backend/src/schema/openapi.generated.ts
rename to plugins/events-backend/src/schema/openapi/generated/router.ts
index 8f8d6c6a82..3c43880170 100644
--- a/plugins/events-backend/src/schema/openapi.generated.ts
+++ b/plugins/events-backend/src/schema/openapi/generated/router.ts
@@ -17,7 +17,8 @@
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import { createValidatedOpenApiRouter } from '@backstage/backend-openapi-utils';
+import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
+import { EndpointMap } from './';
 
 export const spec = {
   openapi: '3.0.3',
@@ -287,5 +288,11 @@ export const spec = {
   },
 } as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<
+    typeof createValidatedOpenApiRouterFromGeneratedEndpointMap
+  >['1'],
+) =>
+  createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(
+    spec,
+    options,
+  );
diff --git a/plugins/events-backend/src/schema/openapi/index.ts b/plugins/events-backend/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/events-backend/src/schema/openapi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './generated';
diff --git a/plugins/events-backend/src/service/EventsPlugin.test.ts b/plugins/events-backend/src/service/EventsPlugin.test.ts
index 2c0befe1fd..35813d7b8e 100644
--- a/plugins/events-backend/src/service/EventsPlugin.test.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.test.ts
@@ -83,14 +83,16 @@ describe('eventsPlugin', () => {
 
     const response1 = await request(server)
       .post('/api/events/http/fake')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'fake' });
+      .send(JSON.stringify({ test: 'fake' }));
     expect(response1.status).toBe(202);
 
     const response2 = await request(server)
       .post('/api/events/http/fake-ext')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'fake-ext' });
+      .send(JSON.stringify({ test: 'fake-ext' }));
     expect(response2.status).toBe(202);
 
     expect(eventsService.published).toHaveLength(2);
@@ -144,9 +146,7 @@ describe('eventsPlugin', () => {
 
     async function mockKnexFactory(databaseId: TestDatabaseId) {
       const knex = await databases.init(databaseId);
-      return mockServices.database.mock({
-        getClient: async () => knex,
-      }).factory;
+      return mockServices.database.factory({ knex });
     }
 
     let backend: TestBackend | undefined = undefined;
diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts
index 10af3798ec..a837e69c32 100644
--- a/plugins/events-backend/src/service/EventsPlugin.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.ts
@@ -76,21 +76,21 @@ export const eventsPlugin = createBackendPlugin({
         config: coreServices.rootConfig,
         events: eventsServiceRef,
         database: coreServices.database,
+        httpAuth: coreServices.httpAuth,
+        httpRouter: coreServices.httpRouter,
+        lifecycle: coreServices.lifecycle,
         logger: coreServices.logger,
         scheduler: coreServices.scheduler,
-        lifecycle: coreServices.lifecycle,
-        httpAuth: coreServices.httpAuth,
-        router: coreServices.httpRouter,
       },
       async init({
         config,
         events,
         database,
+        httpAuth,
+        httpRouter,
+        lifecycle,
         logger,
         scheduler,
-        lifecycle,
-        httpAuth,
-        router,
       }) {
         const ingresses = Object.fromEntries(
           extensionPoint.httpPostIngresses.map(ingress => [
@@ -108,18 +108,27 @@ export const eventsPlugin = createBackendPlugin({
         const eventsRouter = Router();
         http.bind(eventsRouter);
 
-        router.use(
+        // MUST be registered *before* the event bus router.
+        // Otherwise, it would already make use of `express.json()`
+        // that is used there as part of the middleware stack.
+        httpRouter.use(eventsRouter);
+
+        const notifyTimeoutMs = config.getOptionalNumber(
+          'events.notifyTimeoutMs',
+        );
+
+        httpRouter.use(
           await createEventBusRouter({
             database,
+            lifecycle,
             logger,
             httpAuth,
             scheduler,
-            lifecycle,
+            notifyTimeoutMs,
           }),
         );
 
-        router.use(eventsRouter);
-        router.addAuthPolicy({
+        httpRouter.addAuthPolicy({
           allow: 'unauthenticated',
           path: '/http',
         });
diff --git a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
index 2bffa4e511..32a24de169 100644
--- a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
+++ b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
@@ -50,22 +50,25 @@ describe('HttpPostIngressEventPublisher', () => {
 
     const notFoundResponse = await request(app)
       .post('/http/unknown')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(notFoundResponse.status).toBe(404);
 
     const response1 = await request(app)
       .post('/http/testA')
+      .type('application/json')
       .set('X-Custom-Header', 'test-value')
       .timeout(1000)
-      .send({ testA: 'data' });
+      .send(JSON.stringify({ testA: 'data' }));
     expect(response1.status).toBe(202);
 
     const response2 = await request(app)
       .post('/http/testB')
+      .type('application/json')
       .set('X-Custom-Header', 'test-value')
       .timeout(1000)
-      .send({ testB: 'data' });
+      .send(JSON.stringify({ testB: 'data' }));
     expect(response2.status).toBe(202);
 
     expect(events.published).toHaveLength(2);
@@ -87,6 +90,124 @@ describe('HttpPostIngressEventPublisher', () => {
     );
   });
 
+  it('no raw body', async () => {
+    const config = new ConfigReader({
+      events: {
+        http: {
+          topics: ['testA'],
+        },
+      },
+    });
+
+    const router = Router();
+    router.use(express.json()); // will prevent the raw body from being available
+    const app = express().use(router);
+    const events = new TestEventsService();
+
+    const publisher = HttpPostIngressEventPublisher.fromConfig({
+      config,
+      events,
+      logger,
+    });
+    publisher.bind(router);
+
+    const response = await request(app)
+      .post('/http/testA')
+      .type('application/json; charset=utf-8')
+      .timeout(1000)
+      .send(JSON.stringify({ testA: 'data' }));
+    expect(response.status).toBe(500);
+    expect(response.body).toEqual(
+      expect.objectContaining({
+        error: {
+          message:
+            'Failed to retrieve raw body from incoming event for topic testA; not a buffer: object',
+          name: 'Error',
+        },
+        request: { method: 'POST', url: '/testA' },
+        response: { statusCode: 500 },
+      }),
+    );
+  });
+
+  it('invalid charset', async () => {
+    const config = new ConfigReader({
+      events: {
+        http: {
+          topics: ['testA'],
+        },
+      },
+    });
+
+    const router = Router();
+    const app = express().use(router);
+    const events = new TestEventsService();
+
+    const publisher = HttpPostIngressEventPublisher.fromConfig({
+      config,
+      events,
+      logger,
+    });
+    publisher.bind(router);
+
+    const response = await request(app)
+      .post('/http/testA')
+      .type('application/json; charset=invalid')
+      .timeout(1000)
+      .send(JSON.stringify({ testA: 'data' }));
+    expect(response.status).toBe(415);
+    expect(response.body).toEqual(
+      expect.objectContaining({
+        error: {
+          message: 'Unsupported charset: invalid',
+          name: 'UnsupportedCharsetError',
+          statusCode: 415,
+        },
+        request: { method: 'POST', url: '/testA' },
+        response: { statusCode: 415 },
+      }),
+    );
+  });
+
+  it('non-JSON media type', async () => {
+    const config = new ConfigReader({
+      events: {
+        http: {
+          topics: ['testA'],
+        },
+      },
+    });
+
+    const router = Router();
+    const app = express().use(router);
+    const events = new TestEventsService();
+
+    const publisher = HttpPostIngressEventPublisher.fromConfig({
+      config,
+      events,
+      logger,
+    });
+    publisher.bind(router);
+
+    const response = await request(app)
+      .post('/http/testA')
+      .type('text/plain')
+      .timeout(1000)
+      .send('Textual information');
+    expect(response.status).toBe(415);
+    expect(response.body).toEqual(
+      expect.objectContaining({
+        error: {
+          message: 'Unsupported media type: text/plain',
+          name: 'UnsupportedMediaTypeError',
+          statusCode: 415,
+        },
+        request: { method: 'POST', url: '/testA' },
+        response: { statusCode: 415 },
+      }),
+    );
+  });
+
   it('with validator', async () => {
     const config = new ConfigReader({
       events: {
@@ -149,43 +270,49 @@ describe('HttpPostIngressEventPublisher', () => {
 
     const response1 = await request(app)
       .post('/http/testA')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response1.status).toBe(202);
 
     const response2 = await request(app)
       .post('/http/testB')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response2.status).toBe(400);
     expect(response2.body).toEqual({ message: 'wrong signature' });
 
     const response3 = await request(app)
       .post('/http/testB')
+      .type('application/json')
       .set('X-Test-Signature', 'wrong')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response3.status).toBe(400);
     expect(response3.body).toEqual({ message: 'wrong signature' });
 
     const response4 = await request(app)
       .post('/http/testB')
+      .type('application/json')
       .set('X-Test-Signature', 'testB-signature')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response4.status).toBe(202);
 
     const response5 = await request(app)
       .post('/http/testC')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response5.status).toBe(404);
     expect(response5.body).toEqual({});
 
     const response6 = await request(app)
       .post('/http/testD')
+      .type('application/json')
       .timeout(1000)
-      .send({ test: 'data' });
+      .send(JSON.stringify({ test: 'data' }));
     expect(response6.status).toBe(403);
     expect(response6.body).toEqual({});
 
diff --git a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
index 06dc4e463a..fe17186856 100644
--- a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
+++ b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
@@ -17,15 +17,35 @@
 import { errorHandler } from '@backstage/backend-common';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
+import { CustomErrorBase } from '@backstage/errors';
 import {
   EventsService,
   HttpPostIngressOptions,
   RequestValidator,
 } from '@backstage/plugin-events-node';
+import contentType from 'content-type';
 import express from 'express';
 import Router from 'express-promise-router';
 import { RequestValidationContextImpl } from './validation';
 
+class UnsupportedCharsetError extends CustomErrorBase {
+  name = 'UnsupportedCharsetError' as const;
+  statusCode = 415 as const;
+
+  constructor(charset: string) {
+    super(`Unsupported charset: ${charset}`);
+  }
+}
+
+class UnsupportedMediaTypeError extends CustomErrorBase {
+  name = 'UnsupportedMediaTypeError' as const;
+  statusCode = 415 as const;
+
+  constructor(mediaType?: string) {
+    super(`Unsupported media type: ${mediaType ?? 'unknown'}`);
+  }
+}
+
 /**
  * Publishes events received from their origin (e.g., webhook events from an SCM system)
  * via HTTP POST endpoint and passes the request body as event payload to the registered subscribers.
@@ -71,7 +91,7 @@ export class HttpPostIngressEventPublisher {
     [topic: string]: Omit<HttpPostIngressOptions, 'topic'>;
   }): express.Router {
     const router = Router();
-    router.use(express.json());
+    router.use(express.raw({ type: '*/*' }));
 
     Object.keys(ingresses).forEach(topic =>
       this.addRouteForTopic(router, topic, ingresses[topic].validator),
@@ -87,25 +107,60 @@ export class HttpPostIngressEventPublisher {
     validator?: RequestValidator,
   ): void {
     const path = `/${topic}`;
+    const logger = this.logger;
 
     router.post(path, async (request, response) => {
-      const requestDetails = {
-        body: request.body,
-        headers: request.headers,
-      };
-      const context = new RequestValidationContextImpl();
-      await validator?.(requestDetails, context);
-      if (context.wasRejected()) {
-        response
-          .status(context.rejectionDetails!.status)
-          .json(context.rejectionDetails!.payload);
-        return;
+      const requestBody = request.body;
+      if (!Buffer.isBuffer(requestBody)) {
+        throw new Error(
+          `Failed to retrieve raw body from incoming event for topic ${topic}; not a buffer: ${typeof requestBody}`,
+        );
+      }
+
+      const bodyBuffer: Buffer = requestBody;
+      const parsedContentType = contentType.parse(request);
+      if (
+        !parsedContentType.type ||
+        parsedContentType.type !== 'application/json'
+      ) {
+        throw new UnsupportedMediaTypeError(parsedContentType.type);
+      }
+
+      const encoding = parsedContentType.parameters.charset ?? 'utf-8';
+      if (!Buffer.isEncoding(encoding)) {
+        throw new UnsupportedCharsetError(encoding);
+      }
+
+      const bodyString = bodyBuffer.toString(encoding);
+      const bodyParsed =
+        parsedContentType.type === 'application/json'
+          ? JSON.parse(bodyString)
+          : bodyString;
+
+      if (validator) {
+        const requestDetails = {
+          body: bodyParsed,
+          headers: request.headers,
+          raw: {
+            body: bodyBuffer,
+            encoding: encoding as BufferEncoding,
+          },
+        };
+
+        const context = new RequestValidationContextImpl();
+        await validator(requestDetails, context);
+
+        if (context.wasRejected()) {
+          response
+            .status(context.rejectionDetails!.status)
+            .json(context.rejectionDetails!.payload);
+          return;
+        }
       }
 
-      const eventPayload = request.body;
       await this.events.publish({
         topic,
-        eventPayload,
+        eventPayload: bodyParsed,
         metadata: request.headers,
       });
 
@@ -114,6 +169,6 @@ export class HttpPostIngressEventPublisher {
 
     // TODO(pjungermann): We don't really know the externally defined path prefix here,
     //  however it is more useful for users to have it. Is there a better way?
-    this.logger.info(`Registered /api/events/http${path} to receive events`);
+    logger.info(`Registered /api/events/http${path} to receive events`);
   }
 }
diff --git a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
index 107dabfc27..6572bdbfc6 100644
--- a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
+++ b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
@@ -602,7 +602,9 @@ export class DatabaseEventBusStore implements EventBusStore {
       if (minId === null) {
         // No events left, remove all subscribers. This can happen if no events
         // are published within the max age window.
-        subscriberCount = await this.#db(TABLE_SUBSCRIPTIONS).delete();
+        subscriberCount = await this.#db(TABLE_SUBSCRIPTIONS)
+          .where('updated_at', '<', new Date(Date.now() - this.#windowMaxAge))
+          .delete();
       } else {
         subscriberCount = await this.#db(TABLE_SUBSCRIPTIONS)
           .delete()
diff --git a/plugins/events-backend/src/service/hub/createEventBusRouter.ts b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
index 4a332d5ce5..e8dc8ef113 100644
--- a/plugins/events-backend/src/service/hub/createEventBusRouter.ts
+++ b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
@@ -22,11 +22,14 @@ import {
   SchedulerService,
 } from '@backstage/backend-plugin-api';
 import { Handler } from 'express';
-import { createOpenApiRouter } from '../../schema/openapi.generated';
+import { createOpenApiRouter } from '../../schema/openapi';
 import { MemoryEventBusStore } from './MemoryEventBusStore';
 import { DatabaseEventBusStore } from './DatabaseEventBusStore';
 import { EventBusStore } from './types';
-import { EventParams } from '@backstage/plugin-events-node';
+import {
+  EVENTS_NOTIFY_TIMEOUT_HEADER,
+  EventParams,
+} from '@backstage/plugin-events-node';
 
 const DEFAULT_NOTIFY_TIMEOUT_MS = 55_000; // Just below 60s, which is a common HTTP timeout
 
@@ -229,6 +232,10 @@ export async function createEventBusRouter(options: {
             })),
           });
         } else {
+          res.setHeader(
+            EVENTS_NOTIFY_TIMEOUT_HEADER,
+            notifyTimeoutMs.toString(),
+          );
           res.status(202);
           res.flushHeaders();
 
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index 7356f663d8..a1d6a6114e 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,102 @@
 # @backstage/plugin-events-node
 
+## 0.4.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/types@1.2.0
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.4.6-next.0
+
+### Patch Changes
+
+- 79a06f6: Clarified purpose of subscriber ID in TSDoc for `EventsServiceSubscribeOptions`.
+- 1577511: Allow configuring a timeout for event bus polling requests. This can be set like so in your app-config:
+
+  ```yaml
+  events:
+    notifyTimeoutMs: 30000
+  ```
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.4.5
+
+### Patch Changes
+
+- 4501631: Fixed an issue where subscribing to events threw an error and gave up too easily. Calling the subscribe method will cause the background polling loop to keep trying to connect to the events backend, even if the initial request fails.
+
+  By default the events service will attempt to publish and subscribe to events from the events bus API in the events backend, but if it fails due to the events backend not being installed, it will bail and never try calling the API again. There is now a new `events.useEventBus` configuration and option for the `DefaultEventsService` that lets you control this behavior. You can set it to `'never'` to disabled API calls to the events backend completely, or `'always'` to never allow it to be disabled.
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- 5d74716: Remove unused backend-common dependency
+- 0b57aa1: Fixed an issue where the event bus polling would duplicate and increase exponentially over time.
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 0.4.5-next.3
+
+### Patch Changes
+
+- 9816f51: Add raw body information to `RequestDetails`
+  and use the raw body when validating incoming event requests.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.4.5-next.2
+
+### Patch Changes
+
+- 0b57aa1: Fixed an issue where the event bus polling would duplicate and increase exponentially over time.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- 4501631: Fixed an issue where subscribing to events threw an error and gave up too easily. Calling the subscribe method will cause the background polling loop to keep trying to connect to the events backend, even if the initial request fails.
+
+  By default the events service will attempt to publish and subscribe to events from the events bus API in the events backend, but if it fails due to the events backend not being installed, it will bail and never try calling the API again. There is now a new `events.useEventBus` configuration and option for the `DefaultEventsService` that lets you control this behavior. You can set it to `'never'` to disabled API calls to the events backend completely, or `'always'` to never allow it to be disabled.
+
+- e02a02b: Fix `events.useEventBus` by propagating config to `DefaultEventsService`
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index f9e5ee1ff6..62653d2966 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-node",
-  "version": "0.4.1",
+  "version": "0.4.6-next.2",
   "description": "The plugin-events-node module for @backstage/plugin-events-backend",
   "backstage": {
     "role": "node-library",
@@ -59,7 +59,6 @@
     "uri-template": "^2.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "msw": "^1.0.0"
diff --git a/plugins/events-node/report.api.md b/plugins/events-node/report.api.md
index a9e028e049..f53bb251ec 100644
--- a/plugins/events-node/report.api.md
+++ b/plugins/events-node/report.api.md
@@ -3,6 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="node" />
+
 import { AuthService } from '@backstage/backend-plugin-api';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { LifecycleService } from '@backstage/backend-plugin-api';
@@ -72,6 +74,9 @@ export abstract class EventRouter {
   subscribe(): Promise<void>;
 }
 
+// @public (undocumented)
+export const EVENTS_NOTIFY_TIMEOUT_HEADER = 'backstage-events-notify-timeout';
+
 // @public
 export interface EventsService {
   publish(params: EventParams): Promise<void>;
@@ -114,10 +119,14 @@ export interface HttpPostIngressOptions {
   validator?: RequestValidator;
 }
 
-// @public (undocumented)
+// @public
 export interface RequestDetails {
   body: unknown;
   headers: Record<string, string | string[] | undefined>;
+  raw: {
+    body: Buffer;
+    encoding: BufferEncoding;
+  };
 }
 
 // @public
diff --git a/plugins/events-node/src/api/DefaultEventsService.test.ts b/plugins/events-node/src/api/DefaultEventsService.test.ts
index d2fda67d6c..13a6a68fa4 100644
--- a/plugins/events-node/src/api/DefaultEventsService.test.ts
+++ b/plugins/events-node/src/api/DefaultEventsService.test.ts
@@ -16,6 +16,7 @@
 
 import { DefaultEventsService } from './DefaultEventsService';
 import { EventParams } from './EventParams';
+import { EVENTS_NOTIFY_TIMEOUT_HEADER } from './EventsService';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import {
@@ -160,6 +161,189 @@ describe('DefaultEventsService', () => {
       await (service as any).shutdown();
     });
 
+    it('should wait an poll on timeout', async () => {
+      const logger = mockServices.logger.mock();
+      const service = DefaultEventsService.create({ logger }).forPlugin('a', {
+        auth: mockServices.auth(),
+        logger,
+        discovery: mockServices.discovery(),
+        lifecycle: mockServices.lifecycle.mock(),
+      });
+
+      let callCount = 0;
+
+      let blockingController: ReadableStreamDefaultController;
+      const blockingStream = new ReadableStream({
+        start(controller) {
+          blockingController = controller;
+        },
+      });
+
+      mswServer.use(
+        rest.put(
+          'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
+          (_req, res, ctx) => res(ctx.status(200)),
+        ),
+        // The first and third calls result in a blocking 202 that is resolved after 100ms
+        // The second and fourth calls result in a 200 with an event
+        // The fifth call blocks until the end of the test
+        // No more than 5 calls should be made
+        rest.get(
+          'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
+          (_req, res, ctx) => {
+            callCount += 1;
+            if (callCount === 1 || callCount === 3) {
+              return res(
+                ctx.status(202),
+                ctx.body(
+                  new ReadableStream({
+                    start(controller) {
+                      setTimeout(() => controller.close(), 100);
+                    },
+                  }),
+                ),
+              );
+            } else if (callCount === 2 || callCount === 4) {
+              return res(
+                ctx.status(200),
+                ctx.json({
+                  events: [{ topic: 'test', payload: { callCount } }],
+                }),
+              );
+            } else if (callCount === 5) {
+              return res(ctx.status(202), ctx.body(blockingStream));
+            }
+            throw new Error(`events endpoint called too many times`);
+          },
+        ),
+      );
+
+      const event = await new Promise(resolve => {
+        const events = new Array<EventParams>();
+        service.subscribe({
+          id: 'tester',
+          topics: ['test'],
+          async onEvent(newEvent) {
+            events.push(newEvent);
+            if (events.length === 2) {
+              resolve(events);
+            }
+          },
+        });
+      });
+
+      expect(event).toEqual([
+        { topic: 'test', eventPayload: { callCount: 2 } },
+        { topic: 'test', eventPayload: { callCount: 4 } },
+      ]);
+
+      // Wait to make sure no additional calls happen
+      await new Promise(resolve => setTimeout(resolve, 100));
+
+      expect(callCount).toBe(5);
+
+      // Internal call to clean up subscriptions
+      await (service as any).shutdown();
+
+      // Close the stream for the 5th call so that we don't leave the request hanging
+      blockingController!.close();
+    });
+
+    it('should timeout polling if the response has a timeout header', async () => {
+      const logger = mockServices.logger.mock();
+      const service = DefaultEventsService.create({ logger }).forPlugin('a', {
+        auth: mockServices.auth(),
+        logger,
+        discovery: mockServices.discovery(),
+        lifecycle: mockServices.lifecycle.mock(),
+      });
+
+      let callCount = 0;
+
+      let blockingController: ReadableStreamDefaultController;
+      const blockingStream = new ReadableStream({
+        start(controller) {
+          blockingController = controller;
+        },
+      });
+
+      mswServer.use(
+        rest.put(
+          'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
+          (_req, res, ctx) => res(ctx.status(200)),
+        ),
+        // The first and third calls result in a blocking 202 that is resolved after 100ms
+        // The second and fourth calls result in a 200 with an event
+        // The fifth call blocks until the end of the test
+        // No more than 5 calls should be made
+        rest.get(
+          'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
+          (_req, res, ctx) => {
+            callCount += 1;
+            if (callCount === 1 || callCount === 3) {
+              return res(
+                ctx.status(202),
+                ctx.body(
+                  new ReadableStream({
+                    start(controller) {
+                      setTimeout(() => controller.close(), 100);
+                    },
+                  }),
+                ),
+              );
+            } else if (callCount === 2 || callCount === 4) {
+              return res(
+                ctx.status(200),
+                ctx.json({
+                  events: [{ topic: 'test', payload: { callCount } }],
+                }),
+              );
+            } else if (callCount === 5) {
+              // 5th call has a timeout header so polling should proceed to the next call
+              return res(
+                ctx.set(EVENTS_NOTIFY_TIMEOUT_HEADER, '100'),
+                ctx.status(202),
+                ctx.body(blockingStream),
+              );
+            } else if (callCount === 6) {
+              return res(ctx.status(202), ctx.body(blockingStream));
+            }
+            throw new Error(`events endpoint called too many times`);
+          },
+        ),
+      );
+
+      const event = await new Promise(resolve => {
+        const events = new Array<EventParams>();
+        service.subscribe({
+          id: 'tester',
+          topics: ['test'],
+          async onEvent(newEvent) {
+            events.push(newEvent);
+            if (events.length === 2) {
+              resolve(events);
+            }
+          },
+        });
+      });
+
+      expect(event).toEqual([
+        { topic: 'test', eventPayload: { callCount: 2 } },
+        { topic: 'test', eventPayload: { callCount: 4 } },
+      ]);
+
+      // Wait to allow timeout to trigger and make sure no additional calls happen
+      await new Promise(resolve => setTimeout(resolve, 2000));
+
+      expect(callCount).toBe(6);
+
+      // Internal call to clean up subscriptions
+      await (service as any).shutdown();
+
+      // Close the stream for the 5th call so that we don't leave the request hanging
+      blockingController!.close();
+    });
+
     it('should not read events from bus if disabled', async () => {
       const logger = mockServices.logger.mock();
       const service = DefaultEventsService.create({
diff --git a/plugins/events-node/src/api/DefaultEventsService.ts b/plugins/events-node/src/api/DefaultEventsService.ts
index 4eafd7d389..3ceed45a26 100644
--- a/plugins/events-node/src/api/DefaultEventsService.ts
+++ b/plugins/events-node/src/api/DefaultEventsService.ts
@@ -22,7 +22,11 @@ import {
   RootConfigService,
 } from '@backstage/backend-plugin-api';
 import { EventParams } from './EventParams';
-import { EventsService, EventsServiceSubscribeOptions } from './EventsService';
+import {
+  EVENTS_NOTIFY_TIMEOUT_HEADER,
+  EventsService,
+  EventsServiceSubscribeOptions,
+} from './EventsService';
 import { DefaultApiClient } from '../generated';
 import { ResponseError } from '@backstage/errors';
 
@@ -207,28 +211,35 @@ class PluginEventsService implements EventsService {
             { token },
           );
 
-          if (!res.ok) {
-            if (res.status === 404) {
-              this.logger.info(
-                `Polling event subscription resulted in a 404, recreating subscription`,
-              );
-              hasSubscription = false;
-            } else {
-              throw await ResponseError.fromResponse(res);
-            }
-          }
-
-          // Successful response, reset backoff
-          backoffMs = POLL_BACKOFF_START_MS;
-
-          // 202 means there were no immediately available events, but the
-          // response will block until either new events are available or the
-          // request times out. In both cases we should should try to read events
-          // immediately again
           if (res.status === 202) {
+            // 202 means there were no immediately available events, but the
+            // response will block until either new events are available or the
+            // request times out. In both cases we should should try to read events
+            // immediately again
+
             lock.release();
-            await res.body?.getReader()?.closed;
-            process.nextTick(poll);
+
+            const notifyTimeoutHeader = res.headers.get(
+              EVENTS_NOTIFY_TIMEOUT_HEADER,
+            );
+
+            // Add 1s to the timeout to allow the server to potentially timeout first
+            const notifyTimeoutMs =
+              notifyTimeoutHeader && !isNaN(parseInt(notifyTimeoutHeader, 10))
+                ? Number(notifyTimeoutHeader) + 1_000
+                : null;
+
+            await Promise.race(
+              [
+                // We don't actually expect any response body here, but waiting for
+                // an empty body to be returned has been more reliable that waiting
+                // for the response body stream to close.
+                res.text(),
+                notifyTimeoutMs
+                  ? new Promise(resolve => setTimeout(resolve, notifyTimeoutMs))
+                  : null,
+              ].filter(Boolean),
+            );
           } else if (res.status === 200) {
             const data = await res.json();
             if (data) {
@@ -245,10 +256,15 @@ class PluginEventsService implements EventsService {
                   );
                 }
               }
-            } else {
-              this.logger.warn(
-                `Unexpected response status ${res.status} from events backend for subscription "${subscriptionId}"`,
+            }
+          } else {
+            if (res.status === 404) {
+              this.logger.info(
+                `Polling event subscription resulted in a 404, recreating subscription`,
               );
+              hasSubscription = false;
+            } else {
+              throw await ResponseError.fromResponse(res);
             }
           }
         }
@@ -276,6 +292,9 @@ class PluginEventsService implements EventsService {
           }
         }
 
+        // No errors, reset backoff
+        backoffMs = POLL_BACKOFF_START_MS;
+
         process.nextTick(poll);
       } catch (error) {
         this.logger.warn(
diff --git a/plugins/events-node/src/api/EventsService.ts b/plugins/events-node/src/api/EventsService.ts
index 7af13f9b07..6547ea9889 100644
--- a/plugins/events-node/src/api/EventsService.ts
+++ b/plugins/events-node/src/api/EventsService.ts
@@ -44,7 +44,7 @@ export interface EventsService {
  */
 export type EventsServiceSubscribeOptions = {
   /**
-   * Identifier for the subscription. E.g., used as part of log messages.
+   * Subscriber ID that is scoped to the calling plugin. Subscribers with the same ID will have events distributed between them.
    */
   id: string;
   topics: string[];
@@ -55,3 +55,8 @@ export type EventsServiceSubscribeOptions = {
  * @public
  */
 export type EventsServiceEventHandler = (params: EventParams) => Promise<void>;
+
+/**
+ * @public
+ */
+export const EVENTS_NOTIFY_TIMEOUT_HEADER = 'backstage-events-notify-timeout';
diff --git a/plugins/events-node/src/api/http/validation/RequestDetails.ts b/plugins/events-node/src/api/http/validation/RequestDetails.ts
index 83c2669503..fc99b6a228 100644
--- a/plugins/events-node/src/api/http/validation/RequestDetails.ts
+++ b/plugins/events-node/src/api/http/validation/RequestDetails.ts
@@ -15,6 +15,8 @@
  */
 
 /**
+ * View on an incoming request that has to be validated.
+ *
  * @public
  */
 export interface RequestDetails {
@@ -26,4 +28,18 @@ export interface RequestDetails {
    * Key-value pairs of header names and values. Header names are lower-cased.
    */
   headers: Record<string, string | string[] | undefined>;
+  /**
+   * Raw request details.
+   */
+  raw: {
+    /**
+     * Raw request body (buffer).
+     */
+    body: Buffer;
+    /**
+     * Encoding of the raw request body.
+     * Can be used to decode the raw request body like `raw.body.toString(raw.encoding)`.
+     */
+    encoding: BufferEncoding;
+  };
 }
diff --git a/plugins/events-node/src/api/index.ts b/plugins/events-node/src/api/index.ts
index 6f3817cedc..ef2946396c 100644
--- a/plugins/events-node/src/api/index.ts
+++ b/plugins/events-node/src/api/index.ts
@@ -16,6 +16,7 @@
 
 export type { EventParams } from './EventParams';
 export { EventRouter } from './EventRouter';
+export { EVENTS_NOTIFY_TIMEOUT_HEADER } from './EventsService';
 export type {
   EventsService,
   EventsServiceSubscribeOptions,
diff --git a/plugins/events-node/src/schema/openapi/generated/apis/Api.client.ts b/plugins/events-node/src/schema/openapi/generated/apis/Api.client.ts
new file mode 100644
index 0000000000..c77ddc1d67
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/apis/Api.client.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { DiscoveryApi } from '../types/discovery';
+import { FetchApi } from '../types/fetch';
+import crossFetch from 'cross-fetch';
+import { pluginId } from '../pluginId';
+import * as parser from 'uri-template';
+import { GetSubscriptionEvents200Response } from '../models/GetSubscriptionEvents200Response.model';
+import { PostEventRequest } from '../models/PostEventRequest.model';
+import { PutSubscriptionRequest } from '../models/PutSubscriptionRequest.model';
+
+/**
+ * Wraps the Response type to convey a type on the json call.
+ *
+ * @public
+ */
+export type TypedResponse<T> = Omit<Response, 'json'> & {
+  json: () => Promise<T>;
+};
+
+/**
+ * Options you can pass into a request for additional information.
+ *
+ * @public
+ */
+export interface RequestOptions {
+  token?: string;
+}
+/**
+ * @public
+ */
+export type GetSubscriptionEvents = {
+  path: {
+    subscriptionId: string;
+  };
+};
+/**
+ * @public
+ */
+export type PostEvent = {
+  body: PostEventRequest;
+};
+/**
+ * @public
+ */
+export type PutSubscription = {
+  path: {
+    subscriptionId: string;
+  };
+  body: PutSubscriptionRequest;
+};
+
+/**
+ * @public
+ */
+export class DefaultApiClient {
+  private readonly discoveryApi: DiscoveryApi;
+  private readonly fetchApi: FetchApi;
+
+  constructor(options: {
+    discoveryApi: { getBaseUrl(pluginId: string): Promise<string> };
+    fetchApi?: { fetch: typeof fetch };
+  }) {
+    this.discoveryApi = options.discoveryApi;
+    this.fetchApi = options.fetchApi || { fetch: crossFetch };
+  }
+
+  /**
+   * Get new events for the provided subscription
+   * @param subscriptionId -
+   */
+  public async getSubscriptionEvents(
+    // @ts-ignore
+    request: GetSubscriptionEvents,
+    options?: RequestOptions,
+  ): Promise<TypedResponse<void | GetSubscriptionEvents200Response>> {
+    const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
+
+    const uriTemplate = `/bus/v1/subscriptions/{subscriptionId}/events`;
+
+    const uri = parser.parse(uriTemplate).expand({
+      subscriptionId: request.path.subscriptionId,
+    });
+
+    return await this.fetchApi.fetch(`${baseUrl}${uri}`, {
+      headers: {
+        'Content-Type': 'application/json',
+        ...(options?.token && { Authorization: `Bearer ${options?.token}` }),
+      },
+      method: 'GET',
+    });
+  }
+
+  /**
+   * Publish a new event
+   * @param postEventRequest -
+   */
+  public async postEvent(
+    // @ts-ignore
+    request: PostEvent,
+    options?: RequestOptions,
+  ): Promise<TypedResponse<void>> {
+    const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
+
+    const uriTemplate = `/bus/v1/events`;
+
+    const uri = parser.parse(uriTemplate).expand({});
+
+    return await this.fetchApi.fetch(`${baseUrl}${uri}`, {
+      headers: {
+        'Content-Type': 'application/json',
+        ...(options?.token && { Authorization: `Bearer ${options?.token}` }),
+      },
+      method: 'POST',
+      body: JSON.stringify(request.body),
+    });
+  }
+
+  /**
+   * Ensures that the subscription exists with the provided configuration
+   * @param subscriptionId -
+   * @param putSubscriptionRequest -
+   */
+  public async putSubscription(
+    // @ts-ignore
+    request: PutSubscription,
+    options?: RequestOptions,
+  ): Promise<TypedResponse<void>> {
+    const baseUrl = await this.discoveryApi.getBaseUrl(pluginId);
+
+    const uriTemplate = `/bus/v1/subscriptions/{subscriptionId}`;
+
+    const uri = parser.parse(uriTemplate).expand({
+      subscriptionId: request.path.subscriptionId,
+    });
+
+    return await this.fetchApi.fetch(`${baseUrl}${uri}`, {
+      headers: {
+        'Content-Type': 'application/json',
+        ...(options?.token && { Authorization: `Bearer ${options?.token}` }),
+      },
+      method: 'PUT',
+      body: JSON.stringify(request.body),
+    });
+  }
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/apis/index.ts b/plugins/events-node/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..af52f9db46
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/apis/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './Api.client';
diff --git a/plugins/events-node/src/schema/openapi/generated/index.ts b/plugins/events-node/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..bb399e97a0
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './apis';
+export * from './models';
diff --git a/plugins/events-node/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/events-node/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..0a51c67fef
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/events-node/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/events-node/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/Event.model.ts b/plugins/events-node/src/schema/openapi/generated/models/Event.model.ts
new file mode 100644
index 0000000000..edd88b0738
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/Event.model.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface Event {
+  /**
+   * The topic that the event is published on
+   */
+  topic: string;
+  /**
+   * The event payload
+   */
+  payload: any | null;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts b/plugins/events-node/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts
new file mode 100644
index 0000000000..3ca3282f47
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/GetSubscriptionEvents200Response.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Event } from '../models/Event.model';
+
+/**
+ * @public
+ */
+export interface GetSubscriptionEvents200Response {
+  events: Array<Event>;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/events-node/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..3e6af947ec
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  error: ErrorError;
+  request: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/PostEventRequest.model.ts b/plugins/events-node/src/schema/openapi/generated/models/PostEventRequest.model.ts
new file mode 100644
index 0000000000..cfaf66ce4f
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/PostEventRequest.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Event } from '../models/Event.model';
+
+/**
+ * @public
+ */
+export interface PostEventRequest {
+  event: Event;
+  /**
+   * The IDs of subscriptions that have already received this event
+   */
+  notifiedSubscribers?: Array<string>;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts b/plugins/events-node/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts
new file mode 100644
index 0000000000..a1dc298789
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/PutSubscriptionRequest.model.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface PutSubscriptionRequest {
+  /**
+   * The topics to subscribe to
+   */
+  topics: Array<string>;
+}
diff --git a/plugins/events-node/src/schema/openapi/generated/models/index.ts b/plugins/events-node/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..5044f65fff
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/Event.model';
+export * from '../models/GetSubscriptionEvents200Response.model';
+export * from '../models/ModelError.model';
+export * from '../models/PostEventRequest.model';
+export * from '../models/PutSubscriptionRequest.model';
diff --git a/plugins/events-node/src/schema/openapi/generated/pluginId.ts b/plugins/events-node/src/schema/openapi/generated/pluginId.ts
new file mode 100644
index 0000000000..36b5433cc3
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/pluginId.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const pluginId = 'events';
diff --git a/plugins/events-node/src/schema/openapi/generated/types/discovery.ts b/plugins/events-node/src/schema/openapi/generated/types/discovery.ts
new file mode 100644
index 0000000000..a7f87d3780
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/types/discovery.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.
+ */
+
+/**
+ * This is a copy of the DiscoveryApi, to avoid importing core-plugin-api.
+ */
+export type DiscoveryApi = {
+  getBaseUrl(pluginId: string): Promise<string>;
+};
diff --git a/plugins/events-node/src/schema/openapi/generated/types/fetch.ts b/plugins/events-node/src/schema/openapi/generated/types/fetch.ts
new file mode 100644
index 0000000000..3de56c028e
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/generated/types/fetch.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.
+ */
+
+/**
+ * This is a copy of FetchApi, to avoid importing core-plugin-api.
+ */
+export type FetchApi = {
+  fetch: typeof fetch;
+};
diff --git a/plugins/events-node/src/schema/openapi/index.ts b/plugins/events-node/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/events-node/src/schema/openapi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './generated';
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index ccffafd055..16018e8305 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,68 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+
+## 1.0.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/errors@1.2.5
+
+## 1.0.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/errors@1.2.5
+
+## 1.0.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/errors@1.2.5
+
+## 1.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/errors@1.2.4
+
+## 1.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+
+## 1.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/errors@1.2.4
+
 ## 1.0.32
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 324c10cd2c..d6f796625e 100644
--- a/plugins/example-todo-list-backend/package.json
+++ b/plugins/example-todo-list-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list-backend",
-  "version": "1.0.32",
+  "version": "1.0.34-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "todo-list",
@@ -45,7 +45,7 @@
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "yn": "^4.0.0"
   },
   "devDependencies": {
@@ -53,7 +53,6 @@
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@types/supertest": "^2.0.8",
-    "@types/uuid": "^9.0.0",
     "supertest": "^7.0.0"
   }
 }
diff --git a/plugins/example-todo-list-common/CHANGELOG.md b/plugins/example-todo-list-common/CHANGELOG.md
index 4b1ba3f9ce..ad6b7898a2 100644
--- a/plugins/example-todo-list-common/CHANGELOG.md
+++ b/plugins/example-todo-list-common/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @internal/plugin-todo-list-common
 
+## 1.0.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.0.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.8.2
+
 ## 1.0.21
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-common/package.json b/plugins/example-todo-list-common/package.json
index 42c83f49d8..a06daec424 100644
--- a/plugins/example-todo-list-common/package.json
+++ b/plugins/example-todo-list-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list-common",
-  "version": "1.0.21",
+  "version": "1.0.23-next.0",
   "backstage": {
     "role": "common-library",
     "pluginId": "todo-list",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index 6c73dacdb3..7bbc9e46a1 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @internal/plugin-todo-list
 
+## 1.0.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## 1.0.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+
+## 1.0.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 1.0.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 1.0.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+
+## 1.0.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## 1.0.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+
 ## 1.0.32
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index be7d2575e1..bc10e46156 100644
--- a/plugins/example-todo-list/package.json
+++ b/plugins/example-todo-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list",
-  "version": "1.0.32",
+  "version": "1.0.34-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "todo-list",
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index 9699c48bad..28e6d96519 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @backstage/plugin-home-react
 
+## 0.1.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## 0.1.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.21-next.0
+
+### Patch Changes
+
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+
+## 0.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## 0.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+
 ## 0.1.18
 
 ### Patch Changes
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index 458b422618..c3c93f88f6 100644
--- a/plugins/home-react/package.json
+++ b/plugins/home-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home-react",
-  "version": "0.1.18",
+  "version": "0.1.21-next.2",
   "description": "A Backstage plugin that contains react components helps you build a home page",
   "backstage": {
     "role": "web-library",
@@ -46,7 +46,7 @@
     "@backstage/core-plugin-api": "workspace:^",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@rjsf/utils": "5.21.2"
+    "@rjsf/utils": "5.23.1"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 2c558935cc..0c08fa3175 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,198 @@
 # @backstage/plugin-home
 
+## 0.8.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.2
+
+## 0.8.3-next.1
+
+### Patch Changes
+
+- 7248f3b: Added a new Quick Start Card to `plugin-home`, which can display basic info to get users the info they need to onboard to the Catalog.
+
+  ```
+  import { QuickStartCard } from '@backstage/plugin-home';
+  <QuickStartCard
+    title="Onboarding to the Catalog"
+    modalTitle="Onboarding Quick Start"
+    docsLinkTitle="Learn more with getting started docs"
+    docsLink="https://backstage.io/docs/getting-started"
+    image={
+      <img
+        src={ContentImage}
+        alt="quick start"
+        width="100%"
+        height="100%"
+      />
+    }
+    cardDescription="Backstage system model will help you create new entities"
+    video={
+      <video
+        controls
+        preload="auto"
+        poster={"./videoPoster.png"}
+      >
+        <source src={"OnboardingDemo.mp4"} type="video/mp4" />
+      </video>
+    }
+    downloadImage={
+      <Button
+        href={QuickStartPDF}
+        target={'_blank'}
+        download={true}
+      >
+        Download infographic button
+      </Button>
+    }
+  />
+  ```
+
+  See the [storybook examples](https://backstage.io/storybook/?path=/story/plugins-home-components-quickstartcard--default)
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.1
+
+## 0.8.3-next.0
+
+### Patch Changes
+
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-home-react@0.1.21-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.8.1
+
+### Patch Changes
+
+- 8b1b2cf: Improve Starred Entities UI to reduce whitespace and provide more context on the entities:
+
+  - Use the Entity Presentation API (via `<EntityDisplayName>`) to display the entity's name
+  - Component's `kind` and `spec.type` are displayed as a secondary text
+  - List items are condensed to reduce unnecessary spacing
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-home-react@0.1.19
+
+## 0.8.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.2
+
+## 0.8.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.1
+
+## 0.8.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-home-react@0.1.19-next.1
+
+## 0.8.1-next.0
+
+### Patch Changes
+
+- 8b1b2cf: Improve Starred Entities UI to reduce whitespace and provide more context on the entities:
+
+  - Use the Entity Presentation API (via `<EntityDisplayName>`) to display the entity's name
+  - Component's `kind` and `spec.type` are displayed as a secondary text
+  - List items are condensed to reduce unnecessary spacing
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-home-react@0.1.19-next.0
+
 ## 0.8.0
 
 ### Minor Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 23679c5746..f7d5f2ff4a 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.8.0",
+  "version": "0.8.3-next.2",
   "description": "A Backstage plugin that helps you build a home page",
   "backstage": {
     "role": "frontend-plugin",
@@ -70,10 +70,10 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
-    "@rjsf/core": "5.21.2",
-    "@rjsf/material-ui": "5.21.2",
-    "@rjsf/utils": "5.21.2",
-    "@rjsf/validator-ajv8": "5.21.2",
+    "@rjsf/core": "5.23.1",
+    "@rjsf/material-ui": "5.23.1",
+    "@rjsf/utils": "5.23.1",
+    "@rjsf/validator-ajv8": "5.23.1",
     "lodash": "^4.17.21",
     "luxon": "^3.4.3",
     "react-grid-layout": "1.3.4",
diff --git a/plugins/home/report.api.md b/plugins/home/report.api.md
index 023c649ab4..878d8ef646 100644
--- a/plugins/home/report.api.md
+++ b/plugins/home/report.api.md
@@ -187,6 +187,17 @@ export type LayoutConfiguration = {
 // @public
 export type Operators = '<' | '<=' | '==' | '!=' | '>' | '>=' | 'contains';
 
+// @public
+export type QuickStartCardProps = {
+  modalTitle?: string | React_2.JSX.Element;
+  docsLinkTitle?: string;
+  docsLink?: string;
+  video?: React_2.JSX.Element;
+  image: React_2.JSX.Element;
+  cardDescription?: string;
+  downloadImage?: React_2.JSX.Element;
+};
+
 // @public @deprecated (undocumented)
 export type RendererProps = RendererProps_2;
 
diff --git a/plugins/home/src/homePageComponents/QuickStart/Content.test.tsx b/plugins/home/src/homePageComponents/QuickStart/Content.test.tsx
new file mode 100644
index 0000000000..0acd44768f
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/Content.test.tsx
@@ -0,0 +1,69 @@
+/*
+ * 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 { Content } from './Content';
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { renderInTestApp } from '@backstage/test-utils';
+import ContentImage from './static/backstageSystemModel.png';
+
+describe('<QuickStartCard />', () => {
+  const renderContent = async () => {
+    return await renderInTestApp(
+      <Content
+        image={
+          <img
+            src={ContentImage}
+            data-testid="quick-start-image"
+            alt="quick start"
+            width="100%"
+            height="100%"
+          />
+        }
+        docsLinkTitle="Testing docs link"
+      />,
+    );
+  };
+
+  it('should have expected card content', async () => {
+    const { getByTestId } = await renderContent();
+    const docsLink = getByTestId('quick-start-link-to-docs');
+    expect(docsLink).toHaveTextContent('Testing docs link');
+    expect(docsLink).toHaveAttribute('target', '_blank');
+  });
+
+  it('clicking the link opens the modal', async () => {
+    const { getByTestId, getByText } = await renderContent();
+    // Find the link element
+    const link = getByText('Onboarding');
+    // Simulate a click event on the link
+    await userEvent.click(link);
+    // Assert that the modal is visible
+    const modal = getByTestId('content-modal-open');
+    expect(modal).toBeVisible();
+  });
+
+  it('clicking the image opens the modal', async () => {
+    const { getByTestId } = await renderContent();
+    // Find the link element
+    const link = getByTestId('quick-start-image');
+    // Simulate a click event on the link
+    await userEvent.click(link);
+    // Assert that the modal is visible
+    const modal = getByTestId('content-modal-open');
+    expect(modal).toBeVisible();
+  });
+});
diff --git a/plugins/home/src/homePageComponents/QuickStart/Content.tsx b/plugins/home/src/homePageComponents/QuickStart/Content.tsx
new file mode 100644
index 0000000000..998b1a1798
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/Content.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { Link } from '@backstage/core-components';
+import Typography from '@material-ui/core/Typography';
+import Grid from '@material-ui/core/Grid';
+import { ContentModal } from './ContentModal';
+import { useStyles } from './styles';
+
+/**
+ * Props customizing the <QuickStartCard/> component.
+ *
+ * @public
+ */
+export type QuickStartCardProps = {
+  /** The modal link title */
+  modalTitle?: string | React.JSX.Element;
+  /** The link to docs title */
+  docsLinkTitle?: string;
+  /** The link to docs */
+  docsLink?: string;
+  /** The video to play on the card */
+  video?: React.JSX.Element;
+  /** A quickstart image to display on the card */
+  image: React.JSX.Element;
+  /** The card description*/
+  cardDescription?: string;
+  /** A component used to download a quickStart image*/
+  downloadImage?: React.JSX.Element;
+};
+
+/**
+ * A component to display Quick Start info on the homepage.
+ *
+ * @public
+ */
+export const Content = (props: QuickStartCardProps): JSX.Element => {
+  const styles = useStyles();
+  return (
+    <>
+      <ContentModal
+        modalContent={props.image}
+        linkContent={props.modalTitle || 'Onboarding'}
+      />
+      <Typography variant="body1" paragraph>
+        {props.cardDescription || 'Get started with Backstage'}
+      </Typography>
+      <ContentModal modalContent={props.image} linkContent={props.image} />
+      <Grid
+        container
+        alignItems="center"
+        className={styles.contentActionContainer}
+      >
+        {props.downloadImage && <Grid item>{props.downloadImage}</Grid>}
+        <Grid item>
+          <Link
+            to={props.docsLink || 'https://backstage.io/docs/getting-started/'}
+            data-testid="quick-start-link-to-docs"
+            underline="none"
+            variant="h6"
+            className={styles.link}
+          >
+            {props.docsLinkTitle || 'Learn more'}
+          </Link>
+        </Grid>
+      </Grid>
+      {props.video && props.video}
+    </>
+  );
+};
diff --git a/plugins/home/src/homePageComponents/QuickStart/ContentModal.tsx b/plugins/home/src/homePageComponents/QuickStart/ContentModal.tsx
new file mode 100644
index 0000000000..a6e000dc42
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/ContentModal.tsx
@@ -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 React, { useState } from 'react';
+import { Link } from '@backstage/core-components';
+import Modal from '@material-ui/core/Modal';
+import Box from '@material-ui/core/Box';
+
+import { useStyles } from './styles';
+
+export type ContentModalProps = {
+  modalContent: React.JSX.Element;
+  linkContent: string | React.JSX.Element;
+};
+
+export const ContentModal = (props: ContentModalProps) => {
+  const { modalContent, linkContent } = props;
+  const styles = useStyles();
+  const [open, setOpen] = useState(false);
+
+  return (
+    <div className={styles.linkText} data-testid="content-modal-container">
+      <Link
+        to="#"
+        component="button"
+        variant="h6"
+        underline="none"
+        onClick={() => setOpen(true)}
+      >
+        {linkContent}
+      </Link>
+      <Modal
+        open={open}
+        onClose={() => setOpen(false)}
+        aria-labelledby="content-modal"
+        data-testid="content-modal"
+      >
+        <Box className={styles.contentModal} data-testid="content-modal-open">
+          {modalContent}
+        </Box>
+      </Modal>
+    </div>
+  );
+};
diff --git a/plugins/home/src/homePageComponents/QuickStart/QuickStart.stories.tsx b/plugins/home/src/homePageComponents/QuickStart/QuickStart.stories.tsx
new file mode 100644
index 0000000000..8d6e6d117e
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/QuickStart.stories.tsx
@@ -0,0 +1,67 @@
+/*
+ * 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 { QuickStartCard } from '../../plugin';
+import React, { ComponentType, PropsWithChildren } from 'react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import Grid from '@material-ui/core/Grid';
+import ContentImage from './static/backstageSystemModel.png';
+
+export default {
+  title: 'Plugins/Home/Components/QuickStartCard',
+  decorators: [
+    (Story: ComponentType<PropsWithChildren<{}>>) => wrapInTestApp(<Story />),
+  ],
+};
+
+export const Default = () => {
+  return (
+    <Grid item xs={12} md={6}>
+      <QuickStartCard
+        image={
+          <img
+            src={ContentImage}
+            alt="quick start"
+            width="100%"
+            height="100%"
+          />
+        }
+      />
+    </Grid>
+  );
+};
+
+export const Customized = () => {
+  return (
+    <Grid item xs={12} md={6}>
+      <QuickStartCard
+        title="Onboarding to the Catalog"
+        modalTitle="Onboarding Quick Start"
+        docsLinkTitle="Learn more with getting started docs"
+        docsLink="https://backstage.io/docs/getting-started"
+        image={
+          <img
+            src={ContentImage}
+            alt="quick start"
+            width="100%"
+            height="100%"
+          />
+        }
+        cardDescription="Backstage system model will help you create new entities"
+      />
+    </Grid>
+  );
+};
diff --git a/plugins/home/src/homePageComponents/QuickStart/index.ts b/plugins/home/src/homePageComponents/QuickStart/index.ts
new file mode 100644
index 0000000000..2c2e0ed2f2
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { Content } from './Content';
+export type { QuickStartCardProps } from './Content';
+export type { QuickStartCardClassKey } from './styles';
diff --git a/plugins/home/src/homePageComponents/QuickStart/static/backstageSystemModel.png b/plugins/home/src/homePageComponents/QuickStart/static/backstageSystemModel.png
new file mode 100644
index 0000000000..ad784060bb
Binary files /dev/null and b/plugins/home/src/homePageComponents/QuickStart/static/backstageSystemModel.png differ
diff --git a/plugins/home/src/homePageComponents/QuickStart/styles.ts b/plugins/home/src/homePageComponents/QuickStart/styles.ts
new file mode 100644
index 0000000000..f6f93f7070
--- /dev/null
+++ b/plugins/home/src/homePageComponents/QuickStart/styles.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { makeStyles, Theme } from '@material-ui/core/styles';
+
+/** @public */
+export type QuickStartCardClassKey =
+  | 'cardTitleIcon'
+  | 'contentActionContainer'
+  | 'contentModal'
+  | 'imageSize'
+  | 'link'
+  | 'linkText'
+  | 'videoContainer';
+
+export const useStyles = makeStyles(
+  (theme: Theme) => ({
+    cardTitleIcon: {
+      verticalAlign: 'bottom',
+      marginLeft: '-4px',
+    },
+    contentActionContainer: {
+      marginTop: theme.spacing(1.5),
+      marginBottom: theme.spacing(1.5),
+    },
+    contentModal: {
+      position: 'absolute',
+      top: '50%',
+      left: '50%',
+      transform: 'translate(-50%, -50%)',
+      width: '80%',
+      height: 'auto',
+    },
+    imageSize: { width: '100%', height: '100%' },
+    link: {
+      display: 'inline-flex',
+      alignItems: 'center',
+      textDecoration: 'none',
+      color: `${theme.palette.link}`,
+      '&:hover': {
+        background: 'transparent',
+      },
+    },
+    linkText: {
+      marginBottom: theme.spacing(1.5),
+    },
+    videoContainer: {
+      borderRadius: '10px',
+      width: '100%',
+      height: 'auto',
+      background: `${theme.palette.background.default}`,
+    },
+  }),
+  { name: 'HomeQuickStartCard' },
+);
diff --git a/plugins/home/src/homePageComponents/index.ts b/plugins/home/src/homePageComponents/index.ts
index e260982e8e..f2eb39b070 100644
--- a/plugins/home/src/homePageComponents/index.ts
+++ b/plugins/home/src/homePageComponents/index.ts
@@ -20,3 +20,4 @@ export type { WelcomeTitleLanguageProps } from './WelcomeTitle';
 export type { VisitedByTypeProps, VisitedByTypeKind } from './VisitedByType';
 export type { FeaturedDocsCardProps } from './FeaturedDocsCard';
 export type { StarredEntitiesProps } from './StarredEntities';
+export type { QuickStartCardProps } from './QuickStart';
diff --git a/plugins/home/src/plugin.ts b/plugins/home/src/plugin.ts
index c3fa938197..6892db2231 100644
--- a/plugins/home/src/plugin.ts
+++ b/plugins/home/src/plugin.ts
@@ -27,6 +27,7 @@ import {
   ToolkitContentProps,
   VisitedByTypeProps,
   FeaturedDocsCardProps,
+  QuickStartCardProps,
 } from './homePageComponents';
 import { rootRouteRef } from './routes';
 import { VisitsStorageApi, visitsApiRef } from './api';
@@ -230,3 +231,16 @@ export const FeaturedDocsCard = homePlugin.provide(
     components: () => import('./homePageComponents/FeaturedDocsCard'),
   }),
 );
+
+/**
+ * A component to display Quick Start information.
+ *
+ * @public
+ */
+export const QuickStartCard = homePlugin.provide(
+  createCardExtension<QuickStartCardProps>({
+    name: 'QuickStartCard',
+    title: 'Quick Start',
+    components: () => import('./homePageComponents/QuickStart'),
+  }),
+);
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index d0bd078eda..37d7d9dedb 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,168 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.19.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-kubernetes-node@0.2.1-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.19.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-kubernetes-node@0.2.1-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.19.1-next.0
+
+### Patch Changes
+
+- cbfc69e: Create a `dev/index.ts` entrypoint for `yarn start`
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-node@0.2.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 0.19.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- bee9664: Adapted the config.d.ts for custom k8s cluster authProvider implementations
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-node@0.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## 0.19.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.19.0-next.2
+
+### Patch Changes
+
+- bee9664: Adapted the config.d.ts for custom k8s cluster authProvider implementations
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.19.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-node@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 0.18.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-node@0.1.21-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 0.18.7
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/config.d.ts b/plugins/kubernetes-backend/config.d.ts
index d6c5f1d32b..a710b8cb85 100644
--- a/plugins/kubernetes-backend/config.d.ts
+++ b/plugins/kubernetes-backend/config.d.ts
@@ -22,6 +22,7 @@ export interface Config {
       | 'configmaps'
       | 'deployments'
       | 'limitranges'
+      | 'resourcequotas'
       | 'replicasets'
       | 'horizontalpodautoscalers'
       | 'jobs'
@@ -32,7 +33,7 @@ export interface Config {
       | 'daemonsets'
     >;
     serviceLocatorMethod: {
-      type: 'multiTenant';
+      type: 'multiTenant' | 'singleTenant' | 'catalogRelation';
     };
     clusterLocatorMethods: Array<
       | {
@@ -48,14 +49,7 @@ export interface Config {
             /** @visibility secret  */
             serviceAccountToken?: string;
             /** @visibility frontend */
-            authProvider?:
-              | 'aks'
-              | 'aws'
-              | 'azure'
-              | 'google'
-              | 'googleServiceAccount'
-              | 'oidc'
-              | 'serviceAccount';
+            authProvider?: string;
             /** @visibility secret  */
             authMetadata?: object;
             /** @visibility frontend */
@@ -116,6 +110,7 @@ export interface Config {
       configmaps?: string;
       deployments?: string;
       limitranges?: string;
+      resourcequotas?: string;
       replicasets?: string;
       horizontalpodautoscalers?: string;
       jobs?: string;
diff --git a/plugins/kubernetes-backend/dev/index.ts b/plugins/kubernetes-backend/dev/index.ts
new file mode 100644
index 0000000000..dc287d46cc
--- /dev/null
+++ b/plugins/kubernetes-backend/dev/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+backend.add(import('../src'));
+backend.start();
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 484325e3f2..7f55f24417 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.18.7",
+  "version": "0.19.1-next.2",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "backend-plugin",
@@ -78,7 +78,7 @@
     "@backstage/types": "workspace:^",
     "@google-cloud/container": "^5.0.0",
     "@jest-mock/express": "^2.0.1",
-    "@kubernetes/client-node": "0.20.0",
+    "@kubernetes/client-node": "1.0.0-rc7",
     "@types/express": "^4.17.6",
     "@types/http-proxy-middleware": "^1.0.0",
     "@types/luxon": "^3.0.0",
diff --git a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
index 5264e762b6..01da602232 100644
--- a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
+++ b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
@@ -108,7 +108,7 @@ describe('resourcesRoutes', () => {
             },
           },
         }),
-        import('@backstage/plugin-kubernetes-backend/alpha'),
+        import('@backstage/plugin-kubernetes-backend'),
         createBackendModule({
           pluginId: 'kubernetes',
           moduleId: 'test-objects-provider',
diff --git a/plugins/kubernetes-backend/src/run.ts b/plugins/kubernetes-backend/src/run.ts
deleted file mode 100644
index b17ffa9d43..0000000000
--- a/plugins/kubernetes-backend/src/run.ts
+++ /dev/null
@@ -1,33 +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 yn from 'yn';
-import { getRootLogger } from '@backstage/backend-common';
-import { startStandaloneServer } from './service/standaloneServer';
-
-const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 3004;
-const enableCors = yn(process.env.PLUGIN_CORS, { default: false });
-const logger = getRootLogger();
-
-startStandaloneServer({ port, enableCors, logger }).catch(err => {
-  logger.error(err);
-  process.exit(1);
-});
-
-process.on('SIGINT', () => {
-  logger.info('CTRL+C pressed; exiting.');
-  process.exit(0);
-});
diff --git a/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts b/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts
index 3299d11e5d..b38bf9121a 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts
@@ -121,8 +121,8 @@ describe('API integration tests', () => {
     const { server } = await startTestBackend({
       features: [
         minimalValidConfigService,
-        import('@backstage/plugin-kubernetes-backend/alpha'),
-        import('@backstage/plugin-permission-backend/alpha'),
+        import('@backstage/plugin-kubernetes-backend'),
+        import('@backstage/plugin-permission-backend'),
         import('@backstage/plugin-permission-backend-module-allow-all-policy'),
         createBackendModule({
           pluginId: 'kubernetes',
@@ -187,7 +187,7 @@ describe('API integration tests', () => {
       const { server } = await startTestBackend({
         features: [
           minimalValidConfigService,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           createBackendModule({
             pluginId: 'kubernetes',
             moduleId: 'testObjectsProvider',
@@ -284,7 +284,7 @@ describe('API integration tests', () => {
       const { server } = await startTestBackend({
         features: [
           minimalValidConfigService,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           withClusters([
             {
               name: 'cluster-name',
@@ -377,7 +377,7 @@ describe('API integration tests', () => {
       const { server } = await startTestBackend({
         features: [
           minimalValidConfigService,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           withClusters(clusters),
           createBackendModule({
             pluginId: 'kubernetes',
@@ -440,7 +440,7 @@ describe('API integration tests', () => {
       const { server } = await startTestBackend({
         features: [
           minimalValidConfigService,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           withClusters([
             {
               name: 'custom-cluster',
@@ -579,7 +579,7 @@ metadata:
         features: [
           minimalValidConfigService,
           permissionsMock.factory,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
         ],
       });
       app = server;
@@ -614,7 +614,7 @@ metadata:
       const { server } = await startTestBackend({
         features: [
           minimalValidConfigService,
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           withClusters([
             {
               name: 'custom-cluster',
@@ -689,7 +689,7 @@ metadata:
               },
             },
           }),
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           createBackendModule({
             pluginId: 'kubernetes',
             moduleId: 'testAuthStrategy',
@@ -741,7 +741,7 @@ metadata:
               },
             },
           }),
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           createBackendModule({
             pluginId: 'kubernetes',
             moduleId: 'testAuthStrategy',
@@ -796,7 +796,7 @@ metadata:
               },
             },
           }),
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
         ],
       }),
     ).rejects.toThrow(
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
index 8666e0ef16..091ffebdf5 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
@@ -30,7 +30,6 @@ import {
   mockServices,
   registerMswTestHooks,
 } from '@backstage/backend-test-utils';
-import { Config } from '@kubernetes/client-node';
 
 const mockCertDir = createMockDirectory({
   content: {
@@ -651,6 +650,7 @@ describe('KubernetesFetcher', () => {
     });
     describe('when server uses TLS', () => {
       let httpsRequest: jest.SpyInstance;
+      const initialCAPath = process.env.KUBERNETES_CA_FILE_PATH;
       beforeAll(() => {
         httpsRequest = jest.spyOn(
           // this is pretty egregious reverse engineering of msw.
@@ -662,7 +662,13 @@ describe('KubernetesFetcher', () => {
       });
       beforeEach(() => {
         httpsRequest.mockClear();
+        process.env.KUBERNETES_CA_FILE_PATH = mockCertDir.resolve('ca.crt');
       });
+
+      afterEach(() => {
+        process.env.KUBERNETES_CA_FILE_PATH = initialCAPath;
+      });
+
       it('should trust specified caData', async () => {
         worker.use(
           rest.get('https://localhost:9999/api/v1/pods', (req, res, ctx) =>
@@ -755,7 +761,7 @@ describe('KubernetesFetcher', () => {
               name: 'cluster1',
               url: 'https://localhost:9999',
               authMetadata: {},
-              caFile: mockCertDir.resolve('ca.crt'),
+              caFile: process.env.KUBERNETES_CA_FILE_PATH,
             },
             credential: { type: 'bearer token', token: 'token' },
             objectTypesToFetch: new Set<ObjectToFetch>([
@@ -1009,7 +1015,7 @@ describe('KubernetesFetcher', () => {
           serviceId: 'some-service',
           clusterDetails: {
             name: 'unauthenticated-cluster',
-            url: 'http://ignored',
+            url: 'https://10.10.10.10',
             authMetadata: {},
           },
           credential: { type: 'anonymous' },
@@ -1025,18 +1031,21 @@ describe('KubernetesFetcher', () => {
     describe('Backstage running on k8s', () => {
       const initialHost = process.env.KUBERNETES_SERVICE_HOST;
       const initialPort = process.env.KUBERNETES_SERVICE_PORT;
-      const initialCaPath = Config.SERVICEACCOUNT_CA_PATH;
+      const initialCAPath = process.env.KUBERNETES_CA_FILE_PATH;
+
+      beforeEach(() => {
+        process.env.KUBERNETES_CA_FILE_PATH = mockCertDir.resolve('ca.crt');
+      });
 
       afterEach(() => {
         process.env.KUBERNETES_SERVICE_HOST = initialHost;
         process.env.KUBERNETES_SERVICE_PORT = initialPort;
-        Config.SERVICEACCOUNT_CA_PATH = initialCaPath;
+        process.env.KUBERNETES_CA_FILE_PATH = initialCAPath;
       });
 
       it('makes in-cluster requests when cluster details has no token', async () => {
         process.env.KUBERNETES_SERVICE_HOST = '10.10.10.10';
         process.env.KUBERNETES_SERVICE_PORT = '443';
-        Config.SERVICEACCOUNT_CA_PATH = mockCertDir.resolve('ca.crt');
         worker.use(
           rest.get('https://10.10.10.10/api/v1/pods', (req, res, ctx) =>
             res(
@@ -1052,7 +1061,7 @@ describe('KubernetesFetcher', () => {
           serviceId: 'some-service',
           clusterDetails: {
             name: 'overridden-to-in-cluster',
-            url: 'http://ignored',
+            url: 'https://10.10.10.10',
             authMetadata: {
               [ANNOTATION_KUBERNETES_AUTH_PROVIDER]: 'serviceAccount',
             },
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index e5f25652e6..abb98cfb81 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -17,7 +17,6 @@
 import {
   bufferFromFileOrString,
   Cluster,
-  Config,
   CoreV1Api,
   KubeConfig,
   Metrics,
@@ -31,6 +30,7 @@ import {
 } from '../types/types';
 import {
   ANNOTATION_KUBERNETES_AUTH_PROVIDER,
+  SERVICEACCOUNT_CA_PATH,
   FetchResponse,
   KubernetesErrorTypes,
   KubernetesFetchError,
@@ -156,8 +156,7 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
       if (podMetrics.ok && podList.ok) {
         return topPods(
           {
-            listPodForAllNamespaces: () =>
-              podList.json().then(b => ({ body: b })),
+            listPodForAllNamespaces: () => podList.json(),
           } as unknown as CoreV1Api,
           {
             getPodMetrics: () => podMetrics.json(),
@@ -249,7 +248,7 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
     return (
       authProvider === 'serviceAccount' &&
       !clusterDetails.authMetadata.serviceAccountToken &&
-      fs.pathExistsSync(Config.SERVICEACCOUNT_CA_PATH)
+      fs.pathExistsSync(SERVICEACCOUNT_CA_PATH)
     );
   }
 
diff --git a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
index fe4feaee11..e7b1d027a0 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
@@ -39,7 +39,6 @@ import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import request from 'supertest';
 import { AddressInfo, WebSocket, WebSocketServer } from 'ws';
-import { Config } from '@kubernetes/client-node';
 
 import { LocalKubectlProxyClusterLocator } from '../cluster-locator/LocalKubectlProxyLocator';
 import {
@@ -1014,23 +1013,26 @@ describe('KubernetesProxy', () => {
   describe('Backstage running on k8s', () => {
     const initialHost = process.env.KUBERNETES_SERVICE_HOST;
     const initialPort = process.env.KUBERNETES_SERVICE_PORT;
-    const initialCaPath = Config.SERVICEACCOUNT_CA_PATH;
+    const initialCAPath = process.env.KUBERNETES_CA_FILE_PATH;
+
+    beforeEach(() => {
+      process.env.KUBERNETES_CA_FILE_PATH = mockCertDir.resolve('ca.crt');
+    });
 
     afterEach(() => {
       process.env.KUBERNETES_SERVICE_HOST = initialHost;
       process.env.KUBERNETES_SERVICE_PORT = initialPort;
-      Config.SERVICEACCOUNT_CA_PATH = initialCaPath;
+      process.env.KUBERNETES_CA_FILE_PATH = initialCAPath;
     });
 
     it('makes in-cluster requests when cluster details has no token', async () => {
       process.env.KUBERNETES_SERVICE_HOST = '10.10.10.10';
       process.env.KUBERNETES_SERVICE_PORT = '443';
-      Config.SERVICEACCOUNT_CA_PATH = mockCertDir.resolve('ca.crt');
 
       clusterSupplier.getClusters.mockResolvedValue([
         {
           name: 'cluster1',
-          url: 'http://ignored',
+          url: 'https://10.10.10.10',
           authMetadata: {
             [ANNOTATION_KUBERNETES_AUTH_PROVIDER]: 'serviceAccount',
           },
diff --git a/plugins/kubernetes-backend/src/service/KubernetesProxy.ts b/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
index a1ab68d589..51142a8d47 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesProxy.ts
@@ -22,6 +22,7 @@ import {
 } from '@backstage/errors';
 import {
   ANNOTATION_KUBERNETES_AUTH_PROVIDER,
+  SERVICEACCOUNT_CA_PATH,
   kubernetesProxyPermission,
   KubernetesRequestAuth,
 } from '@backstage/plugin-kubernetes-common';
@@ -29,7 +30,6 @@ import { AuthorizeResult } from '@backstage/plugin-permission-common';
 import {
   bufferFromFileOrString,
   Cluster,
-  Config,
   KubeConfig,
 } from '@kubernetes/client-node';
 import { createProxyMiddleware, RequestHandler } from 'http-proxy-middleware';
@@ -263,7 +263,7 @@ export class KubernetesProxy {
 
     if (
       authProvider === 'serviceAccount' &&
-      fs.pathExistsSync(Config.SERVICEACCOUNT_CA_PATH) &&
+      fs.pathExistsSync(SERVICEACCOUNT_CA_PATH) &&
       !cluster.authMetadata.serviceAccountToken
     ) {
       const kc = new KubeConfig();
diff --git a/plugins/kubernetes-backend/src/service/standaloneApplication.ts b/plugins/kubernetes-backend/src/service/standaloneApplication.ts
deleted file mode 100644
index dd87d33827..0000000000
--- a/plugins/kubernetes-backend/src/service/standaloneApplication.ts
+++ /dev/null
@@ -1,68 +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 {
-  errorHandler,
-  notFoundHandler,
-  requestLoggingHandler,
-  HostDiscovery,
-} from '@backstage/backend-common';
-import compression from 'compression';
-import cors from 'cors';
-import express from 'express';
-import helmet from 'helmet';
-import { Logger } from 'winston';
-import { createRouter } from './router';
-import { ConfigReader } from '@backstage/config';
-import { CatalogClient } from '@backstage/catalog-client';
-import { PermissionEvaluator } from '@backstage/plugin-permission-common';
-
-export interface ApplicationOptions {
-  enableCors: boolean;
-  logger: Logger;
-}
-
-export async function createStandaloneApplication(
-  options: ApplicationOptions,
-): Promise<express.Application> {
-  const { enableCors, logger } = options;
-  const config = new ConfigReader({});
-  const discovery = HostDiscovery.fromConfig(config);
-
-  const app = express();
-
-  const catalogApi = new CatalogClient({
-    discoveryApi: HostDiscovery.fromConfig(config),
-  });
-
-  const permissions = {} as PermissionEvaluator;
-
-  app.use(helmet());
-  if (enableCors) {
-    app.use(cors());
-  }
-  app.use(compression());
-  app.use(express.json());
-  app.use(requestLoggingHandler());
-  app.use(
-    '/',
-    await createRouter({ logger, config, discovery, catalogApi, permissions }),
-  );
-  app.use(notFoundHandler());
-  app.use(errorHandler());
-
-  return app;
-}
diff --git a/plugins/kubernetes-backend/src/service/standaloneServer.ts b/plugins/kubernetes-backend/src/service/standaloneServer.ts
deleted file mode 100644
index 9f9217fd4c..0000000000
--- a/plugins/kubernetes-backend/src/service/standaloneServer.ts
+++ /dev/null
@@ -1,50 +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 { Server } from 'http';
-import { Logger } from 'winston';
-import { createStandaloneApplication } from './standaloneApplication';
-
-export interface ServerOptions {
-  port: number;
-  enableCors: boolean;
-  logger: Logger;
-}
-
-export async function startStandaloneServer(
-  options: ServerOptions,
-): Promise<Server> {
-  const logger = options.logger.child({ service: 'kubernetes-backend' });
-
-  logger.debug('Creating application...');
-  const app = await createStandaloneApplication({
-    enableCors: options.enableCors,
-    logger,
-  });
-
-  logger.debug('Starting application server...');
-  return await new Promise((resolve, reject) => {
-    const server = app.listen(options.port, (err?: Error) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      logger.info(`Listening on port ${options.port}`);
-      resolve(server);
-    });
-  });
-}
diff --git a/plugins/kubernetes-cluster/CHANGELOG.md b/plugins/kubernetes-cluster/CHANGELOG.md
index 2909e65135..359515568b 100644
--- a/plugins/kubernetes-cluster/CHANGELOG.md
+++ b/plugins/kubernetes-cluster/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @backstage/plugin-kubernetes-cluster
 
+## 0.0.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.2
+
+## 0.0.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.1
+
+## 0.0.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.0
+
+## 0.0.18
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.0.18-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0-next.2
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.0.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+
+## 0.0.18-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.0.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-react@0.4.5-next.0
+
 ## 0.0.17
 
 ### Patch Changes
diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json
index 169a0e9e39..29f1e857f5 100644
--- a/plugins/kubernetes-cluster/package.json
+++ b/plugins/kubernetes-cluster/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-cluster",
-  "version": "0.0.17",
+  "version": "0.0.20-next.2",
   "description": "A Backstage plugin that shows details of Kubernetes clusters",
   "backstage": {
     "role": "frontend-plugin",
@@ -64,7 +64,7 @@
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
-    "@types/node": "^16.11.26",
+    "@types/node": "^20.16.0",
     "@types/react": "^18.0.0",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 6886f26bf3..3b594da93a 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-kubernetes-common
 
+## 0.9.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.9.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+
+## 0.9.0-next.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.8.3
 
 ### Patch Changes
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 055890fef1..0f01a38dd4 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-common",
-  "version": "0.8.3",
+  "version": "0.9.1-next.0",
   "description": "Common functionalities for kubernetes, to be shared between kubernetes and kubernetes-backend plugin",
   "backstage": {
     "role": "common-library",
@@ -55,7 +55,7 @@
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@kubernetes/client-node": "0.20.0",
+    "@kubernetes/client-node": "1.0.0-rc7",
     "kubernetes-models": "^4.3.1",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0"
diff --git a/plugins/kubernetes-common/src/certificate-authority-constants.ts b/plugins/kubernetes-common/src/certificate-authority-constants.ts
new file mode 100644
index 0000000000..46401bde23
--- /dev/null
+++ b/plugins/kubernetes-common/src/certificate-authority-constants.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A constant that specifies the location of the certificate for the service account.
+ *
+ * @internal
+ */
+export const SERVICEACCOUNT_CA_PATH =
+  '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt';
diff --git a/plugins/kubernetes-common/src/index.ts b/plugins/kubernetes-common/src/index.ts
index 6704242383..faaaaab92c 100644
--- a/plugins/kubernetes-common/src/index.ts
+++ b/plugins/kubernetes-common/src/index.ts
@@ -22,6 +22,7 @@
 
 export * from './types';
 export * from './catalog-entity-constants';
+export * from './certificate-authority-constants';
 export {
   kubernetesProxyPermission,
   kubernetesPermissions,
diff --git a/plugins/kubernetes-node/CHANGELOG.md b/plugins/kubernetes-node/CHANGELOG.md
index 020109e3c3..d4d69efd81 100644
--- a/plugins/kubernetes-node/CHANGELOG.md
+++ b/plugins/kubernetes-node/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @backstage/plugin-kubernetes-node
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.2.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+
+## 0.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.2.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+
+## 0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.1.20
 
 ### Patch Changes
diff --git a/plugins/kubernetes-node/package.json b/plugins/kubernetes-node/package.json
index 413b28e08c..b15d289766 100644
--- a/plugins/kubernetes-node/package.json
+++ b/plugins/kubernetes-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-node",
-  "version": "0.1.20",
+  "version": "0.2.1-next.2",
   "description": "Node.js library for the kubernetes plugin",
   "backstage": {
     "role": "node-library",
@@ -42,7 +42,7 @@
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@kubernetes/client-node": "^0.20.0",
+    "@kubernetes/client-node": "1.0.0-rc7",
     "node-fetch": "^2.7.0",
     "winston": "^3.2.1"
   },
diff --git a/plugins/kubernetes-node/src/auth/PinnipedHelper.test.ts b/plugins/kubernetes-node/src/auth/PinnipedHelper.test.ts
index 65e48affc0..524e034117 100644
--- a/plugins/kubernetes-node/src/auth/PinnipedHelper.test.ts
+++ b/plugins/kubernetes-node/src/auth/PinnipedHelper.test.ts
@@ -90,7 +90,7 @@ describe('Pinniped - tokenCredentialRequest', () => {
             },
           },
         }),
-        import('@backstage/plugin-kubernetes-backend/alpha'),
+        import('@backstage/plugin-kubernetes-backend'),
         createBackendModule({
           pluginId: 'kubernetes',
           moduleId: 'testClusterSupplier',
@@ -261,7 +261,7 @@ describe('Pinniped - tokenCredentialRequest', () => {
               },
             },
           }),
-          import('@backstage/plugin-kubernetes-backend/alpha'),
+          import('@backstage/plugin-kubernetes-backend'),
           createBackendModule({
             pluginId: 'kubernetes',
             moduleId: 'testClusterSupplier',
diff --git a/plugins/kubernetes-react/CHANGELOG.md b/plugins/kubernetes-react/CHANGELOG.md
index c4ef0f9f67..902d065b8b 100644
--- a/plugins/kubernetes-react/CHANGELOG.md
+++ b/plugins/kubernetes-react/CHANGELOG.md
@@ -1,5 +1,99 @@
 # @backstage/plugin-kubernetes-react
 
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+
+## 0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+
+## 0.5.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- 0b729da: add the pod delete feature to the kubernetes react plugin
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+
+## 0.5.0-next.2
+
+### Patch Changes
+
+- 0b729da: add the pod delete feature to the kubernetes react plugin
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.5.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## 0.4.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/plugins/kubernetes-react/config.d.ts b/plugins/kubernetes-react/config.d.ts
index 2d2b790d05..b5b811609b 100644
--- a/plugins/kubernetes-react/config.d.ts
+++ b/plugins/kubernetes-react/config.d.ts
@@ -27,5 +27,20 @@ export interface Config {
        */
       enabled?: boolean;
     };
+    /**
+     * Frontend config
+     */
+    frontend?: {
+      /**
+       * Pod Delete config
+       */
+      podDelete?: {
+        /**
+         * Enable `podDelete` UI feature
+         * @visibility frontend
+         */
+        enabled?: boolean;
+      };
+    };
   };
 }
diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json
index 774db366de..f84cc7d881 100644
--- a/plugins/kubernetes-react/package.json
+++ b/plugins/kubernetes-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-react",
-  "version": "0.4.4",
+  "version": "0.5.2-next.2",
   "description": "Web library for the kubernetes-react plugin",
   "backstage": {
     "role": "web-library",
@@ -14,9 +14,7 @@
     ]
   },
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "repository": {
     "type": "git",
@@ -25,8 +23,23 @@
   },
   "license": "Apache-2.0",
   "sideEffects": false,
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "files": [
     "dist",
     "config.d.ts"
@@ -49,7 +62,7 @@
     "@backstage/types": "workspace:^",
     "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
-    "@kubernetes/client-node": "^0.20.0",
+    "@kubernetes/client-node": "1.0.0-rc7",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
diff --git a/plugins/kubernetes-react/report-alpha.api.md b/plugins/kubernetes-react/report-alpha.api.md
new file mode 100644
index 0000000000..00a8b6b819
--- /dev/null
+++ b/plugins/kubernetes-react/report-alpha.api.md
@@ -0,0 +1,17 @@
+## API Report File for "@backstage/plugin-kubernetes-react"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+
+// @alpha (undocumented)
+export const kubernetesReactTranslationRef: TranslationRef<
+  'kubernetes-react',
+  {
+    readonly 'podDrawer.buttons.delete': 'Delete Pod';
+  }
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/kubernetes-react/report.api.md b/plugins/kubernetes-react/report.api.md
index adb75a7d60..454302f632 100644
--- a/plugins/kubernetes-react/report.api.md
+++ b/plugins/kubernetes-react/report.api.md
@@ -512,6 +512,14 @@ export interface KubernetesObjects {
 
 // @public (undocumented)
 export interface KubernetesProxyApi {
+  // (undocumented)
+  deletePod(request: {
+    podName: string;
+    namespace: string;
+    clusterName: string;
+  }): Promise<{
+    text: string;
+  }>;
   // (undocumented)
   getEventsByInvolvedObjectName(request: {
     clusterName: string;
@@ -537,6 +545,18 @@ export const kubernetesProxyApiRef: ApiRef<KubernetesProxyApi>;
 export class KubernetesProxyClient {
   constructor(options: { kubernetesApi: KubernetesApi });
   // (undocumented)
+  deletePod({
+    podName,
+    namespace,
+    clusterName,
+  }: {
+    podName: string;
+    namespace: string;
+    clusterName: string;
+  }): Promise<{
+    text: string;
+  }>;
+  // (undocumented)
   getEventsByInvolvedObjectName({
     clusterName,
     involvedObjectName,
diff --git a/plugins/kubernetes-react/src/alpha.ts b/plugins/kubernetes-react/src/alpha.ts
new file mode 100644
index 0000000000..411bd78878
--- /dev/null
+++ b/plugins/kubernetes-react/src/alpha.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { kubernetesReactTranslationRef } from './translation';
+
+export { kubernetesReactTranslationRef };
diff --git a/plugins/kubernetes-react/src/api/KubernetesProxyClient.ts b/plugins/kubernetes-react/src/api/KubernetesProxyClient.ts
index 3703d8b180..caad2cafd0 100644
--- a/plugins/kubernetes-react/src/api/KubernetesProxyClient.ts
+++ b/plugins/kubernetes-react/src/api/KubernetesProxyClient.ts
@@ -110,4 +110,25 @@ export class KubernetesProxyClient {
       .then(response => this.handleText(response))
       .then(text => ({ text }));
   }
+
+  async deletePod({
+    podName,
+    namespace,
+    clusterName,
+  }: {
+    podName: string;
+    namespace: string;
+    clusterName: string;
+  }): Promise<{ text: string }> {
+    return await this.kubernetesApi
+      .proxy({
+        clusterName: clusterName,
+        path: `/api/v1/namespaces/${namespace}/pods/${podName}`,
+        init: {
+          method: 'DELETE',
+        },
+      })
+      .then(response => this.handleText(response))
+      .then(text => ({ text }));
+  }
 }
diff --git a/plugins/kubernetes-react/src/api/types.ts b/plugins/kubernetes-react/src/api/types.ts
index cc27bf9dd4..548a2e150c 100644
--- a/plugins/kubernetes-react/src/api/types.ts
+++ b/plugins/kubernetes-react/src/api/types.ts
@@ -83,6 +83,11 @@ export interface KubernetesProxyApi {
     containerName: string;
     previous?: boolean;
   }): Promise<{ text: string }>;
+  deletePod(request: {
+    podName: string;
+    namespace: string;
+    clusterName: string;
+  }): Promise<{ text: string }>;
   getEventsByInvolvedObjectName(request: {
     clusterName: string;
     involvedObjectName: string;
diff --git a/plugins/kubernetes-react/src/components/JobsAccordions/JobsAccordions.test.tsx b/plugins/kubernetes-react/src/components/JobsAccordions/JobsAccordions.test.tsx
index 857b472841..3ec29ca422 100644
--- a/plugins/kubernetes-react/src/components/JobsAccordions/JobsAccordions.test.tsx
+++ b/plugins/kubernetes-react/src/components/JobsAccordions/JobsAccordions.test.tsx
@@ -20,14 +20,15 @@ import { JobsAccordions } from './JobsAccordions';
 import * as oneCronJobsFixture from '../../__fixtures__/1-cronjobs.json';
 import { renderInTestApp } from '@backstage/test-utils';
 import { kubernetesProviders } from '../../hooks/test-utils';
-import { V1Job, ObjectSerializer } from '@kubernetes/client-node';
+import { V1Job } from '@kubernetes/client-node';
+import { ObjectSerializer } from '@kubernetes/client-node/dist/gen/models/ObjectSerializer';
 
 describe('JobsAccordions', () => {
   it('should render 2 jobs', async () => {
     const wrapper = kubernetesProviders(oneCronJobsFixture, new Set<string>());
 
     const jobs: V1Job[] = oneCronJobsFixture.jobs.map(
-      job => ObjectSerializer.deserialize(job, 'V1Job') as V1Job,
+      job => ObjectSerializer.deserialize(job, 'V1Job', '') as V1Job,
     );
 
     await renderInTestApp(wrapper(<JobsAccordions jobs={jobs} />));
diff --git a/plugins/kubernetes-react/src/components/Pods/Events/Events.tsx b/plugins/kubernetes-react/src/components/Pods/Events/Events.tsx
index 6a43b2fe5b..bc5d797394 100644
--- a/plugins/kubernetes-react/src/components/Pods/Events/Events.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/Events/Events.tsx
@@ -76,7 +76,7 @@ export const EventsContent = ({
               }
               return true;
             })
-            .map(event => {
+            .map((event, index) => {
               const timeAgo = event.metadata.creationTimestamp
                 ? DateTime.fromISO(event.metadata.creationTimestamp).toRelative(
                     {
@@ -85,7 +85,7 @@ export const EventsContent = ({
                   )
                 : 'unknown';
               return (
-                <ListItem key={event.metadata.name}>
+                <ListItem key={`${event.metadata.name}-${index}`}>
                   <Tooltip title={`${event.type ?? ''} event`}>
                     {getAvatarByType(event.type)}
                   </Tooltip>
diff --git a/plugins/kubernetes-react/src/components/Pods/FixDialog/FixDialog.test.tsx b/plugins/kubernetes-react/src/components/Pods/FixDialog/FixDialog.test.tsx
index 7972f4401c..25cccbb9c6 100644
--- a/plugins/kubernetes-react/src/components/Pods/FixDialog/FixDialog.test.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/FixDialog/FixDialog.test.tsx
@@ -21,13 +21,13 @@ import { renderInTestApp } from '@backstage/test-utils';
 
 jest.mock('../Events', () => ({
   Events: () => {
-    return <React.Fragment data-testid="events" />;
+    return <React.Fragment />;
   },
 }));
 
 jest.mock('../PodLogs', () => ({
   PodLogs: () => {
-    return <React.Fragment data-testid="logs" />;
+    return <React.Fragment />;
   },
 }));
 
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDelete/PodDeleteButton.tsx b/plugins/kubernetes-react/src/components/Pods/PodDelete/PodDeleteButton.tsx
new file mode 100644
index 0000000000..622a7cba63
--- /dev/null
+++ b/plugins/kubernetes-react/src/components/Pods/PodDelete/PodDeleteButton.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { useState } from 'react';
+
+import Grid from '@material-ui/core/Grid';
+import Typography from '@material-ui/core/Typography';
+import CardActions from '@material-ui/core/CardActions';
+import Button from '@material-ui/core/Button';
+import DeleteIcon from '@material-ui/icons/Close';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { kubernetesReactTranslationRef } from '../../../translation';
+
+import { usePodDelete } from './usePodDelete';
+import { PodScope } from './types';
+
+/**
+ * Props for PodDeleteButton
+ *
+ * @public
+ */
+export interface PodDeleteButtonProps {
+  podScope: PodScope;
+}
+
+/**
+ * a Delete button to delete a given pod
+ *
+ * @public
+ */
+export const PodDeleteButton = ({ podScope }: PodDeleteButtonProps) => {
+  const [isLoading, setIsLoading] = useState(false);
+  const [hasError, setHasError] = useState(false);
+  const deletePod = usePodDelete();
+
+  const { t } = useTranslationRef(kubernetesReactTranslationRef);
+  const buttonText = t('podDrawer.buttons.delete');
+
+  const handleDeleteClick = async () => {
+    setIsLoading(true);
+    try {
+      await deletePod(podScope);
+    } catch (error) {
+      setHasError(true);
+      // eslint-disable-next-line no-console
+      console.error(error);
+    }
+  };
+
+  return (
+    <Grid container item xs={12}>
+      <Grid item xs={12}>
+        <CardActions>
+          <Button
+            variant="outlined"
+            aria-label={buttonText}
+            component="label"
+            onClick={handleDeleteClick}
+            startIcon={
+              isLoading ? <CircularProgress size={18} /> : <DeleteIcon />
+            }
+            disabled={isLoading}
+          >
+            {buttonText}
+          </Button>
+        </CardActions>
+        {hasError && (
+          <Typography
+            variant="body1"
+            color="error"
+            style={{ textAlign: 'right' }}
+          >
+            Could not delete the pod. Please check the console for the full
+            report.
+          </Typography>
+        )}
+      </Grid>
+    </Grid>
+  );
+};
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDelete/index.ts b/plugins/kubernetes-react/src/components/Pods/PodDelete/index.ts
new file mode 100644
index 0000000000..443f758a29
--- /dev/null
+++ b/plugins/kubernetes-react/src/components/Pods/PodDelete/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './PodDeleteButton';
+export * from './usePodDelete';
+export * from './types';
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDelete/types.ts b/plugins/kubernetes-react/src/components/Pods/PodDelete/types.ts
new file mode 100644
index 0000000000..8b277371dd
--- /dev/null
+++ b/plugins/kubernetes-react/src/components/Pods/PodDelete/types.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ClusterAttributes } from '@backstage/plugin-kubernetes-common';
+
+/**
+ * Contains the details needed to make a delete request to Kubernetes
+ *
+ * @public
+ */
+export interface PodScope {
+  podName: string;
+  podNamespace: string;
+  cluster: ClusterAttributes;
+}
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDelete/usePodDelete.ts b/plugins/kubernetes-react/src/components/Pods/PodDelete/usePodDelete.ts
new file mode 100644
index 0000000000..31ac2478b8
--- /dev/null
+++ b/plugins/kubernetes-react/src/components/Pods/PodDelete/usePodDelete.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useCallback } from 'react';
+
+import { PodScope } from './types';
+import { useApi } from '@backstage/core-plugin-api';
+import { kubernetesProxyApiRef } from '../../../api/types';
+
+/**
+ * Arguments for usePodDelete
+ *
+ * @public
+ */
+export interface PodDeleteOptions {
+  podScope: PodScope;
+}
+
+/**
+ * Delete a given pod
+ *
+ * @public
+ */
+export const usePodDelete = () => {
+  const kubernetesProxyApi = useApi(kubernetesProxyApiRef);
+
+  const deletePod = useCallback(
+    async (podScope: PodScope) => {
+      return await kubernetesProxyApi.deletePod({
+        podName: podScope.podName,
+        namespace: podScope.podNamespace,
+        clusterName: podScope.cluster.name,
+      });
+    },
+    [kubernetesProxyApi],
+  );
+
+  return deletePod;
+};
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.tsx b/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.tsx
index 7a7b17b7f6..3709b1186e 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.tsx
@@ -27,11 +27,13 @@ import { ContainerCard } from './ContainerCard';
 
 import { PodAndErrors } from '../types';
 import { KubernetesDrawer } from '../../KubernetesDrawer';
+import { PodDeleteButton } from '../PodDelete/PodDeleteButton';
 import { PendingPodContent } from './PendingPodContent';
 import { ErrorList } from '../ErrorList';
 import { usePodMetrics } from '../../../hooks/usePodMetrics';
 import { ResourceUtilization } from '../../ResourceUtilization';
 import { bytesToMiB, formatMillicores } from '../../../utils/resources';
+import { useIsPodDeleteEnabled } from '../../../hooks';
 
 const useDrawerContentStyles = makeStyles((_theme: Theme) =>
   createStyles({
@@ -76,6 +78,7 @@ export interface PodDrawerProps {
 export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
   const classes = useDrawerContentStyles();
   const podMetrics = usePodMetrics(podAndErrors.cluster.name, podAndErrors.pod);
+  const isPodDeleteEnabled = useIsPodDeleteEnabled();
 
   return (
     <KubernetesDrawer
@@ -95,6 +98,15 @@ export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
       }
     >
       <div className={classes.content}>
+        {isPodDeleteEnabled && (
+          <PodDeleteButton
+            podScope={{
+              podName: podAndErrors.pod.metadata?.name ?? 'unknown',
+              podNamespace: podAndErrors.pod.metadata?.namespace ?? 'default',
+              cluster: podAndErrors.cluster,
+            }}
+          />
+        )}
         {podMetrics && (
           <Grid container item xs={12}>
             <Grid item xs={12}>
diff --git a/plugins/kubernetes-react/src/hooks/index.ts b/plugins/kubernetes-react/src/hooks/index.ts
index 2bc519d69a..7f80e95e41 100644
--- a/plugins/kubernetes-react/src/hooks/index.ts
+++ b/plugins/kubernetes-react/src/hooks/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './useIsPodDeleteEnabled';
 export * from './useIsPodExecTerminalEnabled';
 export * from './useIsPodExecTerminalSupported';
 export * from './useKubernetesObjects';
diff --git a/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.test.tsx b/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.test.tsx
new file mode 100644
index 0000000000..92aa601d8d
--- /dev/null
+++ b/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader } from '@backstage/core-app-api';
+import { configApiRef } from '@backstage/core-plugin-api';
+import { TestApiProvider } from '@backstage/test-utils';
+import { renderHook } from '@testing-library/react';
+import { PropsWithChildren } from 'react';
+import React from 'react';
+
+import { useIsPodDeleteEnabled } from './useIsPodDeleteEnabled';
+
+describe('useIsPodDeleteEnabled', () => {
+  let isPodDeleteEnabled: boolean | undefined;
+
+  const apiWrapper = ({ children }: PropsWithChildren) => (
+    <TestApiProvider
+      apis={[
+        [
+          configApiRef,
+          new ConfigReader({
+            kubernetes: {
+              frontend: {
+                podDelete: { enabled: isPodDeleteEnabled },
+              },
+            },
+          }),
+        ],
+      ]}
+    >
+      {children}
+    </TestApiProvider>
+  );
+
+  it.each([
+    {
+      condition: 'missing config',
+      returnValue: undefined,
+    },
+    { condition: 'disabled', returnValue: false },
+    {
+      condition: 'enabled',
+      returnValue: true,
+    },
+  ])('Should return $returnValue if $condition', async ({ returnValue }) => {
+    isPodDeleteEnabled = returnValue;
+
+    const { result } = renderHook(() => useIsPodDeleteEnabled(), {
+      wrapper: apiWrapper,
+    });
+
+    expect(result.current).toEqual(returnValue);
+  });
+});
diff --git a/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.ts b/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.ts
new file mode 100644
index 0000000000..7762a050ac
--- /dev/null
+++ b/plugins/kubernetes-react/src/hooks/useIsPodDeleteEnabled.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
+
+/**
+ * Check if conditions for a pod delete call through the proxy endpoint are met
+ *
+ * @internal
+ */
+export const useIsPodDeleteEnabled = (): boolean | undefined => {
+  const configApi = useApi(configApiRef);
+
+  return configApi
+    .getOptionalConfig('kubernetes.frontend')
+    ?.getOptionalBoolean('podDelete.enabled');
+};
diff --git a/plugins/kubernetes-react/src/translation.ts b/plugins/kubernetes-react/src/translation.ts
new file mode 100644
index 0000000000..5b8a26b0d5
--- /dev/null
+++ b/plugins/kubernetes-react/src/translation.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createTranslationRef } from '@backstage/core-plugin-api/alpha';
+
+/** @alpha */
+export const kubernetesReactTranslationRef = createTranslationRef({
+  id: 'kubernetes-react',
+  messages: {
+    podDrawer: {
+      buttons: {
+        delete: 'Delete Pod',
+      },
+    },
+  },
+});
diff --git a/plugins/kubernetes-react/src/utils/owner.ts b/plugins/kubernetes-react/src/utils/owner.ts
index bd0cd39677..e7b7d25340 100644
--- a/plugins/kubernetes-react/src/utils/owner.ts
+++ b/plugins/kubernetes-react/src/utils/owner.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { V1ObjectMeta } from '@kubernetes/client-node/dist/gen/model/v1ObjectMeta';
 import {
+  V1ObjectMeta,
   V2HorizontalPodAutoscaler,
   V1Pod,
   V1ReplicaSet,
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index b1b767d041..760c72b323 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,125 @@
 # @backstage/plugin-kubernetes
 
+## 0.12.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-kubernetes-common@0.9.1-next.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.2
+
+## 0.12.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.1
+
+## 0.12.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/plugin-kubernetes-react@0.5.2-next.0
+
+## 0.12.0
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-kubernetes-common@0.9.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+
+## 0.12.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-react@0.5.0-next.2
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+
+## 0.12.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+
+## 0.12.0-next.1
+
+### Minor Changes
+
+- 71b8704: Bumping @kubernetes/client-node to 1.0.0-rc7 to mitigate CVEs related to the request and tough-cookie packages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.9.0-next.0
+  - @backstage/plugin-kubernetes-react@0.5.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.11.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-react@0.4.5-next.0
+
 ## 0.11.16
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index b7c8d7db16..b13743f3bf 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.11.16",
+  "version": "0.12.2-next.2",
   "description": "A Backstage plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "frontend-plugin",
@@ -68,7 +68,7 @@
     "@backstage/plugin-kubernetes-react": "workspace:^",
     "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
-    "@kubernetes/client-node": "0.20.0",
+    "@kubernetes/client-node": "1.0.0-rc7",
     "@material-ui/core": "^4.12.2",
     "cronstrue": "^2.2.0",
     "js-yaml": "^4.0.0",
diff --git a/plugins/kubernetes/report-alpha.api.md b/plugins/kubernetes/report-alpha.api.md
index 9ba748577f..4f779df258 100644
--- a/plugins/kubernetes/report-alpha.api.md
+++ b/plugins/kubernetes/report-alpha.api.md
@@ -21,21 +21,6 @@ const _default: FrontendPlugin<
   },
   {},
   {
-    'api:kubernetes': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'page:kubernetes': ExtensionDefinition<{
       kind: 'page';
       name: undefined;
@@ -62,6 +47,21 @@ const _default: FrontendPlugin<
         routeRef?: RouteRef<AnyRouteRefParams> | undefined;
       };
     }>;
+    'api:kubernetes': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
     'entity-content:kubernetes/kubernetes': ExtensionDefinition<{
       kind: 'entity-content';
       name: 'kubernetes';
diff --git a/plugins/notifications-backend-module-email/CHANGELOG.md b/plugins/notifications-backend-module-email/CHANGELOG.md
index c464d697a9..0fc9419cfc 100644
--- a/plugins/notifications-backend-module-email/CHANGELOG.md
+++ b/plugins/notifications-backend-module-email/CHANGELOG.md
@@ -1,5 +1,127 @@
 # @backstage/plugin-notifications-backend-module-email
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+
+## 0.3.3
+
+### Patch Changes
+
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/catalog-model@1.7.1
+
+## 0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/notifications-backend-module-email/config.d.ts b/plugins/notifications-backend-module-email/config.d.ts
index 04e6f7910f..eaed835485 100644
--- a/plugins/notifications-backend-module-email/config.d.ts
+++ b/plugins/notifications-backend-module-email/config.d.ts
@@ -99,7 +99,7 @@ export interface Config {
         /**
          * Throttle duration between email sending, defaults to 100ms
          */
-        throttleInterval?: HumanDuration;
+        throttleInterval?: HumanDuration | string;
         /**
          * Configuration for broadcast notifications
          */
@@ -120,7 +120,7 @@ export interface Config {
           /**
            * Email cache TTL, defaults to 1 hour
            */
-          ttl?: HumanDuration;
+          ttl?: HumanDuration | string;
         };
         filter?: {
           /**
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index 0e48bbc216..f86214a7c0 100644
--- a/plugins/notifications-backend-module-email/package.json
+++ b/plugins/notifications-backend-module-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend-module-email",
-  "version": "0.3.1",
+  "version": "0.3.4-next.2",
   "description": "The email backend module for the notifications plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -36,7 +36,6 @@
   "dependencies": {
     "@aws-sdk/client-ses": "^3.550.0",
     "@aws-sdk/types": "^3.347.0",
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
index 9337915ecc..c88dda2ac0 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   NotificationProcessor,
   NotificationSendOptions,
@@ -75,14 +76,17 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
     this.replyTo = emailProcessorConfig.getOptionalString('replyTo');
     this.concurrencyLimit =
       emailProcessorConfig.getOptionalNumber('concurrencyLimit') ?? 2;
-    const throttleConfig =
-      emailProcessorConfig.getOptionalConfig('throttleInterval');
-    this.throttleInterval = throttleConfig
-      ? durationToMilliseconds(readDurationFromConfig(throttleConfig))
+    this.throttleInterval = emailProcessorConfig.has('throttleInterval')
+      ? durationToMilliseconds(
+          readDurationFromConfig(emailProcessorConfig, {
+            key: 'throttleInterval',
+          }),
+        )
       : 100;
-    const cacheConfig = emailProcessorConfig.getOptionalConfig('cache.ttl');
-    this.cacheTtl = cacheConfig
-      ? durationToMilliseconds(readDurationFromConfig(cacheConfig))
+    this.cacheTtl = emailProcessorConfig.has('cache.ttl')
+      ? durationToMilliseconds(
+          readDurationFromConfig(emailProcessorConfig, { key: 'cache.ttl' }),
+        )
       : 3_600_000;
     this.frontendBaseUrl = config.getString('app.baseUrl');
     this.allowlistEmailAddresses = emailProcessorConfig.getOptionalStringArray(
diff --git a/plugins/notifications-backend/CHANGELOG.md b/plugins/notifications-backend/CHANGELOG.md
index 48f04248d8..f8aab11db2 100644
--- a/plugins/notifications-backend/CHANGELOG.md
+++ b/plugins/notifications-backend/CHANGELOG.md
@@ -1,5 +1,150 @@
 # @backstage/plugin-notifications-backend
 
+## 0.5.0-next.2
+
+### Minor Changes
+
+- fc15b77: **BREAKING**: Removed redundant `/health` endpoint, switch to using [the built-in endpoint instead](https://backstage.io/docs/backend-system/core-services/root-health).
+
+### Patch Changes
+
+- fc15b77: Deprecated root '/' endpoints, moving them under `/notifications` instead.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## 0.4.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## 0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## 0.4.3
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+
+## 0.4.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/notifications-backend/README.md b/plugins/notifications-backend/README.md
index a6b6615d9f..080f1e746b 100644
--- a/plugins/notifications-backend/README.md
+++ b/plugins/notifications-backend/README.md
@@ -29,5 +29,5 @@ To be able to do so, `external access` needs to be enabled as described in the [
 Once the API can be accessed, the request can look like:
 
 ```
-curl -X POST [YOUR_SERVER_URL]/api/notifications -H "Content-Type: application/json" -H "Authorization: Bearer [BASE64_ENCODED_ACCESS_TOKEN]" -d '{"recipients":{"type":"entity","entityRef":"user:development/guest"},"payload": {"title": "Title of user-targeted external message","description": "The description","link": "http://foo.com/bar","severity": "high","topic": "The topic"}}'
+curl -X POST [YOUR_SERVER_URL]/api/notifications/notifications -H "Content-Type: application/json" -H "Authorization: Bearer [BASE64_ENCODED_ACCESS_TOKEN]" -d '{"recipients":{"type":"entity","entityRef":"user:development/guest"},"payload": {"title": "Title of user-targeted external message","description": "The description","link": "http://foo.com/bar","severity": "high","topic": "The topic"}}'
 ```
diff --git a/plugins/notifications-backend/dev/index.ts b/plugins/notifications-backend/dev/index.ts
index 5ee822c0cf..cee630d1ad 100644
--- a/plugins/notifications-backend/dev/index.ts
+++ b/plugins/notifications-backend/dev/index.ts
@@ -109,7 +109,7 @@ const notificationsDebug = createBackendPlugin({
 });
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 backend.add(import('@backstage/plugin-signals-backend'));
 backend.add(import('@backstage/plugin-auth-backend'));
 backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json
index beffbdb7dd..a1ba6a8b54 100644
--- a/plugins/notifications-backend/package.json
+++ b/plugins/notifications-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend",
-  "version": "0.4.1",
+  "version": "0.5.0-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "notifications",
@@ -53,8 +53,7 @@
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "knex": "^3.0.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
   },
diff --git a/plugins/notifications-backend/src/database/DatabaseNotificationsStore.test.ts b/plugins/notifications-backend/src/database/DatabaseNotificationsStore.test.ts
index 90dd3932d0..e0536c50ac 100644
--- a/plugins/notifications-backend/src/database/DatabaseNotificationsStore.test.ts
+++ b/plugins/notifications-backend/src/database/DatabaseNotificationsStore.test.ts
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
+import {
+  TestDatabaseId,
+  TestDatabases,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { DatabaseNotificationsStore } from './DatabaseNotificationsStore';
 import { Knex } from 'knex';
 import {
@@ -28,15 +32,10 @@ const databases = TestDatabases.create();
 
 async function createStore(databaseId: TestDatabaseId) {
   const knex = await databases.init(databaseId);
-  const mgr = {
-    getClient: async () => knex,
-    migrations: {
-      skip: false,
-    },
-  };
+  const database = mockServices.database({ knex, migrations: { skip: false } });
   return {
     knex,
-    storage: await DatabaseNotificationsStore.create({ database: mgr }),
+    storage: await DatabaseNotificationsStore.create({ database }),
   };
 }
 
diff --git a/plugins/notifications-backend/src/service/router.test.ts b/plugins/notifications-backend/src/service/router.test.ts
index 470532b2dc..5126181c4f 100644
--- a/plugins/notifications-backend/src/service/router.test.ts
+++ b/plugins/notifications-backend/src/service/router.test.ts
@@ -23,7 +23,11 @@ import request from 'supertest';
 import { createRouter } from './router';
 import { ConfigReader } from '@backstage/config';
 import { SignalsService } from '@backstage/plugin-signals-node';
-import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
+import {
+  mockCredentials,
+  mockErrorHandler,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { NotificationSendOptions } from '@backstage/plugin-notifications-node';
 import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
 
@@ -68,26 +72,17 @@ describe('createRouter', () => {
       auth,
       catalog,
     });
-    app = express().use(router);
+    app = express().use(router).use(mockErrorHandler());
   });
 
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
-  describe('GET /health', () => {
-    it('returns ok', async () => {
-      const response = await request(app).get('/health');
-
-      expect(response.status).toEqual(200);
-      expect(response.body).toEqual({ status: 'ok' });
-    });
-  });
-
-  describe('POST /', () => {
+  describe('POST /notifications', () => {
     const sendNotification = async (data: NotificationSendOptions) =>
       request(app)
-        .post('/')
+        .post('/notifications')
         .send(data)
         .set('Content-Type', 'application/json')
         .set('Accept', 'application/json');
diff --git a/plugins/notifications-backend/src/service/router.ts b/plugins/notifications-backend/src/service/router.ts
index 88cd1fd337..8a12a53be5 100644
--- a/plugins/notifications-backend/src/service/router.ts
+++ b/plugins/notifications-backend/src/service/router.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { errorHandler, PluginDatabaseManager } from '@backstage/backend-common';
-import express, { Request } from 'express';
+import express, { Request, Response } from 'express';
 import Router from 'express-promise-router';
 import {
   DatabaseNotificationsStore,
@@ -31,6 +30,7 @@ import {
 import { InputError, NotFoundError } from '@backstage/errors';
 import {
   AuthService,
+  DatabaseService,
   HttpAuthService,
   LoggerService,
   UserInfoService,
@@ -53,7 +53,7 @@ import { Config } from '@backstage/config';
 export interface RouterOptions {
   logger: LoggerService;
   config: Config;
-  database: PluginDatabaseManager;
+  database: DatabaseService;
   auth: AuthService;
   httpAuth: HttpAuthService;
   userInfo: UserInfoService;
@@ -250,12 +250,7 @@ export async function createRouter(
   const router = Router();
   router.use(express.json());
 
-  router.get('/health', (_, response) => {
-    logger.info('PONG!');
-    response.json({ status: 'ok' });
-  });
-
-  router.get('/', async (req, res) => {
+  const listNotificationsHandler = async (req: Request, res: Response) => {
     const user = await getUser(req);
     const opts: NotificationGetOptions = {
       user: user,
@@ -310,7 +305,10 @@ export async function createRouter(
       totalCount,
       notifications,
     });
-  });
+  };
+
+  router.get('/', listNotificationsHandler); // Deprecated endpoint
+  router.get('/notifications', listNotificationsHandler);
 
   router.get('/status', async (req: Request<any, NotificationStatus>, res) => {
     const user = await getUser(req);
@@ -345,8 +343,7 @@ export async function createRouter(
     },
   );
 
-  // Make sure this is the last "GET" handler
-  router.get('/:id', async (req, res) => {
+  const getNotificationHandler = async (req: Request, res: Response) => {
     const user = await getUser(req);
     const opts: NotificationGetOptions = {
       user: user,
@@ -358,9 +355,13 @@ export async function createRouter(
       throw new NotFoundError('Not found');
     }
     res.json(notifications[0]);
-  });
+  };
 
-  router.post('/update', async (req, res) => {
+  // Make sure this is the last "GET" handler
+  router.get('/:id', getNotificationHandler); // Deprecated endpoint
+  router.get('/notifications/:id', getNotificationHandler);
+
+  const updateNotificationsHandler = async (req: Request, res: Response) => {
     const user = await getUser(req);
     const { ids, read, saved } = req.body;
     if (!ids || !Array.isArray(ids)) {
@@ -397,7 +398,10 @@ export async function createRouter(
 
     const notifications = await store.getNotifications({ ids, user: user });
     res.json(notifications);
-  });
+  };
+
+  router.post('/update', updateNotificationsHandler); // Deprecated endpoint
+  router.post('/notifications/update', updateNotificationsHandler);
 
   const sendBroadcastNotification = async (
     baseNotification: Omit<Notification, 'user' | 'id'>,
@@ -509,77 +513,79 @@ export async function createRouter(
     return notifications;
   };
 
-  // Add new notification
-  router.post(
-    '/',
-    async (req: Request<any, Notification[], NotificationSendOptions>, res) => {
-      const credentials = await httpAuth.credentials(req, {
-        allow: ['service'],
-      });
+  const createNotificationHandler = async (
+    req: Request<any, Notification[], NotificationSendOptions>,
+    res: Response,
+  ) => {
+    const credentials = await httpAuth.credentials(req, {
+      allow: ['service'],
+    });
 
-      const origin = credentials.principal.subject;
-      const opts = await processOptions(req.body, origin);
-      const { recipients, payload } = opts;
-      const { title, link } = payload;
-      const notifications: Notification[] = [];
-      let users = [];
+    const origin = credentials.principal.subject;
+    const opts = await processOptions(req.body, origin);
+    const { recipients, payload } = opts;
+    const { title, link } = payload;
+    const notifications: Notification[] = [];
+    let users = [];
 
-      if (!recipients || !title) {
-        logger.error(`Invalid notification request received`);
-        throw new InputError(`Invalid notification request received`);
+    if (!recipients || !title) {
+      logger.error(`Invalid notification request received`);
+      throw new InputError(`Invalid notification request received`);
+    }
+
+    if (link) {
+      try {
+        validateLink(link);
+      } catch (e) {
+        throw new InputError('Invalid link provided', e);
       }
+    }
 
-      if (link) {
-        try {
-          validateLink(link);
-        } catch (e) {
-          throw new InputError('Invalid link provided', e);
-        }
-      }
+    const baseNotification = {
+      payload: {
+        ...payload,
+        severity: payload.severity ?? 'normal',
+      },
+      origin,
+      created: new Date(),
+    };
 
-      const baseNotification = {
-        payload: {
-          ...payload,
-          severity: payload.severity ?? 'normal',
-        },
+    if (recipients.type === 'broadcast') {
+      const broadcast = await sendBroadcastNotification(
+        baseNotification,
+        opts,
         origin,
-        created: new Date(),
-      };
+      );
+      notifications.push(broadcast);
+    } else {
+      const entityRef = recipients.entityRef;
 
-      if (recipients.type === 'broadcast') {
-        const broadcast = await sendBroadcastNotification(
-          baseNotification,
-          opts,
-          origin,
+      try {
+        users = await getUsersForEntityRef(
+          entityRef,
+          recipients.excludeEntityRef ?? [],
+          { auth, catalogClient: catalog },
         );
-        notifications.push(broadcast);
-      } else {
-        const entityRef = recipients.entityRef;
-
-        try {
-          users = await getUsersForEntityRef(
-            entityRef,
-            recipients.excludeEntityRef ?? [],
-            { auth, catalogClient: catalog },
-          );
-        } catch (e) {
-          logger.error(`Failed to resolve notification receivers: ${e}`);
-          throw new InputError('Failed to resolve notification receivers', e);
-        }
-
-        const userNotifications = await sendUserNotifications(
-          baseNotification,
-          users,
-          opts,
-          origin,
-        );
-        notifications.push(...userNotifications);
+      } catch (e) {
+        logger.error(`Failed to resolve notification receivers: ${e}`);
+        throw new InputError('Failed to resolve notification receivers', e);
       }
 
-      res.json(notifications);
-    },
-  );
+      const userNotifications = await sendUserNotifications(
+        baseNotification,
+        users,
+        opts,
+        origin,
+      );
+      notifications.push(...userNotifications);
+    }
+
+    res.json(notifications);
+  };
+
+  // Add new notification
+  router.post('/', createNotificationHandler);
+  router.post('/notifications', createNotificationHandler);
 
-  router.use(errorHandler());
   return router;
 }
diff --git a/plugins/notifications-common/CHANGELOG.md b/plugins/notifications-common/CHANGELOG.md
index 6e10272c36..8b536cc17f 100644
--- a/plugins/notifications-common/CHANGELOG.md
+++ b/plugins/notifications-common/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-notifications-common
 
+## 0.0.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+
+## 0.0.6
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/config@1.3.0
+
+## 0.0.6-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/config@1.2.0
+
 ## 0.0.5
 
 ### Patch Changes
diff --git a/plugins/notifications-common/package.json b/plugins/notifications-common/package.json
index 139681e6c6..7d5689fb77 100644
--- a/plugins/notifications-common/package.json
+++ b/plugins/notifications-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-common",
-  "version": "0.0.5",
+  "version": "0.0.7-next.0",
   "description": "Common functionalities for the notifications plugin",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/notifications-node/CHANGELOG.md b/plugins/notifications-node/CHANGELOG.md
index 7c99c18076..d35c6a9c9a 100644
--- a/plugins/notifications-node/CHANGELOG.md
+++ b/plugins/notifications-node/CHANGELOG.md
@@ -1,5 +1,96 @@
 # @backstage/plugin-notifications-node
 
+## 0.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## 0.2.10-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## 0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## 0.2.9
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/catalog-model@1.7.1
+
+## 0.2.9-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## 0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## 0.2.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/plugins/notifications-node/package.json b/plugins/notifications-node/package.json
index 47f05baa5d..56db67f3cf 100644
--- a/plugins/notifications-node/package.json
+++ b/plugins/notifications-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-node",
-  "version": "0.2.7",
+  "version": "0.2.10-next.2",
   "description": "Node.js library for the notifications plugin",
   "backstage": {
     "role": "node-library",
@@ -37,15 +37,13 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/plugin-notifications-common": "workspace:^",
     "@backstage/plugin-signals-node": "workspace:^",
     "knex": "^3.0.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/notifications-node/src/service/DefaultNotificationService.ts b/plugins/notifications-node/src/service/DefaultNotificationService.ts
index 7a46e01689..8ea58f22d3 100644
--- a/plugins/notifications-node/src/service/DefaultNotificationService.ts
+++ b/plugins/notifications-node/src/service/DefaultNotificationService.ts
@@ -17,7 +17,6 @@
 import { NotificationService } from './NotificationService';
 import { AuthService, DiscoveryService } from '@backstage/backend-plugin-api';
 import { NotificationPayload } from '@backstage/plugin-notifications-common';
-import fetch from 'node-fetch';
 
 /** @public */
 export type NotificationServiceOptions = {
diff --git a/plugins/notifications/CHANGELOG.md b/plugins/notifications/CHANGELOG.md
index 97724d1efc..06ce8f8206 100644
--- a/plugins/notifications/CHANGELOG.md
+++ b/plugins/notifications/CHANGELOG.md
@@ -1,5 +1,110 @@
 # @backstage/plugin-notifications
 
+## 0.5.0-next.2
+
+### Minor Changes
+
+- fc15b77: Switched to using the new `/notifications` endpoints. Be sure to update the `notifications` plugin backend before deploying this frontend plugin change.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+
+## 0.4.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.4.0
+
+### Minor Changes
+
+- 87ffc1c: Rephrasing labels of the View filter to be more clear. Based on the received users' feedback.
+
+### Patch Changes
+
+- 4186105: Added title to the Notifications' table. The title clearly states the filter selection and total count of messages. This change aligns the look and feel closer to other tables.
+- 3a0731e: The "Created after" filter renamed to the "Sent out" based on the received users' feedback.
+- 3e135f2: The notification's title is emphasized to be clearly distinguished from the description.
+- 97ba58f: Add support for user specific notification settings
+- 1d87c43: Show count of unread notifications in the left-side MenuItem. This replaces the simple true/false bullet.
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-react@0.0.6
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-signals-react@0.0.6
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- 97ba58f: Add support for user specific notification settings
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 467b8698c1..a2ca6a3f20 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications",
-  "version": "0.3.2",
+  "version": "0.5.0-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "notifications",
diff --git a/plugins/notifications/report.api.md b/plugins/notifications/report.api.md
index 2f2357e479..17c1e7e338 100644
--- a/plugins/notifications/report.api.md
+++ b/plugins/notifications/report.api.md
@@ -125,6 +125,7 @@ export const NotificationsSidebarItem: (props?: {
 
 // @public (undocumented)
 export const NotificationsTable: ({
+  title,
   markAsReadOnLinkOpen,
   isLoading,
   notifications,
@@ -141,7 +142,7 @@ export const NotificationsTable: ({
 // @public (undocumented)
 export type NotificationsTableProps = Pick<
   TableProps,
-  'onPageChange' | 'onRowsPerPageChange' | 'page' | 'totalCount'
+  'onPageChange' | 'onRowsPerPageChange' | 'page' | 'totalCount' | 'title'
 > & {
   markAsReadOnLinkOpen?: boolean;
   isLoading?: boolean;
diff --git a/plugins/notifications/src/api/NotificationsClient.test.ts b/plugins/notifications/src/api/NotificationsClient.test.ts
index f378269e45..8248ea9331 100644
--- a/plugins/notifications/src/api/NotificationsClient.test.ts
+++ b/plugins/notifications/src/api/NotificationsClient.test.ts
@@ -48,7 +48,7 @@ describe('NotificationsClient', () => {
 
     it('should fetch notifications from correct endpoint', async () => {
       server.use(
-        rest.get(`${mockBaseUrl}/`, (_, res, ctx) =>
+        rest.get(`${mockBaseUrl}/notifications`, (_, res, ctx) =>
           res(ctx.json(expectedResp)),
         ),
       );
@@ -58,7 +58,7 @@ describe('NotificationsClient', () => {
 
     it('should fetch notifications with options', async () => {
       server.use(
-        rest.get(`${mockBaseUrl}/`, (req, res, ctx) => {
+        rest.get(`${mockBaseUrl}/notifications`, (req, res, ctx) => {
           expect(req.url.search).toBe(
             '?limit=10&offset=0&search=find+me&read=true&createdAfter=1970-01-01T00%3A00%3A00.005Z',
           );
@@ -77,7 +77,7 @@ describe('NotificationsClient', () => {
 
     it('should omit unselected fetch options', async () => {
       server.use(
-        rest.get(`${mockBaseUrl}/`, (req, res, ctx) => {
+        rest.get(`${mockBaseUrl}/notifications`, (req, res, ctx) => {
           expect(req.url.search).toBe('?limit=10');
           return res(ctx.json(expectedResp));
         }),
@@ -91,7 +91,7 @@ describe('NotificationsClient', () => {
 
     it('should fetch single notification', async () => {
       server.use(
-        rest.get(`${mockBaseUrl}/:id`, (req, res, ctx) => {
+        rest.get(`${mockBaseUrl}/notifications/:id`, (req, res, ctx) => {
           expect(req.params.id).toBe('acdaa8ca-262b-43c1-b74b-de06e5f3b3c7');
           return res(ctx.json(testNotification));
         }),
@@ -115,12 +115,15 @@ describe('NotificationsClient', () => {
 
     it('should update notifications', async () => {
       server.use(
-        rest.post(`${mockBaseUrl}/update`, async (req, res, ctx) => {
-          expect(await req.json()).toEqual({
-            ids: ['acdaa8ca-262b-43c1-b74b-de06e5f3b3c7'],
-          });
-          return res(ctx.json(expectedResp));
-        }),
+        rest.post(
+          `${mockBaseUrl}/notifications/update`,
+          async (req, res, ctx) => {
+            expect(await req.json()).toEqual({
+              ids: ['acdaa8ca-262b-43c1-b74b-de06e5f3b3c7'],
+            });
+            return res(ctx.json(expectedResp));
+          },
+        ),
       );
       const response = await client.updateNotifications({
         ids: ['acdaa8ca-262b-43c1-b74b-de06e5f3b3c7'],
diff --git a/plugins/notifications/src/api/NotificationsClient.ts b/plugins/notifications/src/api/NotificationsClient.ts
index 983065f96e..5e763ecb8c 100644
--- a/plugins/notifications/src/api/NotificationsClient.ts
+++ b/plugins/notifications/src/api/NotificationsClient.ts
@@ -71,23 +71,26 @@ export class NotificationsClient implements NotificationsApi {
     if (options?.minimumSeverity !== undefined) {
       queryString.append('minimumSeverity', options.minimumSeverity);
     }
-    const urlSegment = `?${queryString}`;
 
-    return await this.request<GetNotificationsResponse>(urlSegment);
+    return await this.request<GetNotificationsResponse>(
+      `/notifications?${queryString}`,
+    );
   }
 
   async getNotification(id: string): Promise<Notification> {
-    return await this.request<Notification>(`${id}`);
+    return await this.request<Notification>(
+      `/notifications/${encodeURIComponent(id)}`,
+    );
   }
 
   async getStatus(): Promise<NotificationStatus> {
-    return await this.request<NotificationStatus>('status');
+    return await this.request<NotificationStatus>('/status');
   }
 
   async updateNotifications(
     options: UpdateNotificationsOptions,
   ): Promise<Notification[]> {
-    return await this.request<Notification[]>('update', {
+    return await this.request<Notification[]>('/notifications/update', {
       method: 'POST',
       body: JSON.stringify(options),
       headers: { 'Content-Type': 'application/json' },
@@ -95,29 +98,27 @@ export class NotificationsClient implements NotificationsApi {
   }
 
   async getNotificationSettings(): Promise<NotificationSettings> {
-    return await this.request<NotificationSettings>('settings');
+    return await this.request<NotificationSettings>('/settings');
   }
 
   async updateNotificationSettings(
     settings: NotificationSettings,
   ): Promise<NotificationSettings> {
-    return await this.request<NotificationSettings>('settings', {
+    return await this.request<NotificationSettings>('/settings', {
       method: 'POST',
       body: JSON.stringify(settings),
       headers: { 'Content-Type': 'application/json' },
     });
   }
 
-  private async request<T>(path: string, init?: any): Promise<T> {
-    const baseUrl = `${await this.discoveryApi.getBaseUrl('notifications')}/`;
-    const url = new URL(path, baseUrl);
+  private async request<T>(path: string, init?: RequestInit): Promise<T> {
+    const baseUrl = await this.discoveryApi.getBaseUrl('notifications');
+    const res = await this.fetchApi.fetch(`${baseUrl}${path}`, init);
 
-    const response = await this.fetchApi.fetch(url.toString(), init);
-
-    if (!response.ok) {
-      throw await ResponseError.fromResponse(response);
+    if (!res.ok) {
+      throw await ResponseError.fromResponse(res);
     }
 
-    return response.json() as Promise<T>;
+    return res.json() as Promise<T>;
   }
 }
diff --git a/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx b/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
index 2676016695..0cb88bb3f8 100644
--- a/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
+++ b/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
@@ -197,9 +197,9 @@ export const NotificationsFilters = ({
               value={viewValue}
               onChange={handleOnViewChanged}
             >
-              <MenuItem value="unread">New only</MenuItem>
+              <MenuItem value="unread">Unread notifications</MenuItem>
+              <MenuItem value="read">Read notifications</MenuItem>
               <MenuItem value="saved">Saved</MenuItem>
-              <MenuItem value="read">Marked as read</MenuItem>
               <MenuItem value="all">All</MenuItem>
             </Select>
           </FormControl>
@@ -207,12 +207,10 @@ export const NotificationsFilters = ({
 
         <Grid item xs={12}>
           <FormControl fullWidth variant="outlined" size="small">
-            <InputLabel id="notifications-filter-created">
-              Created after
-            </InputLabel>
+            <InputLabel id="notifications-filter-created">Sent out</InputLabel>
 
             <Select
-              label="Created after"
+              label="Sent out"
               labelId="notifications-filter-created"
               placeholder="Notifications since"
               value={createdAfter}
diff --git a/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx b/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
index ef1fda0407..0d48a064e5 100644
--- a/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
+++ b/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
@@ -144,6 +144,15 @@ export const NotificationsPage = (props?: NotificationsPageProps) => {
   const totalCount = value?.[0]?.totalCount;
   const isUnread = !!value?.[1]?.unread;
 
+  let tableTitle = `All notifications (${totalCount})`;
+  if (saved) {
+    tableTitle = `Saved notifications (${totalCount})`;
+  } else if (unreadOnly === true) {
+    tableTitle = `Unread notifications (${totalCount})`;
+  } else if (unreadOnly === false) {
+    tableTitle = `Read notifications (${totalCount})`;
+  }
+
   return (
     <PageWithHeader
       title={title}
@@ -172,6 +181,7 @@ export const NotificationsPage = (props?: NotificationsPageProps) => {
             </Grid>
             <Grid item xs={10}>
               <NotificationsTable
+                title={tableTitle}
                 isLoading={loading}
                 isUnread={isUnread}
                 markAsReadOnLinkOpen={markAsReadOnLinkOpen}
diff --git a/plugins/notifications/src/components/NotificationsSideBarItem/NotificationsSideBarItem.tsx b/plugins/notifications/src/components/NotificationsSideBarItem/NotificationsSideBarItem.tsx
index 22ce11db69..105318564e 100644
--- a/plugins/notifications/src/components/NotificationsSideBarItem/NotificationsSideBarItem.tsx
+++ b/plugins/notifications/src/components/NotificationsSideBarItem/NotificationsSideBarItem.tsx
@@ -45,6 +45,7 @@ import { SeverityIcon } from '../NotificationsTable/SeverityIcon';
 import OpenInNew from '@material-ui/icons/OpenInNew';
 import MarkAsReadIcon from '@material-ui/icons/CheckCircle';
 import IconButton from '@material-ui/core/IconButton';
+import Chip from '@material-ui/core/Chip';
 import { styled } from '@material-ui/core/styles';
 
 const StyledMaterialDesignContent = styled(MaterialDesignContent)(
@@ -253,7 +254,8 @@ export const NotificationsSidebarItem = (props?: {
     }
   }, [titleCounterEnabled, unreadCount, setNotificationCount]);
 
-  // TODO: Figure out if the count can be added to hasNotifications
+  const count = !error && !!unreadCount ? unreadCount : undefined;
+
   return (
     <>
       {snackbarEnabled && (
@@ -277,11 +279,12 @@ export const NotificationsSidebarItem = (props?: {
         onClick={() => {
           requestUserPermission();
         }}
-        hasNotifications={!error && !!unreadCount}
         text={text}
         icon={icon}
         {...restProps}
-      />
+      >
+        {count && <Chip size="small" label={count > 99 ? '99+' : count} />}
+      </SidebarItem>
     </>
   );
 };
diff --git a/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx b/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
index ee3e4e164d..71a490b27c 100644
--- a/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
+++ b/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
@@ -61,7 +61,7 @@ const useStyles = makeStyles(theme => ({
 /** @public */
 export type NotificationsTableProps = Pick<
   TableProps,
-  'onPageChange' | 'onRowsPerPageChange' | 'page' | 'totalCount'
+  'onPageChange' | 'onRowsPerPageChange' | 'page' | 'totalCount' | 'title'
 > & {
   markAsReadOnLinkOpen?: boolean;
   isLoading?: boolean;
@@ -74,6 +74,7 @@ export type NotificationsTableProps = Pick<
 
 /** @public */
 export const NotificationsTable = ({
+  title,
   markAsReadOnLinkOpen,
   isLoading,
   notifications = [],
@@ -222,7 +223,7 @@ export const NotificationsTable = ({
               </Grid>
               <Grid item xs={11}>
                 <Box>
-                  <Typography variant="subtitle2">
+                  <Typography variant="subtitle1">
                     {notification.payload.link ? (
                       <Link
                         to={notification.payload.link}
@@ -334,6 +335,7 @@ export const NotificationsTable = ({
         header: true,
         sorting: false,
       }}
+      title={title}
       onPageChange={onPageChange}
       onRowsPerPageChange={onRowsPerPageChange}
       page={page}
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index e9e4908bbf..2cdb42440f 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-org-react
 
+## 0.1.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+
+## 0.1.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.31
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+
+## 0.1.31-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+
+## 0.1.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+
+## 0.1.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
 ## 0.1.30
 
 ### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index 0b1c5d42a1..7317cdf019 100644
--- a/plugins/org-react/package.json
+++ b/plugins/org-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org-react",
-  "version": "0.1.30",
+  "version": "0.1.33-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "org",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index ccc7063f09..090168e075 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,110 @@
 # @backstage/plugin-org
 
+## 0.6.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+
+## 0.6.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.6.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.6.32
+
+### Patch Changes
+
+- a278fdd: Fix rendering of description in MembersListCard. Add guardrails for potential long texts to prevent it from breaking the UI.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-catalog-common@1.1.1
+
+## 0.6.32-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.6.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## 0.6.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+
+## 0.6.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+
 ## 0.6.31
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 916b1a8fbd..d5efb6d5d8 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.6.31",
+  "version": "0.6.34-next.2",
   "description": "A Backstage plugin that helps you create entity pages for your organization",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index a54ee201c5..eff8a44015 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -112,7 +112,9 @@ const MemberComponent = (props: { member: UserEntity }) => {
             </Link>
           )}
           {description && (
-            <Typography variant="subtitle2">{description}</Typography>
+            <Typography variant="subtitle2">
+              <OverflowTooltip text={description} line={5} />
+            </Typography>
           )}
         </Box>
       </Box>
diff --git a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
index e289f8265a..71f4a57fdc 100644
--- a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-permission-backend-module-allow-all-policy
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.5
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/permission-backend-module-policy-allow-all/package.json b/plugins/permission-backend-module-policy-allow-all/package.json
index 63f805cd13..8ec39d74c7 100644
--- a/plugins/permission-backend-module-policy-allow-all/package.json
+++ b/plugins/permission-backend-module-policy-allow-all/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend-module-allow-all-policy",
-  "version": "0.2.1",
+  "version": "0.2.3-next.2",
   "description": "Allow all policy backend module for the permission plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index 636e81883e..ba1968408a 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,91 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.52-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.5.52-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.5.52-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+
+## 0.5.51
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+
+## 0.5.51-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+
+## 0.5.51-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+
+## 0.5.51-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+
 ## 0.5.50
 
 ### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 1f6f7f705f..b358be1cb7 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend",
-  "version": "0.5.50",
+  "version": "0.5.52-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "permission",
@@ -58,12 +58,11 @@
     "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
-    "@types/express": "*",
+    "@types/express": "^4.17.6",
     "dataloader": "^2.0.0",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "yn": "^4.0.0",
     "zod": "^3.22.4"
   },
diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts
index 767c7e9dd1..21d2f66887 100644
--- a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts
+++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
 import { z } from 'zod';
 import {
   AuthorizeResult,
diff --git a/plugins/permission-common/CHANGELOG.md b/plugins/permission-common/CHANGELOG.md
index b485e9454f..7731cc583e 100644
--- a/plugins/permission-common/CHANGELOG.md
+++ b/plugins/permission-common/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-permission-common
 
+## 0.8.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.8.2
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/errors@1.2.5
+
 ## 0.8.1
 
 ### Patch Changes
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index 4ea5f56814..5ed838a42f 100644
--- a/plugins/permission-common/package.json
+++ b/plugins/permission-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-common",
-  "version": "0.8.1",
+  "version": "0.8.3-next.0",
   "description": "Isomorphic types and client for Backstage permissions and authorization",
   "backstage": {
     "role": "common-library",
@@ -52,7 +52,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/types": "workspace:^",
     "cross-fetch": "^4.0.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.20.4"
   },
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index 4f1fc3de06..a99a573ad1 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @backstage/plugin-permission-node
 
+## 0.8.6-next.2
+
+### Patch Changes
+
+- b149e2a: The `createPermissionIntegrationRouter` function now detects and prevents the exposure of duplicate permissions.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.8.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.8.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+
+## 0.8.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+
+## 0.8.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.8.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## 0.8.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.8.4
 
 ### Patch Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index c8fd1ed0a9..631006daee 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-node",
-  "version": "0.8.4",
+  "version": "0.8.6-next.2",
   "description": "Common permission and authorization utilities for backend plugins",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
index 24e1b91065..a38059e547 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
@@ -904,7 +904,7 @@ describe('createPermissionIntegrationRouter', () => {
     const response = await request(
       express().use(
         createPermissionIntegrationRouter({
-          permissions: [aPermission],
+          permissions: [aPermission, testPermission],
           resources: [
             {
               resourceType: 'test-resource',
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
index 40d215d515..5210e6fb1c 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
@@ -328,11 +328,16 @@ export function createPermissionIntegrationRouter<
         >
       ).rules || [],
   );
-  const allPermissions = [
-    ...((options as { permissions: Permission[] }).permissions || []),
-    ...(optionsWithResources.resources?.flatMap(o => o.permissions || []) ||
-      []),
-  ];
+
+  const allPermissions = Array.from(
+    new Map(
+      [
+        ...((options as { permissions: Permission[] }).permissions || []),
+        ...(optionsWithResources.resources?.flatMap(o => o.permissions || []) ||
+          []),
+      ].map(i => [i.name, i]),
+    ).values(),
+  );
 
   const allResourceTypes = allOptions.reduce((acc, option) => {
     if (
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index c049a01855..fa68a10367 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-permission-react
 
+## 0.4.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 0.4.28
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/core-plugin-api@1.10.1
+
 ## 0.4.27
 
 ### Patch Changes
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index dc452594df..6d7fe9af18 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.27",
+  "version": "0.4.29-next.0",
   "backstage": {
     "role": "web-library",
     "pluginId": "permission",
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index d5f38be9b8..2fe259d217 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-proxy-backend
 
+## 0.5.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.5.9-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## 0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## 0.5.8
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.5.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## 0.5.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## 0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
 ## 0.5.7
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index f5edbb3b40..90e52a1367 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.5.7",
+  "version": "0.5.9-next.2",
   "description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
   "backstage": {
     "role": "backend-plugin",
@@ -62,7 +62,7 @@
     "express-promise-router": "^4.1.0",
     "http-proxy-middleware": "^2.0.0",
     "morgan": "^1.10.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "yaml": "^2.0.0",
     "yn": "^4.0.0",
@@ -76,10 +76,8 @@
     "@backstage/config-loader": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@types/http-proxy-middleware": "^1.0.0",
-    "@types/uuid": "^9.0.0",
     "@types/yup": "^0.32.0",
-    "msw": "^2.0.0",
-    "node-fetch": "^2.7.0"
+    "msw": "^2.0.0"
   },
   "configSchema": "config.d.ts"
 }
diff --git a/plugins/proxy-backend/src/service/router.config.test.ts b/plugins/proxy-backend/src/service/router.config.test.ts
index be26ddb9bc..d862107e00 100644
--- a/plugins/proxy-backend/src/service/router.config.test.ts
+++ b/plugins/proxy-backend/src/service/router.config.test.ts
@@ -29,7 +29,6 @@ import {
 } from '@backstage/config-loader';
 import { HttpResponse, http, passthrough } from 'msw';
 import { setupServer } from 'msw/node';
-import fetch from 'node-fetch';
 
 // this test is stored in its own file to work around the mocked
 // http-proxy-middleware module used in the main test file
diff --git a/plugins/proxy-backend/src/service/router.credentials.test.ts b/plugins/proxy-backend/src/service/router.credentials.test.ts
index a48b18e8e2..6d1f529b30 100644
--- a/plugins/proxy-backend/src/service/router.credentials.test.ts
+++ b/plugins/proxy-backend/src/service/router.credentials.test.ts
@@ -25,7 +25,6 @@ import { ResponseError } from '@backstage/errors';
 import { JsonObject } from '@backstage/types';
 import { HttpResponse, http, passthrough } from 'msw';
 import { setupServer } from 'msw/node';
-import fetch from 'node-fetch';
 
 // this test is stored in its own file to work around the mocked
 // http-proxy-middleware module used in the main test file
diff --git a/plugins/scaffolder-backend-module-azure/CHANGELOG.md b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
index b977215a70..5fe7df4a13 100644
--- a/plugins/scaffolder-backend-module-azure/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-scaffolder-backend-module-azure
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-azure/package.json b/plugins/scaffolder-backend-module-azure/package.json
index 37837b26d8..4b3b42046f 100644
--- a/plugins/scaffolder-backend-module-azure/package.json
+++ b/plugins/scaffolder-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-azure",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The azure module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
index cb2bc833ed..0bfa509d93 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,121 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-cloud
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+
+## 0.2.2
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+  ```
+  AlreadyExistsError: Failed to create branch at create-test because it already exists.
+  ```
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+  ```
+  AlreadyExistsError: Failed to create branch at create-test because it already exists.
+  ```
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
index ac42885691..349e6cc60a 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -49,7 +49,6 @@
     "@backstage/plugin-bitbucket-cloud-common": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "^11.2.0",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
index 71eacea955..00c27f6a54 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
@@ -22,7 +22,6 @@ import {
   getRepoSourceDirectory,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { Response, RequestInit } from 'node-fetch';
 
 import { Config } from '@backstage/config';
 import { getAuthorizationHeader } from './helpers';
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
index c44fdcc824..8525774692 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
@@ -16,7 +16,6 @@
 
 import { examples } from './bitbucketCloudPipelinesRun.examples';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
-import fetch, { Response } from 'node-fetch';
 import * as inputProps from './inputProperties';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { getAuthorizationHeader } from './helpers';
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
index 4d1f0e3a40..c70089abc2 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
@@ -21,11 +21,9 @@ import {
   getRepoSourceDirectory,
   commitAndPushBranch,
   addFiles,
-  createBranch as createGitBranch,
   cloneRepo,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { RequestInit, Response } from 'node-fetch';
 import { Config } from '@backstage/config';
 import fs from 'fs-extra';
 import { getAuthorizationHeader } from './helpers';
@@ -412,13 +410,6 @@ export function createPublishBitbucketCloudPullRequestAction(options: {
           ref: sourceBranch,
         });
 
-        await createGitBranch({
-          dir: tempDir,
-          auth,
-          logger: ctx.logger,
-          ref: sourceBranch,
-        });
-
         // copy files
         fs.cpSync(sourceDir, tempDir, {
           recursive: true,
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
index d99a8358b9..10b277963b 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.test.ts
@@ -14,26 +14,40 @@
  * limitations under the License.
  */
 
+import { InputError } from '@backstage/errors';
 import { BitbucketCloudClient } from '@backstage/plugin-bitbucket-cloud-common';
 import { handleAutocompleteRequest } from './autocomplete';
-import { InputError } from '@backstage/errors';
 
 describe('handleAutocompleteRequest', () => {
   const client: Partial<BitbucketCloudClient> = {
     listWorkspaces: jest.fn().mockReturnValue({
-      iteratePages: jest
-        .fn()
-        .mockReturnValue([{ values: [{ slug: 'workspace1' }] }]),
+      iteratePages: jest.fn().mockReturnValue([
+        {
+          values: [
+            {
+              slug: 'workspace1',
+            },
+          ],
+        },
+      ]),
     }),
     listProjectsByWorkspace: jest.fn().mockReturnValue({
-      iteratePages: jest
-        .fn()
-        .mockReturnValue([{ values: [{ key: 'project1' }] }]),
+      iteratePages: jest.fn().mockReturnValue([
+        {
+          values: [{ key: 'project1' }],
+        },
+      ]),
     }),
     listRepositoriesByWorkspace: jest.fn().mockReturnValue({
-      iteratePages: jest
-        .fn()
-        .mockReturnValue([{ values: [{ slug: 'repository1' }] }]),
+      iteratePages: jest.fn().mockReturnValue([
+        {
+          values: [
+            {
+              slug: 'repository1',
+            },
+          ],
+        },
+      ]),
     }),
     listBranchesByRepository: jest.fn().mockReturnValue({
       iteratePages: jest
@@ -66,7 +80,9 @@ describe('handleAutocompleteRequest', () => {
       resource: 'workspaces',
     });
 
-    expect(result).toEqual({ results: [{ title: 'workspace1' }] });
+    expect(result).toEqual({
+      results: [{ id: 'workspace1' }],
+    });
   });
 
   it('should return projects', async () => {
@@ -78,7 +94,9 @@ describe('handleAutocompleteRequest', () => {
       resource: 'projects',
     });
 
-    expect(result).toEqual({ results: [{ title: 'project1' }] });
+    expect(result).toEqual({
+      results: [{ id: 'project1' }],
+    });
   });
 
   it('should return repositories', async () => {
@@ -91,7 +109,9 @@ describe('handleAutocompleteRequest', () => {
       },
     });
 
-    expect(result).toEqual({ results: [{ title: 'repository1' }] });
+    expect(result).toEqual({
+      results: [{ id: 'repository1' }],
+    });
   });
 
   it('should return branches', async () => {
@@ -104,7 +124,7 @@ describe('handleAutocompleteRequest', () => {
       },
     });
 
-    expect(result).toEqual({ results: [{ title: 'branch1' }] });
+    expect(result).toEqual({ results: [{ id: 'branch1' }] });
   });
 
   it('should throw an error when passing an invalid resource', async () => {
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
index 75cc170a30..3d1cdd5748 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/autocomplete/autocomplete.ts
@@ -25,7 +25,7 @@ export async function handleAutocompleteRequest({
   resource: string;
   token: string;
   context: Record<string, string>;
-}): Promise<{ results: { title: string }[] }> {
+}): Promise<{ results: { title?: string; id: string }[] }> {
   const client = BitbucketCloudClient.fromConfig({
     host: 'bitbucket.org',
     apiBaseUrl: 'https://api.bitbucket.org/2.0',
@@ -34,10 +34,12 @@ export async function handleAutocompleteRequest({
 
   switch (resource) {
     case 'workspaces': {
-      const results: { title: string }[] = [];
+      const results: { title?: string; id: string }[] = [];
 
       for await (const page of client.listWorkspaces().iteratePages()) {
-        const slugs = [...page.values!].map(p => ({ title: p.slug! }));
+        const slugs = [...page.values!].map(p => ({
+          id: p.slug!,
+        }));
         results.push(...slugs);
       }
 
@@ -47,12 +49,14 @@ export async function handleAutocompleteRequest({
       if (!context.workspace)
         throw new InputError('Missing workspace context parameter');
 
-      const results: { title: string }[] = [];
+      const results: { title?: string; id: string }[] = [];
 
       for await (const page of client
         .listProjectsByWorkspace(context.workspace)
         .iteratePages()) {
-        const keys = [...page.values!].map(p => ({ title: p.key! }));
+        const keys = [...page.values!].map(p => ({
+          id: p.key!,
+        }));
         results.push(...keys);
       }
 
@@ -64,14 +68,16 @@ export async function handleAutocompleteRequest({
           'Missing workspace and/or project context parameter',
         );
 
-      const results: { title: string }[] = [];
+      const results: { title?: string; id: string }[] = [];
 
       for await (const page of client
         .listRepositoriesByWorkspace(context.workspace, {
           q: `project.key="${context.project}"`,
         })
         .iteratePages()) {
-        const slugs = [...page.values!].map(p => ({ title: p.slug! }));
+        const slugs = [...page.values!].map(p => ({
+          id: p.slug!,
+        }));
         results.push(...slugs);
       }
 
@@ -83,12 +89,14 @@ export async function handleAutocompleteRequest({
           'Missing workspace and/or repository context parameter',
         );
 
-      const results: { title: string }[] = [];
+      const results: { title?: string; id: string }[] = [];
 
       for await (const page of client
         .listBranchesByRepository(context.repository, context.workspace)
         .iteratePages()) {
-        const names = [...page.values!].map(p => ({ title: p.name! }));
+        const names = [...page.values!].map(p => ({
+          id: p.name!,
+        }));
         results.push(...names);
       }
 
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
index aca71727e2..af3ec86cb8 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,112 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-server
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+  ```
+  AlreadyExistsError: Failed to create branch at create-test because it already exists.
+  ```
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- 9cf827c: Fix double branch creation in `public:bitbucket{Cloud,Server}:pull-request`
+  This resulted in the following error when using the actions:
+
+  ```
+  AlreadyExistsError: Failed to create branch at create-test because it already exists.
+  ```
+
+  The issue was original introduced in d103a48fa306d745599dc0c793668c9e6a479d32
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
index 55b61d7663..ef35f60c72 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -48,7 +48,6 @@
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "^11.2.0",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts
index 413984aff5..612d090547 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.ts
@@ -25,7 +25,6 @@ import {
   getRepoSourceDirectory,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { Response, RequestInit } from 'node-fetch';
 
 import { Config } from '@backstage/config';
 import { examples } from './bitbucketServer.examples';
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts
index 1533393a52..5b00f15ac2 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.ts
@@ -24,11 +24,9 @@ import {
   getRepoSourceDirectory,
   commitAndPushBranch,
   addFiles,
-  createBranch as createGitBranch,
   cloneRepo,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { RequestInit, Response } from 'node-fetch';
 import { Config } from '@backstage/config';
 import fs from 'fs-extra';
 import { examples } from './bitbucketServerPullRequest.examples';
@@ -452,13 +450,6 @@ export function createPublishBitbucketServerPullRequestAction(options: {
           ref: sourceBranch,
         });
 
-        await createGitBranch({
-          dir: tempDir,
-          auth,
-          logger: ctx.logger,
-          ref: sourceBranch,
-        });
-
         // copy files
         fs.cpSync(sourceDir, tempDir, {
           recursive: true,
diff --git a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
index 32509f03c0..f56a30d4ed 100644
--- a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,111 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket
 
+## 0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.3.5-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.3-next.0
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.2
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index 1e5be0b691..d89b8c660d 100644
--- a/plugins/scaffolder-backend-module-bitbucket/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
-  "version": "0.3.1",
+  "version": "0.3.5-next.2",
   "description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -50,7 +50,6 @@
     "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "^11.2.0",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts b/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
index f1b45111b4..7a58efa10a 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
+++ b/plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts
@@ -25,7 +25,6 @@ import {
   getRepoSourceDirectory,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { Response, RequestInit } from 'node-fetch';
 import { Config } from '@backstage/config';
 import { examples } from './bitbucket.examples';
 
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index b7f7dd8092..abb3df3b1b 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index f8de69c462..099f9e4bf9 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown",
-  "version": "0.3.1",
+  "version": "0.3.4-next.2",
   "description": "The confluence-to-markdown module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -53,7 +53,6 @@
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "^11.2.0",
     "git-url-parse": "^15.0.0",
-    "node-fetch": "^2.7.0",
     "node-html-markdown": "^1.3.0",
     "yaml": "^2.0.0"
   },
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts
index 65992b10f3..bbc722b1d5 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts
@@ -17,7 +17,7 @@
 import { Config } from '@backstage/config';
 import { ResponseError, ConflictError, InputError } from '@backstage/errors';
 import fs from 'fs-extra';
-import fetch, { Response } from 'node-fetch';
+import { Readable } from 'stream';
 
 interface Links {
   webui: string;
@@ -164,7 +164,9 @@ export const getAndWriteAttachments = async (
         const writeStream = fs.createWriteStream(
           `${workspace}/${mkdocsDir}docs/img/${downloadTitle}`,
         );
-        res.body.pipe(writeStream);
+        // TODO(freben): This cast is sketchy, but for some reason the node types don't quite line up here
+        // https://stackoverflow.com/questions/44672942/stream-response-to-file-using-fetch-api-and-fs-createwritestream/73879265#73879265
+        Readable.fromWeb(res.body as any).pipe(writeStream);
         await new Promise((resolve, reject) => {
           writeStream.on('finish', () => {
             resolve(`${workspace}/${mkdocsDir}docs/img/${downloadTitle}`);
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index 893d123b1f..942a2b2684 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,109 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 6109bfaba4..c36132c064 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
-  "version": "0.3.1",
+  "version": "0.3.5-next.2",
   "description": "A module for the scaffolder backend that lets you template projects using cookiecutter",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
index c2d50c04f5..cd7a705579 100644
--- a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,93 @@
 # @backstage/plugin-scaffolder-backend-module-gcp
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gcp/package.json b/plugins/scaffolder-backend-module-gcp/package.json
index a787635640..d3ab1865d2 100644
--- a/plugins/scaffolder-backend-module-gcp/package.json
+++ b/plugins/scaffolder-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gcp",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The GCP Bucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
index dbff4ea965..0d393f9a93 100644
--- a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-scaffolder-backend-module-gerrit
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gerrit/package.json b/plugins/scaffolder-backend-module-gerrit/package.json
index d14be02d28..1aacbdbaaf 100644
--- a/plugins/scaffolder-backend-module-gerrit/package.json
+++ b/plugins/scaffolder-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gerrit",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The gerrit module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -47,7 +47,6 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-gerrit/src/actions/gerrit.ts b/plugins/scaffolder-backend-module-gerrit/src/actions/gerrit.ts
index 102d48a706..db0ae2ba70 100644
--- a/plugins/scaffolder-backend-module-gerrit/src/actions/gerrit.ts
+++ b/plugins/scaffolder-backend-module-gerrit/src/actions/gerrit.ts
@@ -28,7 +28,6 @@ import {
   getRepoSourceDirectory,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-import fetch, { Response, RequestInit } from 'node-fetch';
 import { examples } from './gerrit.examples';
 
 const createGerritProject = async (
diff --git a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
index 1837d3e893..793f1ef556 100644
--- a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,94 @@
 # @backstage/plugin-scaffolder-backend-module-gitea
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitea/package.json b/plugins/scaffolder-backend-module-gitea/package.json
index c4275494fe..db2104ac36 100644
--- a/plugins/scaffolder-backend-module-gitea/package.json
+++ b/plugins/scaffolder-backend-module-gitea/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitea",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "description": "The gitea module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -47,7 +47,6 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-gitea/src/actions/gitea.ts b/plugins/scaffolder-backend-module-gitea/src/actions/gitea.ts
index 601a670237..6b29ff2a4c 100644
--- a/plugins/scaffolder-backend-module-gitea/src/actions/gitea.ts
+++ b/plugins/scaffolder-backend-module-gitea/src/actions/gitea.ts
@@ -30,7 +30,6 @@ import {
 } from '@backstage/plugin-scaffolder-node';
 import { examples } from './gitea.examples';
 import crypto from 'crypto';
-import fetch, { Response, RequestInit } from 'node-fetch';
 
 const checkGiteaContentUrl = async (
   config: GiteaIntegrationConfig,
diff --git a/plugins/scaffolder-backend-module-github/CHANGELOG.md b/plugins/scaffolder-backend-module-github/CHANGELOG.md
index 925fe1c2a7..0cb2dd5d70 100644
--- a/plugins/scaffolder-backend-module-github/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-github/CHANGELOG.md
@@ -1,5 +1,110 @@
 # @backstage/plugin-scaffolder-backend-module-github
 
+## 0.5.4-next.2
+
+### Patch Changes
+
+- e913fdf: Add github backend module to create-app and improve error messages
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-github/package.json b/plugins/scaffolder-backend-module-github/package.json
index ebeddccd26..13d5af409a 100644
--- a/plugins/scaffolder-backend-module-github/package.json
+++ b/plugins/scaffolder-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-github",
-  "version": "0.5.1",
+  "version": "0.5.4-next.2",
   "description": "The github module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubPagesEnable.ts b/plugins/scaffolder-backend-module-github/src/actions/githubPagesEnable.ts
index 044005961e..42b9c47030 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubPagesEnable.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubPagesEnable.ts
@@ -67,14 +67,13 @@ export function createGithubPagesEnableAction(options: {
           sourceBranch: {
             title: 'Source Branch',
             type: 'string',
-            description:
-              'The the GitHub Pages source branch. Default is "main"',
+            description: 'The GitHub Pages source branch. Default is "main"',
           },
           sourcePath: {
             title: 'Source Path',
             type: 'string',
             description:
-              'The the GitHub Pages source path - "/" or "/docs". Default is "/"',
+              'The GitHub Pages source path - "/" or "/docs". Default is "/"',
           },
           token: {
             title: 'Authorization Token',
diff --git a/plugins/scaffolder-backend-module-github/src/actions/helpers.ts b/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
index 0ae1cad3fb..b28c35105c 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
@@ -93,7 +93,7 @@ export async function getOctokitOptions(options: {
 
   if (!credentialProviderToken) {
     throw new InputError(
-      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}. Make sure GitHub auth is configured correctly. See https://backstage.io/docs/auth/github/provider for more details.`,
     );
   }
 
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index 1d06a54d2a..87ff348fc6 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,100 @@
 # @backstage/plugin-scaffolder-backend-module-gitlab
 
+## 0.7.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+
+## 0.7.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+
+## 0.7.0-next.0
+
+### Minor Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 32459d0: **BREAKING**: Upgraded the `gitbeaker` library to version 41. As part of this, the `scopes` parameter to the `gitlab:projectDeployToken:create` is no longer optional, so you will have to pass it a value (for example `['read_repository']`).
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.6.1
+
+### Patch Changes
+
+- cdc8b4c: Improve error messages from Gitlab
+- 2dbdccb: Removed circular import
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.6.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.6.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.6.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index f8505a7f05..b3244783f9 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.6.0",
+  "version": "0.7.0-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
@@ -51,9 +51,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
-    "@gitbeaker/core": "^35.8.0",
-    "@gitbeaker/node": "^35.8.0",
-    "@gitbeaker/rest": "^39.25.0",
+    "@gitbeaker/rest": "^41.2.0",
     "luxon": "^3.0.0",
     "winston": "^3.2.1",
     "yaml": "^2.0.0",
diff --git a/plugins/scaffolder-backend-module-gitlab/report.api.md b/plugins/scaffolder-backend-module-gitlab/report.api.md
index fa6c12e2e3..896c0a5899 100644
--- a/plugins/scaffolder-backend-module-gitlab/report.api.md
+++ b/plugins/scaffolder-backend-module-gitlab/report.api.md
@@ -76,11 +76,11 @@ export const createGitlabProjectDeployTokenAction: (options: {
 }) => TemplateAction<
   {
     name: string;
+    scopes: string[];
     repoUrl: string;
     projectId: string | number;
     username?: string | undefined;
     token?: string | undefined;
-    scopes?: string[] | undefined;
   },
   {
     user: string;
@@ -149,11 +149,16 @@ export function createPublishGitlabAction(options: {
           squash_option?:
             | 'always'
             | 'never'
-            | 'default_off'
             | 'default_on'
+            | 'default_off'
             | undefined;
           topics?: string[] | undefined;
           visibility?: 'internal' | 'private' | 'public' | undefined;
+          only_allow_merge_if_all_discussions_are_resolved?:
+            | boolean
+            | undefined;
+          only_allow_merge_if_pipeline_succeeds?: boolean | undefined;
+          allow_merge_on_skipped_pipeline?: boolean | undefined;
         }
       | undefined;
     branches?:
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.test.ts
index 4294e5f137..c7a7b01aad 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.test.ts
@@ -42,13 +42,13 @@ const mockGitlabClient = {
     create: jest.fn(),
   },
   Users: {
-    current: jest.fn(),
+    showCurrentUser: jest.fn(),
   },
   ProjectMembers: {
     add: jest.fn(),
   },
 };
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
@@ -86,7 +86,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call initRepoAndPush with the correct values', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts
index f7a957c32e..3015850399 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts
@@ -163,4 +163,43 @@ export const examples: TemplateExample[] = [
       ],
     }),
   },
+  {
+    description:
+      'Initializes a GitLab repository with pipeline must succeed and allow merge on skipped pipeline settings.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:gitlab',
+          name: 'Publish to GitLab',
+          input: {
+            repoUrl: 'gitlab.com?repo=project_name&owner=group_name',
+            settings: {
+              only_allow_merge_if_pipeline_succeeds: true,
+              allow_merge_on_skipped_pipeline: true,
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Initializes a GitLab repository with setting to require all threads (discussions) on merge request to be resolved before merging.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'publish',
+          action: 'publish:gitlab',
+          name: 'Publish to GitLab',
+          input: {
+            repoUrl: 'gitlab.com?repo=project_name&owner=group_name',
+            settings: {
+              only_allow_merge_if_all_discussions_are_resolved: true,
+            },
+          },
+        },
+      ],
+    }),
+  },
 ];
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.test.ts
index bbcae08063..6e131e91fc 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.test.ts
@@ -40,7 +40,7 @@ const mockGitlabClient = {
     create: jest.fn(),
   },
   Users: {
-    current: jest.fn(),
+    showCurrentUser: jest.fn(),
   },
   ProjectMembers: {
     add: jest.fn(),
@@ -55,7 +55,7 @@ const mockGitlabClient = {
     create: jest.fn(),
   },
 };
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
@@ -183,7 +183,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should work when there is a token provided through ctx.input', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -199,7 +199,7 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'bob',
       visibility: 'private',
     });
@@ -208,7 +208,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call the correct Gitlab APIs when the owner is an organization', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -218,7 +218,7 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'repo',
       visibility: 'private',
       ci_config_path: '.gitlab-ci.yml',
@@ -229,7 +229,7 @@ describe('publish:gitlab', () => {
 
   it('should call the correct Gitlab APIs when the owner is not an organization', async () => {
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: null });
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
     });
@@ -238,7 +238,7 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 12345,
+      namespaceId: 12345,
       name: 'repo',
       visibility: 'private',
       ci_config_path: '.gitlab-ci.yml',
@@ -248,7 +248,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call the correct Gitlab APIs when using project settings with override of visibility and topics', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -258,7 +258,7 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'repo',
       visibility: 'internal',
       topics: ['topic1', 'topic2'],
@@ -269,7 +269,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call the correct Gitlab APIs for branches and protectd branches when branch settings provided', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       id: 123456,
@@ -280,7 +280,7 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'repo',
       visibility: 'private',
     });
@@ -309,7 +309,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call the correct Gitlab APIs for variables when their configuration is provided', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       id: 123456,
@@ -320,28 +320,28 @@ describe('publish:gitlab', () => {
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'repo',
       visibility: 'private',
     });
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       123456,
+      'key',
+      'value',
       {
-        key: 'key',
-        value: 'value',
         description: 'description',
-        variable_type: 'env_var',
+        variableType: 'env_var',
         protected: true,
         masked: true,
         raw: false,
-        environment_scope: '*',
+        environmentScope: '*',
       },
     );
   });
 
   it('should call initRepoAndPush with the correct values', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -361,7 +361,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call initRepoAndPush with the correct default branch', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -416,7 +416,7 @@ describe('publish:gitlab', () => {
       config: customAuthorConfig,
     });
 
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -462,7 +462,7 @@ describe('publish:gitlab', () => {
       config: customAuthorConfig,
     });
 
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -482,7 +482,7 @@ describe('publish:gitlab', () => {
   });
 
   it('should call output with the remoteUrl and repoContentsUrl and projectId', async () => {
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       http_url_to_repo: 'http://mockurl.git',
@@ -523,7 +523,7 @@ describe('publish:gitlab', () => {
     });
 
     mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
-    mockGitlabClient.Users.current.mockResolvedValue({ id: 12345 });
+    mockGitlabClient.Users.showCurrentUser.mockResolvedValue({ id: 12345 });
     mockGitlabClient.Projects.create.mockResolvedValue({
       id: 123456,
       http_url_to_repo: 'http://mockurl.git',
@@ -539,14 +539,14 @@ describe('publish:gitlab', () => {
     });
 
     expect(mockGitlabClient.Namespaces.show).toHaveBeenCalledWith('owner');
-    expect(mockGitlabClient.Users.current).toHaveBeenCalled();
+    expect(mockGitlabClient.Users.showCurrentUser).toHaveBeenCalled();
     expect(mockGitlabClient.ProjectMembers.add).toHaveBeenCalledWith(
       123456,
       12345,
       50,
     );
     expect(mockGitlabClient.Projects.create).toHaveBeenCalledWith({
-      namespace_id: 1234,
+      namespaceId: 1234,
       name: 'repo',
       visibility: 'private',
     });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
index 1c888cff09..c682749f83 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
@@ -17,7 +17,7 @@
 import { InputError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
-import { Gitlab } from '@gitbeaker/node';
+import { Gitlab, VariableType } from '@gitbeaker/rest';
 import {
   initRepoAndPush,
   getRepoSourceDirectory,
@@ -60,6 +60,9 @@ export function createPublishGitlabAction(options: {
       squash_option?: 'default_off' | 'default_on' | 'never' | 'always';
       topics?: string[];
       visibility?: 'private' | 'internal' | 'public';
+      only_allow_merge_if_all_discussions_are_resolved?: boolean;
+      only_allow_merge_if_pipeline_succeeds?: boolean;
+      allow_merge_on_skipped_pipeline?: boolean;
     };
     branches?: Array<{
       name: string;
@@ -199,6 +202,24 @@ export function createPublishGitlabAction(options: {
                 type: 'string',
                 enum: ['private', 'public', 'internal'],
               },
+              only_allow_merge_if_all_discussions_are_resolved: {
+                title: 'All threads must be resolved',
+                description:
+                  'Set whether merge requests can only be merged when all the discussions are resolved.',
+                type: 'boolean',
+              },
+              only_allow_merge_if_pipeline_succeeds: {
+                title: 'Pipelines must succeed',
+                description:
+                  'Set whether merge requests can only be merged with successful pipelines. This setting is named Pipelines must succeed in the project settings.',
+                type: 'boolean',
+              },
+              allow_merge_on_skipped_pipeline: {
+                title: 'Skipped pipelines are considered successful',
+                description:
+                  'Set whether or not merge requests can be merged with skipped jobs.',
+                type: 'boolean',
+              },
             },
           },
           branches: {
@@ -362,7 +383,7 @@ export function createPublishGitlabAction(options: {
         throw e;
       }
 
-      const { id: userId } = (await client.Users.current()) as {
+      const { id: userId } = (await client.Users.showCurrentUser()) as {
         id: number;
       };
 
@@ -371,7 +392,7 @@ export function createPublishGitlabAction(options: {
       }
 
       const { id: projectId, http_url_to_repo } = await client.Projects.create({
-        namespace_id: targetNamespaceId,
+        namespaceId: targetNamespaceId,
         name: repo,
         visibility: repoVisibility,
         ...(topics.length ? { topics } : {}),
@@ -457,7 +478,8 @@ export function createPublishGitlabAction(options: {
       if (projectVariables) {
         for (const variable of projectVariables) {
           const variableWithDefaults = Object.assign(variable, {
-            variable_type: variable.variable_type ?? 'env_var',
+            variable_type: (variable.variable_type ??
+              'env_var') as VariableType,
             protected: variable.protected ?? false,
             masked: variable.masked ?? false,
             raw: variable.raw ?? false,
@@ -467,7 +489,16 @@ export function createPublishGitlabAction(options: {
           try {
             await client.ProjectVariables.create(
               projectId,
-              variableWithDefaults,
+              variableWithDefaults.key,
+              variableWithDefaults.value,
+              {
+                variableType: variableWithDefaults.variable_type,
+                protected: variableWithDefaults.protected,
+                masked: variableWithDefaults.masked,
+                environmentScope: variableWithDefaults.environment_scope,
+                description: variableWithDefaults.description,
+                raw: variableWithDefaults.raw,
+              },
             );
           } catch (e) {
             throw new InputError(
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabGroupEnsureExists.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabGroupEnsureExists.ts
index 41bc5755c9..7134726e6f 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabGroupEnsureExists.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabGroupEnsureExists.ts
@@ -16,7 +16,7 @@
 
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
-import { GroupSchema } from '@gitbeaker/core/dist/types/resources/Groups';
+import { GroupSchema } from '@gitbeaker/rest';
 import { z } from 'zod';
 import commonGitlabConfig from '../commonGitlabConfig';
 import { getClient, parseRepoUrl } from '../util';
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueCreate.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueCreate.ts
index 3eaca95270..30aa2c3d8c 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueCreate.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueCreate.ts
@@ -22,6 +22,7 @@ import { examples } from './gitlabIssueCreate.examples';
 import { z } from 'zod';
 import { checkEpicScope, convertDate, getClient, parseRepoUrl } from '../util';
 import { CreateIssueOptions, IssueSchema } from '@gitbeaker/rest';
+import { getErrorMessage } from './helpers';
 
 const issueInputProperties = z.object({
   projectId: z.number().describe('Project Id'),
@@ -189,7 +190,9 @@ export const createGitlabIssueAction = (options: {
           });
         }
         // Handling other errors
-        throw new InputError(`Failed to create GitLab issue: ${error.message}`);
+        throw new InputError(
+          `Failed to create GitLab issue: ${getErrorMessage(error)}`,
+        );
       }
     },
   });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.ts
index d1f724c90c..34c8b1c5e7 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.ts
@@ -25,6 +25,7 @@ import { examples } from './gitlabIssueEdit.examples';
 import { z } from 'zod';
 import { checkEpicScope, convertDate, getClient, parseRepoUrl } from '../util';
 import { IssueSchema, EditIssueOptions } from '@gitbeaker/rest';
+import { getErrorMessage } from './helpers';
 
 const editIssueInputProperties = z.object({
   projectId: z
@@ -237,7 +238,7 @@ export const editGitlabIssueAction = (options: {
         }
         // Handling other errors
         throw new InputError(
-          `Failed to edit/modify GitLab issue: ${error.message}`,
+          `Failed to edit/modify GitLab issue: ${getErrorMessage(error)}`,
         );
       }
     },
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.examples.test.ts
index 6f26bc1c68..087d474807 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.examples.test.ts
@@ -53,9 +53,10 @@ const mockGitlabClient = {
   },
   Users: {
     current: jest.fn(),
-    username: jest.fn(async (user: string) => {
+    all: jest.fn(async (userOptions: { username: string }) => {
       const users: string[] = ['John Smith', 'my-assignee'];
-      if (!users.includes(user)) throw new Error('user does not exist');
+      if (!users.includes(userOptions.username))
+        throw new Error('user does not exist');
       else
         return [
           {
@@ -66,7 +67,7 @@ const mockGitlabClient = {
   },
 };
 
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
index cffa5fd666..b5db1b4811 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
@@ -66,19 +66,18 @@ const mockGitlabClient = {
     }),
   },
   Users: {
-    current: jest.fn(),
-    username: jest.fn(async (user: string) => {
-      if (user !== 'John Smith') throw new Error('user does not exist');
-      else
-        return [
-          {
-            id: 123,
-          },
-        ];
+    all: jest.fn(async (userOptions: { username: string }) => {
+      if (userOptions.username !== 'John Smith')
+        throw new Error('user does not exist');
+      return [
+        {
+          id: 123,
+        },
+      ];
     }),
   },
   Repositories: {
-    tree: jest.fn(
+    allRepositoryTrees: jest.fn(
       async (
         repoID: string | number,
         options: { ref: string; recursive: boolean; path: string | undefined },
@@ -123,7 +122,7 @@ const mockGitlabClient = {
   },
 };
 
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index ec9ae7317d..4e4812fdcf 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -20,7 +20,7 @@ import {
   SerializedFile,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
-import { Gitlab, Types } from '@gitbeaker/core';
+import { Gitlab, RepositoryTreeSchema, CommitAction } from '@gitbeaker/rest';
 import path from 'path';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { InputError } from '@backstage/errors';
@@ -28,7 +28,7 @@ import {
   LoggerService,
   resolveSafeChildPath,
 } from '@backstage/backend-plugin-api';
-import { createGitlabApi } from './helpers';
+import { createGitlabApi, getErrorMessage } from './helpers';
 import { examples } from './gitlabMergeRequest.examples';
 import { createHash } from 'crypto';
 
@@ -41,9 +41,9 @@ function computeSha256(file: SerializedFile): string {
 async function getFileAction(
   fileInfo: { file: SerializedFile; targetPath?: string },
   target: { repoID: string; branch: string },
-  api: Gitlab,
+  api: InstanceType<typeof Gitlab>,
   logger: LoggerService,
-  remoteFiles: Types.RepositoryTreeSchema[],
+  remoteFiles: RepositoryTreeSchema[],
   defaultCommitAction:
     | 'create'
     | 'delete'
@@ -231,11 +231,13 @@ which uses additional API calls in order to detect whether to 'create', 'update'
 
       if (assignee !== undefined) {
         try {
-          const assigneeUser = await api.Users.username(assignee);
+          const assigneeUser = await api.Users.all({ username: assignee });
           assigneeId = assigneeUser[0].id;
         } catch (e) {
           ctx.logger.warn(
-            `Failed to find gitlab user id for ${assignee}: ${e}. Proceeding with MR creation without an assignee.`,
+            `Failed to find gitlab user id for ${assignee}: ${getErrorMessage(
+              e,
+            )}. Proceeding with MR creation without an assignee.`,
           );
         }
       }
@@ -257,26 +259,34 @@ which uses additional API calls in order to detect whether to 'create', 'update'
       let targetBranch = targetBranchName;
       if (!targetBranch) {
         const projects = await api.Projects.show(repoID);
-
-        const { default_branch: defaultBranch } = projects;
-        targetBranch = defaultBranch!;
+        const defaultBranch = projects.default_branch ?? projects.defaultBranch;
+        if (typeof defaultBranch !== 'string' || !defaultBranch) {
+          throw new InputError(
+            `The branch creation failed. Target branch was not provided, and could not find default branch from project settings. Project: ${JSON.stringify(
+              project,
+            )}`,
+          );
+        }
+        targetBranch = defaultBranch;
       }
 
-      let remoteFiles: Types.RepositoryTreeSchema[] = [];
+      let remoteFiles: RepositoryTreeSchema[] = [];
       if ((ctx.input.commitAction ?? 'auto') === 'auto') {
         try {
-          remoteFiles = await api.Repositories.tree(repoID, {
+          remoteFiles = await api.Repositories.allRepositoryTrees(repoID, {
             ref: targetBranch,
             recursive: true,
             path: targetPath ?? undefined,
           });
         } catch (e) {
           ctx.logger.warn(
-            `Could not retrieve the list of files for ${repoID} (branch: ${targetBranch}) : ${e}`,
+            `Could not retrieve the list of files for ${repoID} (branch: ${targetBranch}) : ${getErrorMessage(
+              e,
+            )}`,
           );
         }
       }
-      const actions: Types.CommitAction[] =
+      const actions: CommitAction[] =
         ctx.input.commitAction === 'skip'
           ? []
           : (
@@ -296,7 +306,7 @@ which uses additional API calls in order to detect whether to 'create', 'update'
                 )
               ).filter(o => o.action !== 'skip') as {
                 file: SerializedFile;
-                action: Types.CommitAction['action'];
+                action: CommitAction['action'];
               }[]
             ).map(({ file, action }) => ({
               action,
@@ -327,7 +337,9 @@ which uses additional API calls in order to detect whether to 'create', 'update'
           await api.Branches.create(repoID, branchName, String(targetBranch));
         } catch (e) {
           throw new InputError(
-            `The branch creation failed. Please check that your repo does not already contain a branch named '${branchName}'. ${e}`,
+            `The branch creation failed. Please check that your repo does not already contain a branch named '${branchName}'. ${getErrorMessage(
+              e,
+            )}`,
           );
         }
       }
@@ -336,7 +348,9 @@ which uses additional API calls in order to detect whether to 'create', 'update'
           await api.Commits.create(repoID, branchName, title, actions);
         } catch (e) {
           throw new InputError(
-            `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${e}`,
+            `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${getErrorMessage(
+              e,
+            )}`,
           );
         }
       }
@@ -351,15 +365,15 @@ which uses additional API calls in order to detect whether to 'create', 'update'
             removeSourceBranch: removeSourceBranch ? removeSourceBranch : false,
             assigneeId,
           },
-        ).then((mergeRequest: { web_url: string }) => {
-          return mergeRequest.web_url;
-        });
+        ).then(mergeRequest => mergeRequest.web_url ?? mergeRequest.webUrl);
         ctx.output('projectid', repoID);
         ctx.output('targetBranchName', targetBranch);
         ctx.output('projectPath', repoID);
         ctx.output('mergeRequestUrl', mergeRequestUrl);
       } catch (e) {
-        throw new InputError(`Merge request creation failed${e}`);
+        throw new InputError(
+          `Merge request creation failed. ${getErrorMessage(e)}`,
+        );
       }
     },
   });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.ts
index b9f629edfb..a7edc12320 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.ts
@@ -25,6 +25,7 @@ import { z } from 'zod';
 import commonGitlabConfig from '../commonGitlabConfig';
 import { getClient, parseRepoUrl } from '../util';
 import { examples } from './gitlabPipelineTrigger.examples';
+import { getErrorMessage } from './helpers';
 
 const pipelineInputProperties = z.object({
   projectId: z.number().describe('Project Id'),
@@ -109,7 +110,9 @@ export const createTriggerGitlabPipelineAction = (options: {
           });
         }
         // Handling other errors
-        throw new InputError(`Failed to trigger Pipeline: ${error.message}`);
+        throw new InputError(
+          `Failed to trigger Pipeline: ${getErrorMessage(error)}`,
+        );
       } finally {
         // Delete the pipeline token if it was created
         if (pipelineTokenResponse && pipelineTokenResponse.id) {
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
index bdf14ce1c8..3ad0237d76 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 import yaml from 'yaml';
 import { createGitlabProjectAccessTokenAction } from './gitlabProjectAccessTokenCreate'; // Adjust the import based on your project structure
 import { examples } from './gitlabProjectAccessTokenCreate.examples';
-
 import { DateTime } from 'luxon';
 
-jest.mock('node-fetch');
-
 const mockGitlabClient = {
   ProjectAccessTokens: {
     create: jest.fn(),
@@ -88,9 +86,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '456',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -113,9 +111,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '789',
       'tokenname',
       ['read_registry', 'write_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -138,9 +136,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'my-custom-token',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -163,9 +161,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       42,
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -188,9 +186,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '123',
       'tokenname',
       ['read_repository'],
+      '2024-06-25',
       {
         accessLevel: 40,
-        expiresAt: '2024-06-25',
       },
     );
 
@@ -213,9 +211,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '456',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 30,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -241,9 +239,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '456',
       'full-access-token',
       ['read_repository'],
+      '2024-12-31',
       {
         accessLevel: 40,
-        expiresAt: '2024-12-31',
       },
     );
 
@@ -269,9 +267,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -297,9 +295,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository', 'read_api'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -325,9 +323,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 10,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -353,9 +351,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -381,9 +379,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 50,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -409,9 +407,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'no-expiry-token',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -437,9 +435,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '101112',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts
index 34ce8878f2..0cbc0fc122 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 import { createGitlabProjectAccessTokenAction } from './gitlabProjectAccessTokenCreate'; // Adjust the import based on your project structure
-
 import { DateTime } from 'luxon';
 
-jest.mock('node-fetch');
-
 const mockGitlabClient = {
   ProjectAccessTokens: {
     create: jest.fn(),
@@ -84,9 +82,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '987',
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -115,9 +113,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '987',
       'tokenname',
       ['read_registry', 'write_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -146,9 +144,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '2110',
       'token',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -176,9 +174,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       23,
       'tokenname',
       ['read_repository'],
+      DateTime.now().plus({ days: 365 }).toISODate()!,
       {
         accessLevel: 40,
-        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -207,9 +205,9 @@ describe('gitlab:projectAccessToken:create examples', () => {
       '123',
       'tokenname',
       ['read_repository'],
+      '1999-07-14',
       {
         accessLevel: 40,
-        expiresAt: '1999-07-14',
       },
     );
 
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.ts
index 5d31686a6e..ae1e92214f 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.ts
@@ -108,9 +108,8 @@ export const createGitlabProjectAccessTokenAction = (options: {
         projectId,
         name,
         scopes as AccessTokenScopes[],
+        expiresAt || DateTime.now().plus({ days: 365 }).toISODate()!,
         {
-          expiresAt:
-            expiresAt || DateTime.now().plus({ days: 365 }).toISODate()!,
           accessLevel,
         },
       );
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.test.ts
index d56d6de556..f94468f856 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.test.ts
@@ -22,11 +22,11 @@ import { createGitlabProjectDeployTokenAction } from './gitlabProjectDeployToken
 import { examples } from './gitlabProjectDeployTokenCreate.examples';
 
 const mockGitlabClient = {
-  ProjectDeployTokens: {
-    add: jest.fn(),
+  DeployTokens: {
+    create: jest.fn(),
   },
 };
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
@@ -68,7 +68,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it(`Should ${examples[0].description}`, async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -78,11 +78,13 @@ describe('gitlab:create-deploy-token', () => {
       input: yaml.parse(examples[0].example).steps[0].input,
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      '456',
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'tokenname',
-      undefined,
-      { username: undefined },
+      ['read_registry'],
+      {
+        projectId: '456',
+        username: undefined,
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
@@ -90,7 +92,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it(`Should ${examples[1].description}`, async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -100,11 +102,13 @@ describe('gitlab:create-deploy-token', () => {
       input: yaml.parse(examples[1].example).steps[0].input,
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      '789',
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'tokenname',
       ['read_registry', 'write_repository'],
-      { username: undefined },
+      {
+        projectId: '789',
+        username: undefined,
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
@@ -112,7 +116,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it(`Should ${examples[2].description}`, async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -122,11 +126,13 @@ describe('gitlab:create-deploy-token', () => {
       input: yaml.parse(examples[2].example).steps[0].input,
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      '101112',
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'my-custom-token',
-      undefined,
-      { username: undefined },
+      ['read_registry'],
+      {
+        projectId: '101112',
+        username: undefined,
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
@@ -134,7 +140,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it(`Should ${examples[3].description}`, async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -144,11 +150,13 @@ describe('gitlab:create-deploy-token', () => {
       input: yaml.parse(examples[3].example).steps[0].input,
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      42,
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'tokenname',
-      undefined,
-      { username: undefined },
+      ['read_registry'],
+      {
+        projectId: 42,
+        username: undefined,
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
@@ -156,7 +164,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it(`Should ${examples[4].description}`, async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -166,11 +174,13 @@ describe('gitlab:create-deploy-token', () => {
       input: yaml.parse(examples[4].example).steps[0].input,
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      42,
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'tokenname',
-      undefined,
-      { username: 'tokenuser' },
+      ['read_registry'],
+      {
+        projectId: 42,
+        username: 'tokenuser',
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.ts
index 326747d45a..f306ee191c 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.examples.ts
@@ -29,13 +29,15 @@ export const examples: TemplateExample[] = [
             repoUrl: 'gitlab.com?repo=repo&owner=owner',
             projectId: '456',
             name: 'tokenname',
+            scopes: ['read_registry'],
           },
         },
       ],
     }),
   },
   {
-    description: 'Create a GitLab project deploy token with custom scopes.',
+    description:
+      'Create a GitLab project deploy token with many custom scopes.',
     example: yaml.stringify({
       steps: [
         {
@@ -64,6 +66,7 @@ export const examples: TemplateExample[] = [
             repoUrl: 'gitlab.com?repo=repo&owner=owner',
             projectId: '101112',
             name: 'my-custom-token',
+            scopes: ['read_registry'],
           },
         },
       ],
@@ -82,6 +85,7 @@ export const examples: TemplateExample[] = [
             repoUrl: 'gitlab.com?repo=repo&owner=owner',
             projectId: 42,
             name: 'tokenname',
+            scopes: ['read_registry'],
           },
         },
       ],
@@ -101,6 +105,7 @@ export const examples: TemplateExample[] = [
             projectId: 42,
             name: 'tokenname',
             username: 'tokenuser',
+            scopes: ['read_registry'],
           },
         },
       ],
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.test.ts
index 146692006b..4b1c5b52a1 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.test.ts
@@ -20,11 +20,11 @@ import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-
 import { createGitlabProjectDeployTokenAction } from './gitlabProjectDeployTokenCreate';
 
 const mockGitlabClient = {
-  ProjectDeployTokens: {
-    add: jest.fn(),
+  DeployTokens: {
+    create: jest.fn(),
   },
 };
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
@@ -66,7 +66,7 @@ describe('gitlab:create-deploy-token', () => {
   });
 
   it('should work when there is a token provided through ctx.input', async () => {
-    mockGitlabClient.ProjectDeployTokens.add.mockResolvedValue({
+    mockGitlabClient.DeployTokens.create.mockResolvedValue({
       token: 'TOKEN',
       username: 'User',
     });
@@ -82,11 +82,13 @@ describe('gitlab:create-deploy-token', () => {
       },
     });
 
-    expect(mockGitlabClient.ProjectDeployTokens.add).toHaveBeenCalledWith(
-      '123',
+    expect(mockGitlabClient.DeployTokens.create).toHaveBeenCalledWith(
       'tokenname',
       ['read_repository'],
-      { username: 'tokenuser' },
+      {
+        projectId: '123',
+        username: 'tokenuser',
+      },
     );
 
     expect(mockContext.output).toHaveBeenCalledWith('deploy_token', 'TOKEN');
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts
index 79ecc0de4e..600d982d8d 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts
@@ -17,8 +17,7 @@
 import { InputError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
-import { DeployTokenScope } from '@gitbeaker/core/dist/types/templates/ResourceDeployTokens';
-import { Gitlab } from '@gitbeaker/node';
+import { DeployTokenScope, Gitlab } from '@gitbeaker/rest';
 import { z } from 'zod';
 import commonGitlabConfig from '../commonGitlabConfig';
 import { getToken } from '../util';
@@ -47,7 +46,7 @@ export const createGitlabProjectDeployTokenAction = (options: {
           username: z
             .string({ description: 'Deploy Token Username' })
             .optional(),
-          scopes: z.array(z.string(), { description: 'Scopes' }).optional(),
+          scopes: z.array(z.string(), { description: 'Scopes' }),
         }),
       ),
       output: z.object({
@@ -60,17 +59,23 @@ export const createGitlabProjectDeployTokenAction = (options: {
       const { projectId, name, username, scopes } = ctx.input;
       const { token, integrationConfig } = getToken(ctx.input, integrations);
 
+      if (scopes.length === 0) {
+        throw new InputError(
+          `Could not create token for project "${ctx.input.projectId}": scopes cannot be empty.`,
+        );
+      }
+
       const api = new Gitlab({
         host: integrationConfig.config.baseUrl,
         token: token,
       });
 
-      const deployToken = await api.ProjectDeployTokens.add(
-        projectId,
+      const deployToken = await api.DeployTokens.create(
         name,
         scopes as DeployTokenScope[],
         {
-          username: username,
+          projectId,
+          username,
         },
       );
 
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.examples.test.ts
index d84181d398..ab3dd528f5 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.examples.test.ts
@@ -45,7 +45,7 @@ const mockGitlabClient = {
   },
 };
 
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.test.ts
index 569d3c0c56..3204dffaaf 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.test.ts
@@ -44,7 +44,7 @@ const mockGitlabClient = {
   },
 };
 
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.ts
index c926fe2971..089802fea4 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabRepoPush.ts
@@ -19,12 +19,12 @@ import {
   parseRepoUrl,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
-import { Types } from '@gitbeaker/core';
+import { CommitAction } from '@gitbeaker/rest';
 import path from 'path';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { InputError } from '@backstage/errors';
 import { resolveSafeChildPath } from '@backstage/backend-plugin-api';
-import { createGitlabApi } from './helpers';
+import { createGitlabApi, getErrorMessage } from './helpers';
 import { examples } from './gitlabRepoPush.examples';
 
 /**
@@ -141,7 +141,7 @@ export const createGitlabRepoPushAction = (options: {
         gitignore: true,
       });
 
-      const actions: Types.CommitAction[] = fileContents.map(file => ({
+      const actions: CommitAction[] = fileContents.map(file => ({
         action: commitAction ?? 'create',
         filePath: targetPath
           ? path.posix.join(targetPath, file.path)
@@ -158,7 +158,9 @@ export const createGitlabRepoPushAction = (options: {
       } catch (e: any) {
         if (e.response?.statusCode !== 404) {
           throw new InputError(
-            `Failed to check status of branch '${branchName}'. Please make sure that branch already exists or Backstage has permissions to create one. ${e}`,
+            `Failed to check status of branch '${branchName}'. Please make sure that branch already exists or Backstage has permissions to create one. ${getErrorMessage(
+              e,
+            )}`,
           );
         }
       }
@@ -171,7 +173,9 @@ export const createGitlabRepoPushAction = (options: {
           await api.Branches.create(repoID, branchName, String(defaultBranch));
         } catch (e) {
           throw new InputError(
-            `The branch '${branchName}' was not found and creation failed with error. Please make sure that branch already exists or Backstage has permissions to create one. ${e}`,
+            `The branch '${branchName}' was not found and creation failed with error. Please make sure that branch already exists or Backstage has permissions to create one. ${getErrorMessage(
+              e,
+            )}`,
           );
         }
       }
@@ -188,7 +192,9 @@ export const createGitlabRepoPushAction = (options: {
         ctx.output('commitHash', commit.id);
       } catch (e) {
         throw new InputError(
-          `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${e}`,
+          `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${getErrorMessage(
+            e,
+          )}`,
         );
       }
     },
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/helpers.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/helpers.ts
index 1d12a6d394..7f6dead3ca 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/helpers.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/helpers.ts
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 import { parseRepoUrl } from '@backstage/plugin-scaffolder-node';
-import { InputError } from '@backstage/errors';
-import { Gitlab } from '@gitbeaker/node';
+import { ErrorLike, InputError, isError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
-import { Resources } from '@gitbeaker/core';
+import { Gitlab } from '@gitbeaker/rest';
 
 export function createGitlabApi(options: {
   integrations: ScmIntegrationRegistry;
   token?: string;
   repoUrl: string;
-}): Resources.Gitlab {
+}): InstanceType<typeof Gitlab> {
   const { integrations, token: providedToken, repoUrl } = options;
 
   const { host } = parseRepoUrl(repoUrl, integrations);
@@ -48,3 +47,17 @@ export function createGitlabApi(options: {
     [tokenType]: token,
   });
 }
+
+interface GitlabError extends ErrorLike {
+  // Errors from Gitlab may also include a description field that contains additional info
+  description: string;
+}
+
+function isGitlabError(e: unknown): e is GitlabError {
+  return isError(e) && 'description' in e && typeof e.description === 'string';
+}
+
+export function getErrorMessage(e: unknown): string {
+  if (isGitlabError(e)) return `${e} - ${e.description}`;
+  return String(e);
+}
diff --git a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts
new file mode 100644
index 0000000000..4fa906686c
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { InputError } from '@backstage/errors';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { createHandleAutocompleteRequest } from './autocomplete';
+
+const mockGetClient = require('../util').getClient;
+
+jest.mock('../util', () => ({
+  getClient: jest.fn(),
+}));
+
+describe('handleAutocompleteRequest', () => {
+  const mockIntegrations = {} as ScmIntegrationRegistry;
+  const mockClient = {
+    Groups: {
+      all: jest.fn(),
+      allProjects: jest.fn(),
+    },
+    Users: {
+      showCurrentUser: jest.fn(),
+      allProjects: jest.fn(),
+    },
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetClient.mockReturnValue(mockClient);
+  });
+
+  it('should return groups and current user', async () => {
+    const handleAutocompleteRequest = createHandleAutocompleteRequest({
+      integrations: mockIntegrations,
+    });
+
+    mockClient.Groups.all.mockResolvedValueOnce([
+      { full_path: 'group1', id: 1 },
+      { full_path: 'group2', id: 2 },
+    ]);
+    mockClient.Groups.all.mockResolvedValueOnce([]);
+    mockClient.Users.showCurrentUser.mockResolvedValue({
+      username: 'user1',
+      id: 3,
+    });
+
+    const result = await handleAutocompleteRequest({
+      resource: 'groups',
+      token: 'token',
+      context: {},
+    });
+
+    expect(result).toEqual({
+      results: [
+        { title: 'group1', id: '1' },
+        { title: 'group2', id: '2' },
+        { title: 'user1', id: '3' },
+      ],
+    });
+  });
+
+  it('should return repositories for a group', async () => {
+    const handleAutocompleteRequest = createHandleAutocompleteRequest({
+      integrations: mockIntegrations,
+    });
+
+    mockClient.Users.showCurrentUser.mockResolvedValue({ id: 3 });
+    mockClient.Groups.allProjects.mockResolvedValue([
+      { name: 'repo1', id: 1 },
+      { name: 'repo2', id: 2 },
+    ]);
+
+    const result = await handleAutocompleteRequest({
+      resource: 'repositories',
+      token: 'token',
+      context: { id: '1' },
+    });
+
+    expect(result).toEqual({
+      results: [
+        { title: 'repo1', id: '1' },
+        { title: 'repo2', id: '2' },
+      ],
+    });
+  });
+
+  it('should return repositories for a user', async () => {
+    const handleAutocompleteRequest = createHandleAutocompleteRequest({
+      integrations: mockIntegrations,
+    });
+
+    mockClient.Users.showCurrentUser.mockResolvedValue({ id: 1 });
+    mockClient.Users.allProjects.mockResolvedValue([
+      { name: 'repo1', id: 1 },
+      { name: 'repo2', id: 2 },
+    ]);
+
+    const result = await handleAutocompleteRequest({
+      resource: 'repositories',
+      token: 'token',
+      context: { id: '1' },
+    });
+
+    expect(result).toEqual({
+      results: [
+        { title: 'repo1', id: '1' },
+        { title: 'repo2', id: '2' },
+      ],
+    });
+  });
+
+  it('should throw an error for invalid resource', async () => {
+    const handleAutocompleteRequest = createHandleAutocompleteRequest({
+      integrations: mockIntegrations,
+    });
+
+    await expect(
+      handleAutocompleteRequest({
+        resource: 'invalid',
+        token: 'token',
+        context: {},
+      }),
+    ).rejects.toThrow(InputError);
+  });
+
+  it('should throw an error if context id is missing for repositories', async () => {
+    const handleAutocompleteRequest = createHandleAutocompleteRequest({
+      integrations: mockIntegrations,
+    });
+
+    await expect(
+      handleAutocompleteRequest({
+        resource: 'repositories',
+        token: 'token',
+        context: {},
+      }),
+    ).rejects.toThrow(InputError);
+  });
+});
diff --git a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts
new file mode 100644
index 0000000000..6e9a7f79c4
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { InputError } from '@backstage/errors';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { getClient } from '../util';
+
+export function createHandleAutocompleteRequest(options: {
+  integrations: ScmIntegrationRegistry;
+}) {
+  return async function handleAutocompleteRequest({
+    resource,
+    token,
+    context,
+  }: {
+    resource: string;
+    token: string;
+    context: Record<string, string>;
+  }): Promise<{
+    results: {
+      title?: string;
+      id: string;
+    }[];
+  }> {
+    const { integrations } = options;
+    const client = getClient({
+      host: context.host ?? 'gitlab.com',
+      integrations,
+      token,
+    });
+
+    switch (resource) {
+      case 'groups': {
+        let groups: any[] = [];
+        let page = 1;
+        const perPage = 100;
+        let response = [];
+        let continueFetch = true;
+        while (continueFetch) {
+          response = await client.Groups.all({
+            pagination: 'offset',
+            page,
+            perPage,
+          });
+
+          groups = groups.concat(response);
+          if (response.length < perPage) continueFetch = false;
+          page++;
+        }
+
+        const result: {
+          results: {
+            title: string;
+            id: string;
+          }[];
+        } = {
+          results: groups.map(group => ({
+            title: group.full_path,
+            id: group.id.toString(),
+          })),
+        };
+        // append also user context
+        const user = await client.Users.showCurrentUser();
+        result.results.push({
+          title: user.username,
+          id: user.id.toString(),
+        });
+
+        return result;
+      }
+      case 'repositories': {
+        if (!context.id)
+          throw new InputError('Missing groupId and userId context parameter');
+
+        let response;
+        if (
+          context.id === (await client.Users.showCurrentUser())?.id.toString()
+        ) {
+          response = await client.Users.allProjects(context.id);
+        } else {
+          response = await client.Groups.allProjects(context.id);
+        }
+
+        return {
+          results: response.map(project => ({
+            title: project.name.trim(),
+            id: project.id.toString(),
+          })),
+        };
+      }
+      default:
+        throw new InputError(`Invalid resource: ${resource}`);
+    }
+  };
+}
diff --git a/plugins/scaffolder-backend-module-gitlab/src/module.ts b/plugins/scaffolder-backend-module-gitlab/src/module.ts
index 78175532ed..9f18532cdf 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/module.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/module.ts
@@ -18,7 +18,10 @@ import {
   createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { ScmIntegrations } from '@backstage/integration';
-import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import {
+  scaffolderActionsExtensionPoint,
+  scaffolderAutocompleteExtensionPoint,
+} from '@backstage/plugin-scaffolder-node/alpha';
 import {
   createGitlabGroupEnsureExistsAction,
   createGitlabIssueAction,
@@ -31,6 +34,7 @@ import {
   createTriggerGitlabPipelineAction,
   editGitlabIssueAction,
 } from './actions';
+import { createHandleAutocompleteRequest } from './autocomplete/autocomplete';
 
 /**
  * @public
@@ -43,9 +47,10 @@ export const gitlabModule = createBackendModule({
     registerInit({
       deps: {
         scaffolder: scaffolderActionsExtensionPoint,
+        autocomplete: scaffolderAutocompleteExtensionPoint,
         config: coreServices.rootConfig,
       },
-      async init({ scaffolder, config }) {
+      async init({ scaffolder, autocomplete, config }) {
         const integrations = ScmIntegrations.fromConfig(config);
 
         scaffolder.addActions(
@@ -60,6 +65,11 @@ export const gitlabModule = createBackendModule({
           createPublishGitlabMergeRequestAction({ integrations }),
           createTriggerGitlabPipelineAction({ integrations }),
         );
+
+        autocomplete.addAutocompleteProvider({
+          id: 'gitlab',
+          handler: createHandleAutocompleteRequest({ integrations }),
+        });
       },
     });
   },
diff --git a/plugins/scaffolder-backend-module-gitlab/src/util.test.ts b/plugins/scaffolder-backend-module-gitlab/src/util.test.ts
index 61c61e87c3..940dd30a05 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/util.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/util.test.ts
@@ -62,7 +62,7 @@ describe('getTopLevelParentGroup', () => {
       parent_id: 0,
       path: '',
       description: '',
-      visibility: '',
+      visibility: 'public',
       share_with_group_lock: false,
       require_two_factor_authentication: false,
       two_factor_grace_period: 0,
@@ -83,7 +83,7 @@ describe('getTopLevelParentGroup', () => {
       parent_id: 789,
       path: '',
       description: '',
-      visibility: '',
+      visibility: 'public',
       share_with_group_lock: false,
       require_two_factor_authentication: false,
       two_factor_grace_period: 0,
@@ -104,7 +104,7 @@ describe('getTopLevelParentGroup', () => {
       parent_id: 456,
       path: '',
       description: '',
-      visibility: '',
+      visibility: 'public',
       share_with_group_lock: false,
       require_two_factor_authentication: false,
       two_factor_grace_period: 0,
@@ -128,7 +128,7 @@ describe('getTopLevelParentGroup', () => {
     parent_id: 0,
     path: '',
     description: '',
-    visibility: '',
+    visibility: 'public',
     share_with_group_lock: false,
     require_two_factor_authentication: false,
     two_factor_grace_period: 0,
diff --git a/plugins/scaffolder-backend-module-gitlab/src/util.ts b/plugins/scaffolder-backend-module-gitlab/src/util.ts
index d897604956..db1468b180 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/util.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/util.ts
@@ -22,7 +22,6 @@ import {
 import { Gitlab, GroupSchema } from '@gitbeaker/rest';
 import { z } from 'zod';
 import commonGitlabConfig from './commonGitlabConfig';
-import * as util from './util';
 
 export const parseRepoHost = (repoUrl: string): string => {
   let parsed;
@@ -138,10 +137,7 @@ export async function getTopLevelParentGroup(
   try {
     const topParentGroup = await client.Groups.show(groupId);
     if (topParentGroup.parent_id) {
-      return util.getTopLevelParentGroup(
-        client,
-        topParentGroup.parent_id as number,
-      );
+      return getTopLevelParentGroup(client, topParentGroup.parent_id as number);
     }
     return topParentGroup as GroupSchema;
   } catch (error: any) {
diff --git a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
index da4e5a4a03..5a9e37810d 100644
--- a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-scaffolder-backend-module-notifications
 
+## 0.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-notifications-node@0.2.10-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/plugin-notifications-common@0.0.7-next.0
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-notifications-node@0.2.10-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-notifications-common@0.0.6
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.10-next.0
+
+## 0.1.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-notifications-common@0.0.6
+  - @backstage/plugin-notifications-node@0.2.9
+  - @backstage/plugin-scaffolder-node@0.6.0
+
+## 0.1.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-node@0.2.9-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-notifications-common@0.0.6-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/plugin-notifications-node@0.2.9-next.0
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index 6d1116587f..c1ff7c6f0f 100644
--- a/plugins/scaffolder-backend-module-notifications/package.json
+++ b/plugins/scaffolder-backend-module-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-notifications",
-  "version": "0.1.1",
+  "version": "0.1.5-next.2",
   "description": "The notifications backend module for the scaffolder plugin.",
   "backstage": {
     "role": "backend-plugin-module",
@@ -33,7 +33,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/plugin-notifications-common": "workspace:^",
     "@backstage/plugin-notifications-node": "workspace:^",
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index fb4f92e31f..dd877ba2dd 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,103 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.5.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+
+## 0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+
+## 0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.5.2
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.5.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.5.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.5.2-next.1
+
+### Patch Changes
+
+- 702f41d: Bumped dev dependencies `@types/node`
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.5.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.5.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
index 56372ede42..9c30e449bb 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-scaffolder-backend-module-sentry
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/config@1.3.1-next.0
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/errors@1.2.5
+
+## 0.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index 79701530a2..27ace7cec6 100644
--- a/plugins/scaffolder-backend-module-sentry/package.json
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-sentry",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
@@ -46,7 +46,6 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
-    "node-fetch": "^2.7.0",
     "yaml": "^2.3.3"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts b/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts
index 686053b178..259b670f9e 100644
--- a/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts
+++ b/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts
@@ -17,7 +17,6 @@
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { InputError } from '@backstage/errors';
 import { Config } from '@backstage/config';
-import fetch from 'node-fetch';
 
 /**
  * Creates the `sentry:project:create` Scaffolder action.
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index 127948dd4e..d09b9c097c 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.4.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.2
+  - @backstage/types@1.2.0
+
+## 0.4.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.17-next.1
+  - @backstage/types@1.2.0
+
+## 0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.16-next.0
+
+## 0.4.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15
+
+## 0.4.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.3
+
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.2
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.1
+
+## 0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.15-next.0
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index ecc6050e0f..7afce254e3 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-yeoman",
-  "version": "0.4.1",
+  "version": "0.4.5-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
@@ -51,7 +51,6 @@
     "yeoman-environment": "^3.9.1"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/cli": "workspace:^"
   }
 }
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index efe62d9665..c4e642e793 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,288 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.28.0-next.2
+
+### Patch Changes
+
+- dfc8b41: Updated dependency `@opentelemetry/api` to `^1.9.0`.
+- 6c326cf: The --no-node-snapshot check needs to be done against process.execArgv instead of process.argv
+- e913fdf: Add github backend module to create-app and improve error messages
+- 0851834: Resolved an issue where the `templateManagementPermission` was not being exposed through the `/permissions/metadata` endpoint.
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.1
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## 1.28.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.5-next.1
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## 1.28.0-next.0
+
+### Minor Changes
+
+- c05a343: Emit scaffolder events using the optional `EventsService`
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- 8f59dc5: Add fs:readdir to scaffolder startup
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.0-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.3-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.4-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.26-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.3-next.0
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.3-next.0
+
+## 1.27.0
+
+### Minor Changes
+
+- 0587633: Bumped the `isolated-vm` dependency from v4 to v5, which drops support for Node.js v16.
+- e61d5ef: BREAKING EXPERIMENTAL: The `checkpoint` method now takes an object instead of previous arguments.
+
+  ```ts
+  await ctx.checkpoint({ key: 'repo.create', fn: () => ockokit.repo.create({...})})
+  ```
+
+  You can also now return `void` from the checkpoint if the method returns `void` inside the `checkpoint` handler.
+
+### Patch Changes
+
+- 6aa5b98: Fix tasks listing with postgres
+- 59137ff: Fix issue with token not being available because it's now non-enumerable
+- c5e39e7: Internal refactor to use the deferred from the types package
+- e4f5d95: Align with type declaration of template filter/global function by supporting undefined as return value.
+- d52d7f9: Support ISO and ms string forms of durations in config too
+- 7ab3371: Modified `createDryRunner` and corresponding route to include `templateMetaData` inside the `templateInfo`. This allows custom action writers to access things like `templateInfo.entity.metadata.name` via the action context while executing templates using the dry run framework.
+- 4e58bc7: Upgrade to uuid v11 internally
+- 2dae341: Add new `fs:readdir` action to list current content of the workspace
+- 97ba58f: Add example template for notification sending
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2
+  - @backstage/plugin-scaffolder-node@0.6.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2
+
+## 1.27.0-next.3
+
+### Patch Changes
+
+- 7ab3371: Modified `createDryRunner` and corresponding route to include `templateMetaData` inside the `templateInfo`. This allows custom action writers to access things like `templateInfo.entity.metadata.name` via the action context while executing templates using the dry run framework.
+- 2dae341: Add new `fs:readdir` action to list current content of the workspace
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.25-next.0
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.3
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.3
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.3
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 1.27.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.2
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 1.27.0-next.1
+
+### Minor Changes
+
+- 0587633: Bumped the `isolated-vm` dependency from v4 to v5, which drops support for Node.js v16.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.1
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 1.26.3-next.0
+
+### Patch Changes
+
+- 6aa5b98: Fix tasks listing with postgres
+- 59137ff: Fix issue with token not being available because it's now non-enumerable
+- e4f5d95: Align with type declaration of template filter/global function by supporting undefined as return value.
+- 97ba58f: Add example template for notification sending
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.2-next.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.1-next.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 1.26.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend/config.d.ts b/plugins/scaffolder-backend/config.d.ts
index f6b9522575..90040d68f1 100644
--- a/plugins/scaffolder-backend/config.d.ts
+++ b/plugins/scaffolder-backend/config.d.ts
@@ -26,6 +26,7 @@ export interface Config {
       name?: string;
       email?: string;
     };
+
     /**
      * The commit message used when new components are created.
      */
@@ -64,16 +65,15 @@ export interface Config {
      * be attempted to recover.
      *
      * If not specified, the default value is 5 seconds.
-     *
      */
-    EXPERIMENTAL_recoverTasksTimeout?: HumanDuration;
+    EXPERIMENTAL_recoverTasksTimeout?: HumanDuration | string;
 
     /**
      * Makes sure to auto-expire and clean up things that time out or for other reasons should not be left lingering.
      *
      * By default, the frequency is every 5 minutes.
      */
-    taskTimeoutJanitorFrequency?: HumanDuration;
+    taskTimeoutJanitorFrequency?: HumanDuration | string;
 
     /**
      * Sets the task's heartbeat timeout, when to consider a task to be staled.
@@ -82,6 +82,6 @@ export interface Config {
      *
      * Default value is 24 hours.
      */
-    taskTimeout?: HumanDuration;
+    taskTimeout?: HumanDuration | string;
   };
 }
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 8c601adf29..beabffd2b0 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.26.0",
+  "version": "1.28.0-next.2",
   "description": "The Backstage backend plugin that helps you create new things",
   "backstage": {
     "role": "backend-plugin",
@@ -73,6 +73,7 @@
     "@backstage/plugin-bitbucket-cloud-common": "workspace:^",
     "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
+    "@backstage/plugin-events-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^",
@@ -86,7 +87,7 @@
     "@backstage/plugin-scaffolder-common": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/api": "^1.9.0",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.0.0",
     "concat-stream": "^2.0.0",
@@ -95,7 +96,7 @@
     "fs-extra": "^11.2.0",
     "globby": "^11.0.0",
     "isbinaryfile": "^5.0.0",
-    "isolated-vm": "^4.5.0",
+    "isolated-vm": "^5.0.1",
     "jsonschema": "^1.2.6",
     "knex": "^3.0.0",
     "lodash": "^4.17.21",
@@ -107,7 +108,7 @@
     "prom-client": "^15.0.0",
     "tar": "^6.1.12",
     "triple-beam": "^1.4.1",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "winston-transport": "^4.7.0",
     "yaml": "^2.0.0",
diff --git a/plugins/scaffolder-backend/report.api.md b/plugins/scaffolder-backend/report.api.md
index 8fc5248e6f..c2e6c18ad8 100644
--- a/plugins/scaffolder-backend/report.api.md
+++ b/plugins/scaffolder-backend/report.api.md
@@ -19,6 +19,7 @@ import { Config } from '@backstage/config';
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { Duration } from 'luxon';
+import { EventsService } from '@backstage/plugin-events-node';
 import { executeShellCommand as executeShellCommand_2 } from '@backstage/plugin-scaffolder-node';
 import { ExecuteShellCommandOptions } from '@backstage/plugin-scaffolder-node';
 import express from 'express';
@@ -231,6 +232,26 @@ export const createFilesystemDeleteAction: () => TemplateAction_2<
   JsonObject
 >;
 
+// @public
+export const createFilesystemReadDirAction: () => TemplateAction_2<
+  {
+    paths: string[];
+    recursive?: boolean | undefined;
+  },
+  {
+    files: {
+      name: string;
+      path: string;
+      fullPath: string;
+    }[];
+    folders: {
+      name: string;
+      path: string;
+      fullPath: string;
+    }[];
+  }
+>;
+
 // @public
 export const createFilesystemRenameAction: () => TemplateAction_2<
   {
@@ -500,6 +521,7 @@ export class DatabaseTaskStore implements TaskStore {
 // @public
 export type DatabaseTaskStoreOptions = {
   database: PluginDatabaseManager | Knex;
+  events?: EventsService;
 };
 
 // @public @deprecated
@@ -532,6 +554,8 @@ export interface RouterOptions {
   // (undocumented)
   discovery?: DiscoveryService;
   // (undocumented)
+  events?: EventsService;
+  // (undocumented)
   httpAuth?: HttpAuthService;
   // (undocumented)
   identity?: IdentityApi;
diff --git a/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile b/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile
index 0c8b305de5..fb6f3a1f50 100644
--- a/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile
+++ b/plugins/scaffolder-backend/scripts/Cookiecutter.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --update \
 	git \
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index 17f7480a7d..1ee0634d45 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -15,8 +15,8 @@
  */
 
 import {
-  createBackendPlugin,
   coreServices,
+  createBackendPlugin,
 } from '@backstage/backend-plugin-api';
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { ScmIntegrations } from '@backstage/integration';
@@ -47,9 +47,11 @@ import {
   createFetchTemplateFileAction,
   createFilesystemDeleteAction,
   createFilesystemRenameAction,
+  createFilesystemReadDirAction,
   createWaitAction,
 } from './scaffolder';
 import { createRouter } from './service/router';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
 
 /**
  * Scaffolder plugin
@@ -114,6 +116,7 @@ export const scaffolderPlugin = createBackendPlugin({
         httpRouter: coreServices.httpRouter,
         httpAuth: coreServices.httpAuth,
         catalogClient: catalogServiceRef,
+        events: eventsServiceRef,
       },
       async init({
         logger,
@@ -127,6 +130,7 @@ export const scaffolderPlugin = createBackendPlugin({
         httpAuth,
         catalogClient,
         permissions,
+        events,
       }) {
         const log = loggerToWinstonLogger(logger);
         const integrations = ScmIntegrations.fromConfig(config);
@@ -164,6 +168,7 @@ export const scaffolderPlugin = createBackendPlugin({
           createCatalogWriteAction(),
           createFilesystemDeleteAction(),
           createFilesystemRenameAction(),
+          createFilesystemReadDirAction(),
         ];
 
         const actionIds = actions.map(action => action.id).join(', ');
@@ -189,6 +194,7 @@ export const scaffolderPlugin = createBackendPlugin({
           permissions,
           autocompleteHandlers,
           additionalWorkspaceProviders,
+          events,
         });
         httpRouter.use(router);
       },
diff --git a/plugins/scaffolder-backend/src/lib/templating/helpers.ts b/plugins/scaffolder-backend/src/lib/templating/helpers.ts
index 3dfa4589bf..6c117543ff 100644
--- a/plugins/scaffolder-backend/src/lib/templating/helpers.ts
+++ b/plugins/scaffolder-backend/src/lib/templating/helpers.ts
@@ -17,7 +17,7 @@
 export function isNoNodeSnapshotOptionProvided(): boolean {
   return (
     process.env.NODE_OPTIONS?.includes('--no-node-snapshot') ||
-    process.argv.includes('--no-node-snapshot')
+    process.execArgv.includes('--no-node-snapshot')
   );
 }
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts b/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
index 3868380919..f00d7afad1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
@@ -37,7 +37,7 @@ export class TemplateActionRegistry {
     const action = this.actions.get(actionId);
     if (!action) {
       throw new NotFoundError(
-        `Template action with ID '${actionId}' is not registered.`,
+        `Template action with ID '${actionId}' is not registered. See https://backstage.io/docs/features/software-templates/builtin-actions/ on how to add a new action module.`,
       );
     }
     return action;
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index 59182ab46d..d2a03412cc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -41,6 +41,7 @@ import {
 } from './fetch';
 import {
   createFilesystemDeleteAction,
+  createFilesystemReadDirAction,
   createFilesystemRenameAction,
 } from './filesystem';
 import {
@@ -224,6 +225,7 @@ export const createBuiltinActions = (
     createFetchCatalogEntityAction({ catalogClient, auth }),
     createCatalogWriteAction(),
     createFilesystemDeleteAction(),
+    createFilesystemReadDirAction(),
     createFilesystemRenameAction(),
     createGithubActionsDispatchAction({
       integrations,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/index.ts
index 84e477b16b..159d438f27 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/index.ts
@@ -16,3 +16,4 @@
 
 export { createFilesystemDeleteAction } from './delete';
 export { createFilesystemRenameAction } from './rename';
+export { createFilesystemReadDirAction } from './read';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.test.ts
new file mode 100644
index 0000000000..5654fc4c07
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.test.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createFilesystemReadDirAction } from './read';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { resolve as resolvePath } from 'path';
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { examples } from './read.examples';
+import yaml from 'yaml';
+
+describe('fs:readdir examples', () => {
+  const action = createFilesystemReadDirAction();
+
+  const mockDir = createMockDirectory();
+  mockDir.setContent({
+    workspace: {
+      'file1.txt': 'hello',
+      'file2.txt': 'world',
+      docs: {
+        'doc1.md': 'hello',
+        'doc2.md': 'world',
+        assets: {
+          'asset1.jpg': 'sddfsdfsdfsdf',
+        },
+      },
+    },
+  });
+  const workspacePath = resolvePath(mockDir.path, 'workspace');
+
+  beforeEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('should be able to read workspace root', async () => {
+    const example = examples[0].example;
+    const mockContext = createMockActionContext<any, any>({
+      workspacePath,
+      input: yaml.parse(example).steps[0].input,
+    });
+    await action.handler(mockContext);
+    expect(mockContext.output).toHaveBeenNthCalledWith(1, 'files', [
+      {
+        name: 'file1.txt',
+        path: 'file1.txt',
+        fullPath: resolvePath(workspacePath, 'file1.txt'),
+      },
+      {
+        name: 'file2.txt',
+        path: 'file2.txt',
+        fullPath: resolvePath(workspacePath, 'file2.txt'),
+      },
+    ]);
+    expect(mockContext.output).toHaveBeenNthCalledWith(2, 'folders', [
+      {
+        name: 'docs',
+        path: 'docs',
+        fullPath: resolvePath(workspacePath, 'docs'),
+      },
+    ]);
+  });
+
+  it('should be able to read directory recursively', async () => {
+    const example = examples[1].example;
+    const mockContext = createMockActionContext<any, any>({
+      workspacePath,
+      input: yaml.parse(example).steps[0].input,
+    });
+    await action.handler(mockContext);
+    expect(mockContext.output).toHaveBeenNthCalledWith(1, 'files', [
+      {
+        name: 'doc1.md',
+        path: 'docs/doc1.md',
+        fullPath: resolvePath(workspacePath, 'docs/doc1.md'),
+      },
+      {
+        name: 'doc2.md',
+        path: 'docs/doc2.md',
+        fullPath: resolvePath(workspacePath, 'docs/doc2.md'),
+      },
+      {
+        name: 'asset1.jpg',
+        path: 'docs/assets/asset1.jpg',
+        fullPath: resolvePath(workspacePath, 'docs/assets/asset1.jpg'),
+      },
+    ]);
+    expect(mockContext.output).toHaveBeenNthCalledWith(2, 'folders', [
+      {
+        name: 'assets',
+        path: 'docs/assets',
+        fullPath: resolvePath(workspacePath, 'docs/assets'),
+      },
+    ]);
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.ts
new file mode 100644
index 0000000000..11e34c242e
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.examples.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import * as yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Read complete content of workspace',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'fs:readdir',
+          id: 'read-workdir',
+          name: 'Read workspace directory',
+          input: {
+            paths: ['.'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Get content of the docs folder',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'fs:readdir',
+          id: 'read-workdir',
+          name: 'Read workspace directory',
+          input: {
+            paths: ['docs'],
+            recursive: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Get content of multiple folders',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'fs:readdir',
+          id: 'read-workdir',
+          name: 'Read workspace directory',
+          input: {
+            paths: ['foo', 'bar'],
+            recursive: true,
+          },
+        },
+      ],
+    }),
+  },
+];
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts
new file mode 100644
index 0000000000..0351e7cb0e
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import z from 'zod';
+import { resolveSafeChildPath } from '@backstage/backend-plugin-api';
+import fs from 'fs/promises';
+import path from 'path';
+
+const contentSchema = z.object({
+  name: z.string().describe('Name of the file or directory'),
+  path: z
+    .string()
+    .describe('path to the file or directory relative to the workspace'),
+  fullPath: z.string().describe('full path to the file or directory'),
+});
+type Content = z.infer<typeof contentSchema>;
+
+/**
+ * Creates new action that enables reading directories in the workspace.
+ * @public
+ */
+export const createFilesystemReadDirAction = () => {
+  return createTemplateAction({
+    id: 'fs:readdir',
+    description: 'Reads files and directories from the workspace',
+    supportsDryRun: true,
+    schema: {
+      input: z.object({
+        paths: z.array(z.string().min(1)),
+        recursive: z.boolean().default(false),
+      }),
+      output: z.object({
+        files: z.array(contentSchema),
+        folders: z.array(contentSchema),
+      }),
+    },
+    async handler(ctx) {
+      const files: Content[] = [];
+      const folders: Content[] = [];
+
+      for (const localPath of ctx.input.paths) {
+        const fullWorkspacePath = resolveSafeChildPath(
+          ctx.workspacePath,
+          localPath,
+        );
+        const content = await fs.readdir(fullWorkspacePath, {
+          recursive: ctx.input.recursive,
+          withFileTypes: true,
+        });
+        for (const dirent of content) {
+          const fullPath = path.join(dirent.parentPath, dirent.name);
+          const element = {
+            name: dirent.name,
+            path: path.relative(ctx.workspacePath, fullPath),
+            fullPath,
+          };
+          if (dirent.isDirectory()) {
+            folders.push(element);
+          } else {
+            files.push(element);
+          }
+        }
+      }
+
+      ctx.output('files', files);
+      ctx.output('folders', folders);
+    },
+  });
+};
diff --git a/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts b/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
index c993e0d46d..5fab0a80c7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
@@ -15,10 +15,9 @@
  */
 
 import { ScmIntegrations } from '@backstage/integration';
-import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSpec, TemplateInfo } from '@backstage/plugin-scaffolder-common';
 import { JsonObject } from '@backstage/types';
-import { v4 as uuid } from 'uuid';
-import { pathToFileURL } from 'url';
+import { fileURLToPath } from 'url';
 import { Logger } from 'winston';
 import {
   createTemplateAction,
@@ -29,19 +28,19 @@ import {
   SerializedFile,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
+import path from 'path';
 import { TemplateActionRegistry } from '../actions';
 import { NunjucksWorkflowRunner } from '../tasks/NunjucksWorkflowRunner';
 import { DecoratedActionsRegistry } from './DecoratedActionsRegistry';
 import fs from 'fs-extra';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
-import {
-  BackstageCredentials,
-  resolveSafeChildPath,
-} from '@backstage/backend-plugin-api';
+import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import type { UserEntity } from '@backstage/catalog-model';
+import { v4 as uuid } from 'uuid';
 
 interface DryRunInput {
   spec: TaskSpec;
+  templateInfo: TemplateInfo;
   secrets?: TaskSecrets;
   directoryContents: SerializedFile[];
   credentials: BackstageCredentials;
@@ -94,18 +93,21 @@ export function createDryRunner(options: TemplateTesterCreateOptions) {
       ]),
     });
 
+    // Extracting contentsPath and dryRunId from the baseUrl
+    const baseUrl = input.templateInfo.baseUrl;
+    if (!baseUrl) {
+      throw new Error('baseUrl is required');
+    }
+    const basePath = fileURLToPath(new URL(baseUrl));
+    const contentsPath = path.dirname(basePath);
     const dryRunId = uuid();
+
     const log = new Array<{ body: JsonObject }>();
-    const contentsPath = resolveSafeChildPath(
-      options.workingDirectory,
-      `dry-run-content-${dryRunId}`,
-    );
 
     try {
       await deserializeDirectoryContents(contentsPath, input.directoryContents);
 
       const abortSignal = new AbortController().signal;
-
       const result = await workflowRunner.execute({
         spec: {
           ...input.spec,
@@ -117,12 +119,7 @@ export function createDryRunner(options: TemplateTesterCreateOptions) {
               action: 'dry-run:extract',
             },
           ],
-          templateInfo: {
-            entityRef: 'template:default/dry-run',
-            baseUrl: pathToFileURL(
-              resolveSafeChildPath(contentsPath, 'template.yaml'),
-            ).toString(),
-          },
+          templateInfo: input.templateInfo,
         },
         secrets: input.secrets,
         getInitiatorCredentials: () => Promise.resolve(input.credentials),
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
index fbd314cbbc..eb0418b5ed 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
@@ -21,8 +21,9 @@ import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 import { ConflictError } from '@backstage/errors';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 import fs from 'fs-extra';
+import { EventsService } from '@backstage/plugin-events-node';
 
-const createStore = async () => {
+const createStore = async (events?: EventsService) => {
   const manager = DatabaseManager.fromConfig(
     new ConfigReader({
       backend: {
@@ -35,6 +36,7 @@ const createStore = async () => {
   ).forPlugin('scaffolder');
   const store = await DatabaseTaskStore.create({
     database: manager,
+    events,
   });
   return { store, manager };
 };
@@ -52,6 +54,14 @@ const workspaceDir = createMockDirectory({
 });
 
 describe('DatabaseTaskStore', () => {
+  const eventsService = {
+    publish: jest.fn(),
+  } as unknown as EventsService;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should create the database store and run migration', async () => {
     const { store, manager } = await createStore();
     expect(store).toBeDefined();
@@ -222,7 +232,7 @@ describe('DatabaseTaskStore', () => {
   });
 
   it('should sent an event to start cancelling the task', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
 
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
@@ -244,10 +254,24 @@ describe('DatabaseTaskStore', () => {
     const event = events[0];
     expect(event.taskId).toBe(taskId);
     expect(event.body.status).toBe('cancelled');
+
+    expect(eventsService.publish).toHaveBeenCalledWith({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: 1,
+        taskId,
+        status: 'cancelled',
+        body: {
+          message: `Step 2 has been cancelled.`,
+          stepId: 2,
+          status: 'cancelled',
+        },
+      },
+    });
   });
 
   it('should emit a log event', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
       createdBy: 'me',
@@ -310,7 +334,7 @@ describe('DatabaseTaskStore', () => {
   });
 
   it('should complete the task', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
       createdBy: 'me',
@@ -327,10 +351,21 @@ describe('DatabaseTaskStore', () => {
 
     const taskAfterCompletion = await store.getTask(taskId);
     expect(taskAfterCompletion.status).toBe('cancelled');
+
+    expect(eventsService.publish).toHaveBeenCalledWith({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: taskId,
+        status: 'cancelled',
+        createdAt: expect.any(String),
+        lastHeartbeatAt: null,
+        createdBy: 'me',
+      },
+    });
   });
 
   it('should claim a new task', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
       createdBy: 'me',
@@ -341,10 +376,22 @@ describe('DatabaseTaskStore', () => {
 
     const claimedTask = await store.getTask(taskId);
     expect(claimedTask.status).toBe('processing');
+
+    expect(eventsService.publish).toHaveBeenCalledWith({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: taskId,
+        status: 'processing',
+        createdAt: expect.any(String),
+        lastHeartbeatAt: null,
+        createdBy: 'me',
+        spec: {},
+      },
+    });
   });
 
   it('should restore the state of the task after the task recovery', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
       createdBy: 'me',
@@ -379,10 +426,22 @@ describe('DatabaseTaskStore', () => {
 
     const claimedTask = await store.getTask(taskId);
     expect(claimedTask.state).toEqual({ state: state.state });
+
+    expect(eventsService.publish).toHaveBeenCalledWith({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: 1,
+        taskId,
+        body: {
+          recoverStrategy: 'none',
+        },
+        status: 'recovered',
+      },
+    });
   });
 
   it('should shutdown the running task', async () => {
-    const { store } = await createStore();
+    const { store } = await createStore(eventsService);
     const { taskId } = await store.createTask({
       spec: {} as TaskSpec,
       createdBy: 'me',
@@ -394,6 +453,17 @@ describe('DatabaseTaskStore', () => {
 
     const claimedTask = await store.getTask(taskId);
     expect(claimedTask.status).toBe('failed');
+
+    expect(eventsService.publish).toHaveBeenCalledWith({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: taskId,
+        status: 'failed',
+        createdAt: expect.any(String),
+        lastHeartbeatAt: expect.any(String),
+        createdBy: 'me',
+      },
+    });
   });
 
   it('should be not possible to shutdown not running task', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 8913ec2675..8114532566 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -45,6 +45,7 @@ import {
   serializeWorkspace,
 } from '@backstage/plugin-scaffolder-node/alpha';
 import { flattenParams } from '../../service/helpers';
+import { EventsService } from '@backstage/plugin-events-node';
 
 const migrationsDir = resolvePackagePath(
   '@backstage/plugin-scaffolder-backend',
@@ -78,6 +79,7 @@ export type RawDbTaskEventRow = {
  */
 export type DatabaseTaskStoreOptions = {
   database: PluginDatabaseManager | Knex;
+  events?: EventsService;
 };
 
 /**
@@ -112,6 +114,7 @@ const parseSqlDateToIsoString = <T>(input: T): T | string => {
  */
 export class DatabaseTaskStore implements TaskStore {
   private readonly db: Knex;
+  private readonly events?: EventsService;
 
   static async create(
     options: DatabaseTaskStoreOptions,
@@ -121,7 +124,7 @@ export class DatabaseTaskStore implements TaskStore {
 
     await this.runMigrations(database, client);
 
-    return new DatabaseTaskStore(client);
+    return new DatabaseTaskStore(client, options.events);
   }
 
   private isRecoverableTask(spec: TaskSpec): boolean {
@@ -177,8 +180,19 @@ export class DatabaseTaskStore implements TaskStore {
     }
   }
 
-  private constructor(client: Knex) {
+  private constructor(client: Knex, events?: EventsService) {
     this.db = client;
+    this.events = events;
+  }
+
+  private getState(task: RawDbTaskRow) {
+    try {
+      return task.state ? JSON.parse(task.state).state : undefined;
+    } catch (error) {
+      throw new Error(
+        `Failed to parse state of the task '${task.id}', ${error}`,
+      );
+    }
   }
 
   async list(options: {
@@ -259,7 +273,7 @@ export class DatabaseTaskStore implements TaskStore {
     try {
       const spec = JSON.parse(result.spec);
       const secrets = result.secrets ? JSON.parse(result.secrets) : undefined;
-      const state = result.state ? JSON.parse(result.state).state : undefined;
+      const state = this.getState(result);
       return {
         id: result.id,
         spec,
@@ -286,6 +300,17 @@ export class DatabaseTaskStore implements TaskStore {
       created_by: options.createdBy ?? null,
       status: 'open',
     });
+
+    this.events?.publish({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: taskId,
+        spec: options.spec,
+        createdBy: options.createdBy,
+        status: 'open',
+      },
+    });
+
     return { taskId };
   }
 
@@ -317,27 +342,23 @@ export class DatabaseTaskStore implements TaskStore {
         return undefined;
       }
 
-      const getState = () => {
-        try {
-          return task.state ? JSON.parse(task.state).state : undefined;
-        } catch (error) {
-          throw new Error(
-            `Failed to parse state of the task '${task.id}', ${error}`,
-          );
-        }
-      };
-
-      const secrets = this.parseTaskSecrets(task);
-      return {
+      const ret: SerializedTask = {
         id: task.id,
         spec,
         status: 'processing',
         lastHeartbeatAt: task.last_heartbeat_at,
         createdAt: task.created_at,
         createdBy: task.created_by ?? undefined,
-        secrets,
-        state: getState(),
+        state: this.getState(task),
       };
+
+      this.events?.publish({
+        topic: 'scaffolder.task',
+        eventPayload: ret,
+      });
+
+      const secrets = this.parseTaskSecrets(task);
+      return { ...ret, secrets };
     });
   }
 
@@ -408,11 +429,25 @@ export class DatabaseTaskStore implements TaskStore {
           );
         }
 
-        await tx<RawDbTaskEventRow>('task_events').insert({
-          task_id: taskId,
-          event_type: 'completion',
-          body: JSON.stringify(eventBody),
+        this.events?.publish({
+          topic: 'scaffolder.task',
+          eventPayload: {
+            id: taskId,
+            status: status,
+            lastHeartbeatAt: task.last_heartbeat_at,
+            createdAt: task.created_at,
+            createdBy: task.created_by,
+            state: this.getState(task),
+          },
         });
+
+        await tx<RawDbTaskEventRow>('task_events')
+          .insert({
+            task_id: taskId,
+            event_type: 'completion',
+            body: JSON.stringify(eventBody),
+          })
+          .returning('id');
       };
 
       if (status === 'cancelled') {
@@ -448,11 +483,13 @@ export class DatabaseTaskStore implements TaskStore {
   ): Promise<void> {
     const { taskId, body } = options;
     const serializedBody = JSON.stringify(body);
-    await this.db<RawDbTaskEventRow>('task_events').insert({
-      task_id: taskId,
-      event_type: 'log',
-      body: serializedBody,
-    });
+    await this.db<RawDbTaskEventRow>('task_events')
+      .insert({
+        task_id: taskId,
+        event_type: 'log',
+        body: serializedBody,
+      })
+      .returning('id');
   }
 
   async getTaskState({ taskId }: { taskId: string }): Promise<
@@ -596,10 +633,22 @@ export class DatabaseTaskStore implements TaskStore {
   ): Promise<void> {
     const { taskId, body } = options;
     const serializedBody = JSON.stringify(body);
-    await this.db<RawDbTaskEventRow>('task_events').insert({
-      task_id: taskId,
-      event_type: 'cancelled',
-      body: serializedBody,
+    const [ret] = await this.db<RawDbTaskEventRow>('task_events')
+      .insert({
+        task_id: taskId,
+        event_type: 'cancelled',
+        body: serializedBody,
+      })
+      .returning('id');
+
+    this.events?.publish({
+      topic: 'scaffolder.task',
+      eventPayload: {
+        id: ret.id,
+        taskId,
+        status: 'cancelled',
+        body,
+      },
     });
   }
 
@@ -665,13 +714,26 @@ export class DatabaseTaskStore implements TaskStore {
 
       for (const { id, spec } of result) {
         const taskSpec = JSON.parse(spec as string) as TaskSpec;
-        await tx<RawDbTaskEventRow>('task_events').insert({
-          task_id: id,
-          event_type: 'recovered',
-          body: JSON.stringify({
-            recoverStrategy:
-              taskSpec.EXPERIMENTAL_recovery?.EXPERIMENTAL_strategy ?? 'none',
-          }),
+        const event = {
+          recoverStrategy:
+            taskSpec.EXPERIMENTAL_recovery?.EXPERIMENTAL_strategy ?? 'none',
+        };
+        const [ret] = await tx<RawDbTaskEventRow>('task_events')
+          .insert({
+            task_id: id,
+            event_type: 'recovered',
+            body: JSON.stringify(event),
+          })
+          .returning('id');
+
+        this.events?.publish({
+          topic: 'scaffolder.task',
+          eventPayload: {
+            id: ret.id,
+            taskId: id,
+            status: 'recovered',
+            body: event,
+          },
         });
       }
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 0bcbd2f917..3990ac14b6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -152,19 +152,37 @@ describe('NunjucksWorkflowRunner', () => {
       id: 'checkpoints-action',
       description: 'Mock action with checkpoints',
       handler: async ctx => {
-        const key1 = await ctx.checkpoint('key1', async () => {
-          return 'updated';
+        const key1 = await ctx.checkpoint({
+          key: 'key1',
+          fn: async () => 'updated',
         });
-        const key2 = await ctx.checkpoint('key2', async () => {
-          return 'updated';
+        const key2 = await ctx.checkpoint({
+          key: 'key2',
+          fn: async () => 'updated',
         });
-        const key3 = await ctx.checkpoint('key3', async () => {
-          return 'updated';
+        const key3 = await ctx.checkpoint({
+          key: 'key3',
+          fn: async () => 'updated',
+        });
+
+        const key4 = await ctx.checkpoint({
+          key: 'key4',
+          fn: () => {},
+        });
+
+        const key5 = await ctx.checkpoint({
+          key: 'key5',
+          fn: async () => {},
         });
 
         ctx.output('key1', key1);
         ctx.output('key2', key2);
         ctx.output('key3', key3);
+
+        // @ts-expect-error - this is void return
+        ctx.output('key4', key4);
+        // @ts-expect-error - this is void return
+        ctx.output('key5', key5);
       },
     });
 
@@ -190,7 +208,7 @@ describe('NunjucksWorkflowRunner', () => {
     });
 
     await expect(runner.execute(task)).rejects.toThrow(
-      "Template action with ID 'does-not-exist' is not registered.",
+      /Template action with ID 'does-not-exist' is not registered/,
     );
   });
 
@@ -632,6 +650,9 @@ describe('NunjucksWorkflowRunner', () => {
             key1: '${{steps.test.output.key1}}',
             key2: '${{steps.test.output.key2}}',
             key3: '${{steps.test.output.key3}}',
+            key4: '${{steps.test.output.key4}}',
+            key5: '${{steps.test.output.key5}}',
+            key6: '${{steps.test.output.key6}}',
           },
         }),
         getTaskState: (): Promise<
@@ -661,6 +682,8 @@ describe('NunjucksWorkflowRunner', () => {
       expect(result.output.key1).toEqual('initial');
       expect(result.output.key2).toEqual('updated');
       expect(result.output.key3).toEqual('updated');
+      expect(result.output.key4).toEqual(undefined);
+      expect(result.output.key5).toEqual(undefined);
     });
 
     it('should template the output from simple actions', async () => {
@@ -1331,6 +1354,39 @@ describe('NunjucksWorkflowRunner', () => {
 
       expect(fakeActionHandler.mock.calls[0][0].isDryRun).toEqual(true);
     });
+
+    it('should have metadata in action context during dry run', async () => {
+      const task = createMockTaskWithSpec(
+        {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          templateInfo: {
+            entityRef: 'dryRun-Entity',
+            entity: { metadata: { name: 'test-template' } },
+          },
+          parameters: {},
+          output: {},
+          steps: [
+            {
+              id: 'test',
+              name: 'name',
+              action: 'jest-validated-action',
+              input: { foo: 1 },
+            },
+          ],
+        },
+        {
+          backstageToken: token,
+        },
+        true,
+      );
+
+      await runner.execute(task);
+
+      expect(fakeActionHandler.mock.calls[0][0].isDryRun).toEqual(true);
+      expect(
+        fakeActionHandler.mock.calls[0][0].templateInfo.entity.metadata.name,
+      ).toEqual('test-template');
+    });
   });
 
   describe('permissions', () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 6f7551568f..c5413a08e0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -364,6 +364,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
             )}`,
           );
         }
+
         await action.handler({
           input: iteration.input,
           secrets: task.secrets ?? {},
@@ -371,21 +372,25 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
           logger: loggerToWinstonLogger(taskLogger),
           logStream: streamLogger,
           workspacePath,
-          async checkpoint<U extends JsonValue>(
-            keySuffix: string,
-            fn: () => Promise<U>,
-          ) {
-            const key = `v1.task.checkpoint.${step.id}.${keySuffix}`;
+          async checkpoint<T extends JsonValue | void>(opts: {
+            key?: string;
+            fn: () => Promise<T> | T;
+          }) {
+            const { key: checkpointKey, fn } = opts;
+            const key = `v1.task.checkpoint.${step.id}.${checkpointKey}`;
+
             try {
-              let prevValue: U | undefined;
+              let prevValue: T | undefined;
+
               if (prevTaskState) {
                 const prevState = (
                   prevTaskState.state?.checkpoints as {
                     [key: string]: CheckpointState;
                   }
                 )?.[key];
+
                 if (prevState && prevState.status === 'success') {
-                  prevValue = prevState.value as U;
+                  prevValue = prevState.value as T;
                 }
               }
 
@@ -395,7 +400,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
                 task.updateCheckpoint?.({
                   key,
                   status: 'success',
-                  value,
+                  value: value ?? {},
                 });
               }
               return value;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 1da2b4b349..2d65488218 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -16,7 +16,12 @@
 
 import { Config } from '@backstage/config';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
-import { JsonObject, JsonValue, Observable } from '@backstage/types';
+import {
+  JsonObject,
+  JsonValue,
+  Observable,
+  createDeferred,
+} from '@backstage/types';
 import { Logger } from 'winston';
 import ObservableImpl from 'zen-observable';
 import {
@@ -260,14 +265,6 @@ export interface CurrentClaimedTask {
   workspace?: Promise<Buffer>;
 }
 
-function defer() {
-  let resolve = () => {};
-  const promise = new Promise<void>(_resolve => {
-    resolve = _resolve;
-  });
-  return { promise, resolve };
-}
-
 export class StorageTaskBroker implements TaskBroker {
   constructor(
     private readonly storage: TaskStore,
@@ -301,7 +298,7 @@ export class StorageTaskBroker implements TaskBroker {
     return await this.storage.list(options ?? {});
   }
 
-  private deferredDispatch = defer();
+  private deferredDispatch = createDeferred();
 
   private async registerCancellable(
     taskId: string,
@@ -469,12 +466,12 @@ export class StorageTaskBroker implements TaskBroker {
   }
 
   private waitForDispatch() {
-    return this.deferredDispatch.promise;
+    return this.deferredDispatch;
   }
 
   private signalDispatch() {
     this.deferredDispatch.resolve();
-    this.deferredDispatch = defer();
+    this.deferredDispatch = createDeferred();
   }
 
   async cancel(taskId: string) {
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 715ada5de1..55d8b91293 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -51,6 +51,7 @@ import {
 import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
 import { UrlReaders } from '@backstage/backend-defaults/urlReader';
 import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+import { EventsService } from '@backstage/plugin-events-node';
 
 const mockAccess = jest.fn();
 
@@ -99,6 +100,9 @@ describe('createRouter', () => {
   const auth = mockServices.auth();
   const httpAuth = mockServices.httpAuth();
   const discovery = mockServices.discovery();
+  const events = {
+    publish: jest.fn(),
+  } as unknown as EventsService;
 
   const credentials = mockCredentials.user();
   const token = mockCredentials.service.token({
@@ -211,6 +215,7 @@ describe('createRouter', () => {
         auth,
         httpAuth,
         discovery,
+        events,
       });
       app = express().use(router);
 
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 35dacf6559..1758eb3fba 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -41,7 +41,7 @@ import {
   RESOURCE_TYPE_SCAFFOLDER_ACTION,
   RESOURCE_TYPE_SCAFFOLDER_TEMPLATE,
   scaffolderActionPermissions,
-  scaffolderTaskPermissions,
+  scaffolderPermissions,
   scaffolderTemplatePermissions,
   taskCancelPermission,
   taskCreatePermission,
@@ -92,6 +92,7 @@ import {
   HttpAuthService,
   LifecycleService,
   PermissionsService,
+  resolveSafeChildPath,
   SchedulerService,
   UrlReaderService,
 } from '@backstage/backend-plugin-api';
@@ -105,6 +106,9 @@ import {
   AutocompleteHandler,
   WorkspaceProvider,
 } from '@backstage/plugin-scaffolder-node/alpha';
+import { pathToFileURL } from 'url';
+import { v4 as uuid } from 'uuid';
+import { EventsService } from '@backstage/plugin-events-node';
 
 /**
  *
@@ -179,6 +183,7 @@ export interface RouterOptions {
   httpAuth?: HttpAuthService;
   identity?: IdentityApi;
   discovery?: DiscoveryService;
+  events?: EventsService;
 
   autocompleteHandlers?: Record<string, AutocompleteHandler>;
 }
@@ -291,6 +296,7 @@ export async function createRouter(
     discovery = HostDiscovery.fromConfig(config),
     identity = buildDefaultIdentityClient(options),
     autocompleteHandlers = {},
+    events: eventsService,
   } = options;
 
   const { auth, httpAuth } = createLegacyAuthAdapters({
@@ -310,7 +316,10 @@ export async function createRouter(
 
   let taskBroker: TaskBroker;
   if (!options.taskBroker) {
-    const databaseTaskStore = await DatabaseTaskStore.create({ database });
+    const databaseTaskStore = await DatabaseTaskStore.create({
+      database,
+      events: eventsService,
+    });
     taskBroker = new StorageTaskBroker(
       databaseTaskStore,
       logger,
@@ -436,7 +445,7 @@ export async function createRouter(
         rules: actionRules,
       },
     ],
-    permissions: scaffolderTaskPermissions,
+    permissions: scaffolderPermissions,
   });
 
   router.use(permissionIntegrationRouter);
@@ -472,6 +481,8 @@ export async function createRouter(
             description: schema.description,
             schema,
           })),
+          EXPERIMENTAL_formDecorators:
+            template.spec.EXPERIMENTAL_formDecorators,
         });
       },
     )
@@ -814,6 +825,22 @@ export async function createRouter(
         name: step.name ?? step.action,
       }));
 
+      const dryRunId = uuid();
+      const contentsPath = resolveSafeChildPath(
+        workingDirectory,
+        `dry-run-content-${dryRunId}`,
+      );
+
+      const templateInfo = {
+        entityRef: stringifyEntityRef(template),
+        entity: {
+          metadata: template.metadata,
+        },
+        baseUrl: pathToFileURL(
+          resolveSafeChildPath(contentsPath, 'template.yaml'),
+        ).toString(),
+      };
+
       const result = await dryRunner({
         spec: {
           apiVersion: template.apiVersion,
@@ -825,6 +852,7 @@ export async function createRouter(
             ref: userEntityRef,
           },
         },
+        templateInfo: templateInfo,
         directoryContents: (body.directoryContents ?? []).map(file => ({
           path: file.path,
           content: Buffer.from(file.base64Content, 'base64'),
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index 010ead4618..183d67cc8c 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/plugin-scaffolder-common
 
+## 1.5.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.5.8-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
+## 1.5.7
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+
+## 1.5.7-next.0
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 1.5.6
 
 ### Patch Changes
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index e987313b16..34f8469776 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-common",
-  "version": "1.5.6",
+  "version": "1.5.8-next.1",
   "description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/scaffolder-common/report-alpha.api.md b/plugins/scaffolder-common/report-alpha.api.md
index 36b6a7cdb0..97a3de63c5 100644
--- a/plugins/scaffolder-common/report-alpha.api.md
+++ b/plugins/scaffolder-common/report-alpha.api.md
@@ -40,6 +40,9 @@ export const taskCreatePermission: BasicPermission;
 // @alpha
 export const taskReadPermission: BasicPermission;
 
+// @alpha
+export const templateManagementPermission: BasicPermission;
+
 // @alpha
 export const templateParameterReadPermission: ResourcePermission<'scaffolder-template'>;
 
diff --git a/plugins/scaffolder-common/report.api.md b/plugins/scaffolder-common/report.api.md
index 8d7a61910d..3aa7e08121 100644
--- a/plugins/scaffolder-common/report.api.md
+++ b/plugins/scaffolder-common/report.api.md
@@ -77,6 +77,10 @@ export interface TemplateEntityV1beta3 extends Entity {
     type: string;
     presentation?: TemplatePresentationV1beta3;
     EXPERIMENTAL_recovery?: TemplateRecoveryV1beta3;
+    EXPERIMENTAL_formDecorators?: {
+      id: string;
+      input?: JsonObject;
+    }[];
     parameters?: TemplateParametersV1beta3 | TemplateParametersV1beta3[];
     steps: Array<TemplateEntityStepV1beta3>;
     output?: {
diff --git a/plugins/scaffolder-common/src/Template.v1beta3.schema.json b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
index 4e34545d6d..58f8ef240a 100644
--- a/plugins/scaffolder-common/src/Template.v1beta3.schema.json
+++ b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
@@ -173,6 +173,23 @@
                 }
               }
             },
+            "EXPERIMENTAL_formDecorators": {
+              "type": "array",
+              "description": "A list of decorators and their inputs that the form should trigger before submitting the job",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string",
+                    "description": "The form hook ID"
+                  },
+                  "input": {
+                    "type": "object",
+                    "description": "A object describing the inputs to the form hook."
+                  }
+                }
+              }
+            },
             "steps": {
               "type": "array",
               "description": "A list of steps to execute.",
diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
index 0e2fec4264..c5b576b5c2 100644
--- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
+++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
@@ -56,6 +56,11 @@ export interface TemplateEntityV1beta3 extends Entity {
      */
     EXPERIMENTAL_recovery?: TemplateRecoveryV1beta3;
 
+    /**
+     * Form hooks to be run
+     */
+    EXPERIMENTAL_formDecorators?: { id: string; input?: JsonObject }[];
+
     /**
      * This is a JSONSchema or an array of JSONSchema's which is used to render a form in the frontend
      * to collect user input and validate it against that schema. This can then be used in the `steps` part below to template
diff --git a/plugins/scaffolder-common/src/permissions.ts b/plugins/scaffolder-common/src/permissions.ts
index c441b48d5d..e758291e75 100644
--- a/plugins/scaffolder-common/src/permissions.ts
+++ b/plugins/scaffolder-common/src/permissions.ts
@@ -113,6 +113,16 @@ export const taskCancelPermission = createPermission({
   attributes: {},
 });
 
+/**
+ * This permission is used to authorize template management features.
+ *
+ * @alpha
+ */
+export const templateManagementPermission = createPermission({
+  name: 'scaffolder.template.management',
+  attributes: {},
+});
+
 /**
  * List of the scaffolder permissions that are associated with template steps and parameters.
  * @alpha
@@ -146,4 +156,5 @@ export const scaffolderPermissions = [
   ...scaffolderTemplatePermissions,
   ...scaffolderActionPermissions,
   ...scaffolderTaskPermissions,
+  templateManagementPermission,
 ];
diff --git a/plugins/scaffolder-node-test-utils/CHANGELOG.md b/plugins/scaffolder-node-test-utils/CHANGELOG.md
index 439592f9ed..6ba7bffacd 100644
--- a/plugins/scaffolder-node-test-utils/CHANGELOG.md
+++ b/plugins/scaffolder-node-test-utils/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-scaffolder-node-test-utils
 
+## 0.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.2.0-next.2
+  - @backstage/plugin-scaffolder-node@0.6.2-next.2
+  - @backstage/types@1.2.0
+
+## 0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.6.2-next.1
+  - @backstage/backend-test-utils@1.2.0-next.1
+  - @backstage/types@1.2.0
+
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.2.0-next.0
+  - @backstage/plugin-scaffolder-node@0.6.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/backend-test-utils@1.1.0
+  - @backstage/plugin-scaffolder-node@0.6.0
+
+## 0.1.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.1.0-next.3
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.3
+
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.1.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.2
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.3-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.1
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.3-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.5.1-next.0
+
 ## 0.1.13
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json
index f5731a3f77..362c69ccb0 100644
--- a/plugins/scaffolder-node-test-utils/package.json
+++ b/plugins/scaffolder-node-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node-test-utils",
-  "version": "0.1.13",
+  "version": "0.1.17-next.2",
   "backstage": {
     "role": "node-library",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index 045e7f0935..327dbf0741 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,113 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## 0.6.2-next.1
+
+### Patch Changes
+
+- 1a23421: Make sure that isomorphic git push commands are not proxied.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## 0.6.1-next.0
+
+### Patch Changes
+
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+
+## 0.6.0
+
+### Minor Changes
+
+- e61d5ef: BREAKING EXPERIMENTAL: The `checkpoint` method now takes an object instead of previous arguments.
+
+  ```ts
+  await ctx.checkpoint({ key: 'repo.create', fn: () => ockokit.repo.create({...})})
+  ```
+
+  You can also now return `void` from the checkpoint if the method returns `void` inside the `checkpoint` handler.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+
+## 0.5.1-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+
+## 0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 0.5.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index fe6d263694..e8d52add6b 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node",
-  "version": "0.5.0",
+  "version": "0.6.2-next.2",
   "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/scaffolder-node/report-alpha.api.md b/plugins/scaffolder-node/report-alpha.api.md
index c9b8130f0e..eef9acc1c1 100644
--- a/plugins/scaffolder-node/report-alpha.api.md
+++ b/plugins/scaffolder-node/report-alpha.api.md
@@ -22,7 +22,8 @@ export type AutocompleteHandler = ({
   context: Record<string, string>;
 }) => Promise<{
   results: {
-    title: string;
+    title?: string;
+    id: string;
   }[];
 }>;
 
diff --git a/plugins/scaffolder-node/report.api.md b/plugins/scaffolder-node/report.api.md
index 0fa84d5407..27787d6fe7 100644
--- a/plugins/scaffolder-node/report.api.md
+++ b/plugins/scaffolder-node/report.api.md
@@ -32,10 +32,10 @@ export type ActionContext<
   secrets?: TaskSecrets;
   workspacePath: string;
   input: TActionInput;
-  checkpoint<U extends JsonValue>(
-    key: string,
-    fn: () => Promise<U>,
-  ): Promise<U>;
+  checkpoint<T extends JsonValue | void>(opts: {
+    key: string;
+    fn: () => Promise<T> | T;
+  }): Promise<T>;
   output(
     name: keyof TActionOutput,
     value: TActionOutput[keyof TActionOutput],
diff --git a/plugins/scaffolder-node/src/actions/gitHelpers.test.ts b/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
index 7a61e592ec..664cc5c893 100644
--- a/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
+++ b/plugins/scaffolder-node/src/actions/gitHelpers.test.ts
@@ -98,18 +98,11 @@ describe('initRepoAndPush', () => {
       });
     });
 
-    it('adds the appropriate remote', () => {
-      expect(mockedGit.addRemote).toHaveBeenCalledWith({
-        dir: '/test/repo/dir/',
-        url: 'git@github.com:test/repo.git',
-        remote: 'origin',
-      });
-    });
-
     it('pushes to the remote', () => {
       expect(mockedGit.push).toHaveBeenCalledWith({
         dir: '/test/repo/dir/',
         remote: 'origin',
+        url: 'git@github.com:test/repo.git',
       });
     });
   });
diff --git a/plugins/scaffolder-node/src/actions/gitHelpers.ts b/plugins/scaffolder-node/src/actions/gitHelpers.ts
index 9f2d5709a7..e24c0cf025 100644
--- a/plugins/scaffolder-node/src/actions/gitHelpers.ts
+++ b/plugins/scaffolder-node/src/actions/gitHelpers.ts
@@ -65,15 +65,11 @@ export async function initRepoAndPush(input: {
     author: authorInfo,
     committer: authorInfo,
   });
-  await git.addRemote({
-    dir,
-    url: remoteUrl,
-    remote: 'origin',
-  });
 
   await git.push({
     dir,
     remote: 'origin',
+    url: remoteUrl,
   });
 
   return { commitHash };
diff --git a/plugins/scaffolder-node/src/actions/types.ts b/plugins/scaffolder-node/src/actions/types.ts
index f0e4c12869..5dd9d5526f 100644
--- a/plugins/scaffolder-node/src/actions/types.ts
+++ b/plugins/scaffolder-node/src/actions/types.ts
@@ -38,10 +38,10 @@ export type ActionContext<
   secrets?: TaskSecrets;
   workspacePath: string;
   input: TActionInput;
-  checkpoint<U extends JsonValue>(
-    key: string,
-    fn: () => Promise<U>,
-  ): Promise<U>;
+  checkpoint<T extends JsonValue | void>(opts: {
+    key: string;
+    fn: () => Promise<T> | T;
+  }): Promise<T>;
   output(
     name: keyof TActionOutput,
     value: TActionOutput[keyof TActionOutput],
diff --git a/plugins/scaffolder-node/src/alpha.ts b/plugins/scaffolder-node/src/alpha.ts
index 6a0e34faf7..38a43d4865 100644
--- a/plugins/scaffolder-node/src/alpha.ts
+++ b/plugins/scaffolder-node/src/alpha.ts
@@ -16,10 +16,10 @@
 
 import { createExtensionPoint } from '@backstage/backend-plugin-api';
 import {
+  TaskBroker,
   TemplateAction,
   TemplateFilter,
   TemplateGlobal,
-  TaskBroker,
 } from '@backstage/plugin-scaffolder-node';
 
 export * from './tasks/alpha';
@@ -95,7 +95,7 @@ export type AutocompleteHandler = ({
   resource: string;
   token: string;
   context: Record<string, string>;
-}) => Promise<{ results: { title: string }[] }>;
+}) => Promise<{ results: { title?: string; id: string }[] }>;
 
 /**
  * Extension point for adding autocomplete handler providers
diff --git a/plugins/scaffolder-node/src/scm/git.test.ts b/plugins/scaffolder-node/src/scm/git.test.ts
index 1c07dfb917..4a472a675a 100644
--- a/plugins/scaffolder-node/src/scm/git.test.ts
+++ b/plugins/scaffolder-node/src/scm/git.test.ts
@@ -452,6 +452,8 @@ describe('Git', () => {
           'user-agent': 'git/@isomorphic-git',
         },
         onAuth: expect.any(Function),
+        corsProxy: '',
+        url: undefined,
       });
     });
 
@@ -480,6 +482,8 @@ describe('Git', () => {
           'user-agent': 'git/@isomorphic-git',
         },
         onAuth: expect.any(Function),
+        corsProxy: '',
+        url: undefined,
       });
     });
 
@@ -506,6 +510,8 @@ describe('Git', () => {
           'user-agent': 'git/@isomorphic-git',
         },
         onAuth: expect.any(Function),
+        corsProxy: '',
+        url: undefined,
       });
     });
 
diff --git a/plugins/scaffolder-node/src/scm/git.ts b/plugins/scaffolder-node/src/scm/git.ts
index e7bad693fe..760be73114 100644
--- a/plugins/scaffolder-node/src/scm/git.ts
+++ b/plugins/scaffolder-node/src/scm/git.ts
@@ -262,9 +262,10 @@ export class Git {
     dir: string;
     remote: string;
     remoteRef?: string;
+    url?: string;
     force?: boolean;
   }) {
-    const { dir, remote, remoteRef, force } = options;
+    const { dir, remote, url, remoteRef, force } = options;
     this.config.logger?.info(
       `Pushing directory to remote {dir=${dir},remote=${remote}}`,
     );
@@ -278,7 +279,9 @@ export class Git {
         force,
         headers: this.headers,
         remote,
+        url,
         onAuth: this.onAuth,
+        corsProxy: '',
       });
     } catch (ex) {
       this.config.logger?.error(
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index 4da79401e8..4efe1d95c8 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,164 @@
 # @backstage/plugin-scaffolder-react
 
+## 1.14.2-next.2
+
+### Patch Changes
+
+- 184161f: Scaffolder field extensions registered with `FormFieldBlueprint` are now collected in the `useCustomFieldExtensions` hook, enabling them for use in the scaffolder.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## 1.14.2-next.1
+
+### Patch Changes
+
+- c846d76: Updated dependency `flatted` to `3.3.2`.
+- b21a5ae: Open links in the scaffolder entity and step descriptions in a new tab, to ensure consistency and improve user experience
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## 1.14.2-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.14.0
+
+### Minor Changes
+
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- 8b5ff7e: Fix issue with form state not refreshing when updating
+- ade301c: Fix issue with `Stepper` and trying to trim additional properties. This is now all behind `liveOmit` and `omitExtraData` instead.
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.14.0-next.3
+
+### Minor Changes
+
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.13.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 1.13.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 1.13.2-next.0
+
+### Patch Changes
+
+- 8b5ff7e: Fix issue with form state not refreshing when updating
+- ade301c: Fix issue with `Stepper` and trying to trim additional properties. This is now all behind `liveOmit` and `omitExtraData` instead.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 1.13.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index b928538183..208fa93633 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-react",
-  "version": "1.13.0",
+  "version": "1.14.2-next.2",
   "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
   "backstage": {
     "role": "web-library",
@@ -73,14 +73,14 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@react-hookz/web": "^24.0.0",
-    "@rjsf/core": "5.21.2",
-    "@rjsf/material-ui": "5.21.2",
-    "@rjsf/utils": "5.21.2",
-    "@rjsf/validator-ajv8": "5.21.2",
+    "@rjsf/core": "5.23.1",
+    "@rjsf/material-ui": "5.23.1",
+    "@rjsf/utils": "5.23.1",
+    "@rjsf/validator-ajv8": "5.23.1",
     "@types/json-schema": "^7.0.9",
     "ajv-errors": "^3.0.0",
     "classnames": "^2.2.6",
-    "flatted": "3.3.1",
+    "flatted": "3.3.2",
     "humanize-duration": "^3.25.1",
     "json-schema": "^0.4.0",
     "json-schema-library": "^9.0.0",
diff --git a/plugins/scaffolder-react/report-alpha.api.md b/plugins/scaffolder-react/report-alpha.api.md
index 7084625ad4..4f9f86d1ac 100644
--- a/plugins/scaffolder-react/report-alpha.api.md
+++ b/plugins/scaffolder-react/report-alpha.api.md
@@ -5,12 +5,17 @@
 ```ts
 /// <reference types="react" />
 
+import { AnyApiFactory } from '@backstage/frontend-plugin-api';
+import { AnyApiRef } from '@backstage/core-plugin-api';
 import { ApiHolder } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { ComponentType } from 'react';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { CustomFieldValidator } from '@backstage/plugin-scaffolder-react';
 import { Dispatch } from 'react';
 import { ExtensionBlueprint } from '@backstage/frontend-plugin-api';
+import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
+import { ExtensionInput } from '@backstage/frontend-plugin-api';
 import { FieldExtensionComponentProps } from '@backstage/plugin-scaffolder-react';
 import { FieldExtensionOptions } from '@backstage/plugin-scaffolder-react';
 import { FieldSchema } from '@backstage/plugin-scaffolder-react';
@@ -75,6 +80,39 @@ export function createFormField<
   TUiOptions extends z.ZodType,
 >(opts: FormFieldExtensionData<TReturnValue, TUiOptions>): FormField;
 
+// @alpha
+export function createScaffolderFormDecorator<
+  TInputSchema extends {
+    [key in string]: (zImpl: typeof z) => z.ZodType;
+  } = {
+    [key in string]: (zImpl: typeof z) => z.ZodType;
+  },
+  TDeps extends {
+    [key in string]: AnyApiRef;
+  } = {
+    [key in string]: AnyApiRef;
+  },
+  TInput extends JsonObject = {
+    [key in keyof TInputSchema]: z.infer<ReturnType<TInputSchema[key]>>;
+  },
+>(options: {
+  id: string;
+  schema?: {
+    input?: TInputSchema;
+  };
+  deps?: TDeps;
+  decorator: (
+    ctx: ScaffolderFormDecoratorContext<TInput>,
+    deps: TDeps extends {
+      [key in string]: AnyApiRef;
+    }
+      ? {
+          [key in keyof TDeps]: TDeps[key]['T'];
+        }
+      : never,
+  ) => Promise<void>;
+}): ScaffolderFormDecorator<TInput>;
+
 // @alpha
 export const DefaultTemplateOutputs: (props: {
   output?: ScaffolderTaskOutput;
@@ -137,6 +175,34 @@ export type FormFieldExtensionData<
   schema?: FieldSchema<z.output<TReturnValue>, z.output<TUiOptions>>;
 };
 
+// @alpha (undocumented)
+export const formFieldsApi: ExtensionDefinition<{
+  config: {};
+  configInput: {};
+  output: ConfigurableExtensionDataRef<AnyApiFactory, 'core.api.factory', {}>;
+  inputs: {
+    formFields: ExtensionInput<
+      ConfigurableExtensionDataRef<
+        () => Promise<FormField>,
+        'scaffolder.form-field-loader',
+        {}
+      >,
+      {
+        singleton: false;
+        optional: false;
+      }
+    >;
+  };
+  kind: 'api';
+  name: 'form-fields';
+  params: {
+    factory: AnyApiFactory;
+  };
+}>;
+
+// @alpha (undocumented)
+export const formFieldsApiRef: ApiRef<ScaffolderFormFieldsApi>;
+
 // @alpha (undocumented)
 export type FormValidation = {
   [name: string]: FieldValidation | FormValidation;
@@ -190,6 +256,33 @@ export interface ScaffolderFieldProps {
   required?: boolean;
 }
 
+// @alpha (undocumented)
+export type ScaffolderFormDecorator<TInput extends JsonObject = JsonObject> = {
+  readonly $$type: '@backstage/scaffolder/FormDecorator';
+  readonly id: string;
+  readonly TInput: TInput;
+};
+
+// @alpha (undocumented)
+export type ScaffolderFormDecoratorContext<
+  TInput extends JsonObject = JsonObject,
+> = {
+  input: TInput;
+  formState: Record<string, JsonValue>;
+  setFormState: (
+    fn: (currentState: Record<string, JsonValue>) => Record<string, JsonValue>,
+  ) => void;
+  setSecrets: (
+    fn: (currentState: Record<string, string>) => Record<string, string>,
+  ) => void;
+};
+
+// @alpha (undocumented)
+export interface ScaffolderFormFieldsApi {
+  // (undocumented)
+  getFormFields(): Promise<FormFieldExtensionData[]>;
+}
+
 // @alpha (undocumented)
 export function ScaffolderPageContextMenu(
   props: ScaffolderPageContextMenuProps,
@@ -346,9 +439,9 @@ export const useFormDataFromQuery: (
 
 // @alpha (undocumented)
 export const useTemplateParameterSchema: (templateRef: string) => {
-  manifest: TemplateParameterSchema | undefined;
+  manifest?: TemplateParameterSchema | undefined;
   loading: boolean;
-  error: Error | undefined;
+  error?: Error | undefined;
 };
 
 // @alpha
diff --git a/plugins/scaffolder-react/report.api.md b/plugins/scaffolder-react/report.api.md
index 5523b52ad9..8a6b4739a4 100644
--- a/plugins/scaffolder-react/report.api.md
+++ b/plugins/scaffolder-react/report.api.md
@@ -214,7 +214,8 @@ export interface ScaffolderApi {
     context?: Record<string, string>;
   }): Promise<{
     results: {
-      title: string;
+      title?: string;
+      id: string;
     }[];
   }>;
   cancelTask(taskId: string): Promise<void>;
@@ -538,6 +539,10 @@ export type TemplateParameterSchema = {
     description?: string;
     schema: JsonObject;
   }>;
+  EXPERIMENTAL_formDecorators?: {
+    id: string;
+    input?: JsonObject;
+  }[];
 };
 
 // @public
diff --git a/plugins/scaffolder-react/src/api/types.ts b/plugins/scaffolder-react/src/api/types.ts
index bc37eed47e..8e4d989a55 100644
--- a/plugins/scaffolder-react/src/api/types.ts
+++ b/plugins/scaffolder-react/src/api/types.ts
@@ -245,5 +245,5 @@ export interface ScaffolderApi {
     provider: string;
     resource: string;
     context?: Record<string, string>;
-  }): Promise<{ results: { title: string }[] }>;
+  }): Promise<{ results: { title?: string; id: string }[] }>;
 }
diff --git a/plugins/scaffolder-react/src/extensions/index.tsx b/plugins/scaffolder-react/src/extensions/createScaffolderFieldExtension.tsx
similarity index 100%
rename from plugins/scaffolder-react/src/extensions/index.tsx
rename to plugins/scaffolder-react/src/extensions/createScaffolderFieldExtension.tsx
diff --git a/plugins/scaffolder-react/src/extensions/index.ts b/plugins/scaffolder-react/src/extensions/index.ts
new file mode 100644
index 0000000000..874fa607fb
--- /dev/null
+++ b/plugins/scaffolder-react/src/extensions/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './createScaffolderFieldExtension';
diff --git a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.test.tsx b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.test.tsx
new file mode 100644
index 0000000000..c21d43d6ff
--- /dev/null
+++ b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.test.tsx
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { PropsWithChildren } from 'react';
+import { createPlugin } from '@backstage/core-plugin-api';
+import { TestApiProvider, wrapInTestApp } from '@backstage/test-utils';
+import { renderHook, waitFor } from '@testing-library/react';
+import { ScaffolderFormFieldsApi, formFieldsApiRef } from '../alpha';
+import { useCustomFieldExtensions } from './useCustomFieldExtensions';
+import {
+  ScaffolderFieldExtensions,
+  createScaffolderFieldExtension,
+} from '../extensions';
+
+const plugin = createPlugin({
+  id: 'scaffolder',
+  apis: [],
+  routes: {},
+  externalRoutes: {},
+});
+
+describe('useCustomFieldExtensions', () => {
+  const mockFormFieldsApi: jest.Mocked<ScaffolderFormFieldsApi> = {
+    getFormFields: jest.fn(),
+  };
+  const wrapper = ({ children }: PropsWithChildren<{}>) =>
+    wrapInTestApp(
+      <TestApiProvider apis={[[formFieldsApiRef, mockFormFieldsApi]]}>
+        {children}
+      </TestApiProvider>,
+    );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should return field extensions from the React tree', async () => {
+    mockFormFieldsApi.getFormFields.mockResolvedValue([]);
+    const CustomFieldExtension = plugin.provide(
+      createScaffolderFieldExtension({
+        name: 'test',
+        component: () => <div>Test</div>,
+      }),
+    );
+
+    const { result } = renderHook(
+      () =>
+        useCustomFieldExtensions(
+          <ScaffolderFieldExtensions>
+            <CustomFieldExtension />
+          </ScaffolderFieldExtensions>,
+        ),
+      {
+        wrapper,
+      },
+    );
+
+    expect(result.current).toEqual([expect.objectContaining({ name: 'test' })]);
+  });
+
+  it('should return field extensions from formFieldsApi', async () => {
+    mockFormFieldsApi.getFormFields.mockResolvedValue([
+      {
+        name: 'blueprint',
+        component: () => <div>Test</div>,
+      },
+    ]);
+
+    const { result } = renderHook(() => useCustomFieldExtensions(<div />), {
+      wrapper,
+    });
+
+    await waitFor(() => {
+      expect(result.current.length).toBeGreaterThan(0);
+    });
+
+    expect(result.current).toEqual([
+      expect.objectContaining({ name: 'blueprint' }),
+    ]);
+  });
+
+  it('should return field extensions from both sources', async () => {
+    mockFormFieldsApi.getFormFields.mockResolvedValue([
+      {
+        name: 'blueprint',
+        component: () => <div>Test</div>,
+      },
+    ]);
+
+    const CustomFieldExtension = plugin.provide(
+      createScaffolderFieldExtension({
+        name: 'test',
+        component: () => <div>Test</div>,
+      }),
+    );
+
+    const { result } = renderHook(
+      () =>
+        useCustomFieldExtensions(
+          <ScaffolderFieldExtensions>
+            <CustomFieldExtension />
+          </ScaffolderFieldExtensions>,
+        ),
+      {
+        wrapper,
+      },
+    );
+
+    await waitFor(() => {
+      expect(result.current).toHaveLength(2);
+    });
+
+    const fieldNames = result.current.map(field => field.name);
+    expect(fieldNames).toEqual(expect.arrayContaining(['test', 'blueprint']));
+  });
+});
diff --git a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
index 7e0aafd53f..cd67b33753 100644
--- a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
+++ b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useElementFilter } from '@backstage/core-plugin-api';
+import { useAsync, useMountEffect } from '@react-hookz/web';
+import { useApiHolder, useElementFilter } from '@backstage/core-plugin-api';
+import { formFieldsApiRef } from '../next';
 import { FieldExtensionOptions } from '../extensions';
 import {
   FIELD_EXTENSION_KEY,
@@ -25,11 +27,22 @@ import {
  * @public
  */
 export const useCustomFieldExtensions = <
+  // todo(blam): this shouldn't be here, should remove this, but this is a breaking change to remove the generic.
   TComponentDataType = FieldExtensionOptions,
 >(
   outlet: React.ReactNode,
 ) => {
-  return useElementFilter(outlet, elements =>
+  // Get custom fields created with FormFieldBlueprint
+  const apiHolder = useApiHolder();
+  const formFieldsApi = apiHolder.get(formFieldsApiRef);
+  const [{ result: blueprintFields }, methods] = useAsync(
+    formFieldsApi?.getFormFields ?? (async () => []),
+    [],
+  );
+  useMountEffect(methods.execute);
+
+  // Get custom fields created with ScaffolderFieldExtensions
+  const outletFields = useElementFilter(outlet, elements =>
     elements
       .selectByComponentData({
         key: FIELD_EXTENSION_WRAPPER_KEY,
@@ -38,4 +51,18 @@ export const useCustomFieldExtensions = <
         key: FIELD_EXTENSION_KEY,
       }),
   );
+
+  // This should really be a different type moving foward, but we do this to keep type compatibility.
+  // should probably also move the defaults into the API eventually too, but that will come with the move
+  // to the new frontend system.
+  const blueprintsToLegacy: FieldExtensionOptions[] = blueprintFields?.map(
+    field => ({
+      component: field.component,
+      name: field.name,
+      validation: field.validation,
+      schema: field.schema?.schema,
+    }),
+  );
+
+  return [...blueprintsToLegacy, ...outletFields] as TComponentDataType[];
 };
diff --git a/plugins/scaffolder/src/alpha/api/FormFieldsApi.ts b/plugins/scaffolder-react/src/next/api/FormFieldsApi.ts
similarity index 95%
rename from plugins/scaffolder/src/alpha/api/FormFieldsApi.ts
rename to plugins/scaffolder-react/src/next/api/FormFieldsApi.ts
index 35141463d5..7712b91a18 100644
--- a/plugins/scaffolder/src/alpha/api/FormFieldsApi.ts
+++ b/plugins/scaffolder-react/src/next/api/FormFieldsApi.ts
@@ -21,7 +21,7 @@ import {
 } from '@backstage/frontend-plugin-api';
 import { formFieldsApiRef } from './ref';
 import { ScaffolderFormFieldsApi } from './types';
-import { FormFieldBlueprint } from '@backstage/plugin-scaffolder-react/alpha';
+import { FormFieldBlueprint } from '../blueprints';
 import { FormField, OpaqueFormField } from '@internal/scaffolder';
 
 class DefaultScaffolderFormFieldsApi implements ScaffolderFormFieldsApi {
@@ -40,6 +40,7 @@ class DefaultScaffolderFormFieldsApi implements ScaffolderFormFieldsApi {
   }
 }
 
+/** @alpha */
 export const formFieldsApi = ApiBlueprint.makeWithOverrides({
   name: 'form-fields',
   inputs: {
diff --git a/plugins/scaffolder-react/src/next/api/index.ts b/plugins/scaffolder-react/src/next/api/index.ts
new file mode 100644
index 0000000000..ecc62e5acf
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/api/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { formFieldsApi } from './FormFieldsApi';
+export { formFieldsApiRef } from './ref';
+export type { ScaffolderFormFieldsApi } from './types';
diff --git a/plugins/scaffolder-react/src/next/api/ref.ts b/plugins/scaffolder-react/src/next/api/ref.ts
new file mode 100644
index 0000000000..eaa6f49c21
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/api/ref.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createApiRef } from '@backstage/frontend-plugin-api';
+import { ScaffolderFormFieldsApi } from './types';
+
+/** @alpha */
+export const formFieldsApiRef = createApiRef<ScaffolderFormFieldsApi>({
+  id: 'plugin.scaffolder.form-fields',
+});
diff --git a/plugins/scaffolder-react/src/next/api/types.ts b/plugins/scaffolder-react/src/next/api/types.ts
new file mode 100644
index 0000000000..2c98111b1c
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/api/types.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { FormFieldExtensionData } from '../blueprints';
+
+/** @alpha */
+export interface ScaffolderFormFieldsApi {
+  getFormFields(): Promise<FormFieldExtensionData[]>;
+}
diff --git a/plugins/scaffolder-react/src/next/components/Form/DescriptionFieldTemplate.tsx b/plugins/scaffolder-react/src/next/components/Form/DescriptionFieldTemplate.tsx
index 7731cac3f8..5f12e0f1a3 100644
--- a/plugins/scaffolder-react/src/next/components/Form/DescriptionFieldTemplate.tsx
+++ b/plugins/scaffolder-react/src/next/components/Form/DescriptionFieldTemplate.tsx
@@ -56,6 +56,7 @@ export const DescriptionFieldTemplate = <
       return (
         <MarkdownContent
           content={description}
+          linkTarget="_blank"
           className={classes.markdownDescription}
         />
       );
diff --git a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
index 23b34123d1..38d83ae6fd 100644
--- a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
+++ b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
@@ -29,6 +29,7 @@ import MoreVert from '@material-ui/icons/MoreVert';
 import React, { useState } from 'react';
 import { usePermission } from '@backstage/plugin-permission-react';
 import { taskReadPermission } from '@backstage/plugin-scaffolder-common/alpha';
+import { templateManagementPermission } from '@backstage/plugin-scaffolder-common/alpha';
 
 const useStyles = makeStyles(theme => ({
   button: {
@@ -61,7 +62,16 @@ export function ScaffolderPageContextMenu(
     permission: taskReadPermission,
   });
 
-  if (!onEditorClicked && !onActionsClicked) {
+  const { allowed: canManageTemplates } = usePermission({
+    permission: templateManagementPermission,
+  });
+
+  if (
+    !onEditorClicked &&
+    !onActionsClicked &&
+    !onTasksClicked &&
+    !onCreateClicked
+  ) {
     return null;
   }
 
@@ -106,7 +116,7 @@ export function ScaffolderPageContextMenu(
               <ListItemText primary="Create" />
             </MenuItem>
           )}
-          {onEditorClicked && (
+          {onEditorClicked && canManageTemplates && (
             <MenuItem onClick={onEditorClicked}>
               <ListItemIcon>
                 <Edit fontSize="small" />
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 b2ec74c41a..5f3dfdfa1d 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -16,7 +16,7 @@
 import { renderInTestApp } from '@backstage/test-utils';
 import { JsonValue } from '@backstage/types';
 import { act, fireEvent, waitFor } from '@testing-library/react';
-import React from 'react';
+import React, { useEffect } from 'react';
 
 import { LayoutTemplate } from '../../../layouts';
 import { SecretsContextProvider } from '../../../secrets';
@@ -24,6 +24,7 @@ import { TemplateParameterSchema } from '../../../types';
 import { Stepper } from './Stepper';
 
 import type { RJSFValidationError } from '@rjsf/utils';
+import { FieldExtensionComponentProps } from '../../../extensions';
 
 describe('Stepper', () => {
   it('should render the step titles for each step of the manifest', async () => {
@@ -168,7 +169,9 @@ describe('Stepper', () => {
     );
   });
 
-  it('should omit properties that are no longer pertinent to the current step', async () => {
+  // This test is currently broken, and needs rethinking how we fix this.
+  // eslint-disable-next-line jest/no-disabled-tests
+  it.skip('should omit properties that are no longer pertinent to the current step', async () => {
     const manifest: TemplateParameterSchema = {
       title: 'Conditional Input Form',
       steps: [
@@ -714,4 +717,81 @@ describe('Stepper', () => {
       expect(getByRole('textbox', { name: 'field1' })).toBeInTheDocument();
     });
   });
+
+  describe('state tracking', () => {
+    it('should render perfectly when using field extensions that may do some strange things', async () => {
+      const FieldExtension = ({
+        formData,
+        onChange,
+      }: FieldExtensionComponentProps<{ repoOrg?: string }>) => {
+        useEffect(() => {
+          if (!formData?.repoOrg) onChange({ repoOrg: 'backstage' });
+        }, [formData, onChange]);
+
+        return (
+          <>
+            Some field
+            <input
+              type="text"
+              value={formData?.repoOrg ?? ''}
+              onChange={e => onChange({ repoOrg: e.target.value })}
+            />
+          </>
+        );
+      };
+
+      const manifest: TemplateParameterSchema = {
+        title: 'Custom Fields',
+        steps: [
+          {
+            title: 'Test',
+            schema: {
+              properties: {
+                thing: {
+                  type: 'object',
+                  'ui:field': 'FieldExtension',
+                  properties: {
+                    repoOrg: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      };
+
+      const onCreate = jest.fn();
+
+      const { getByRole } = await renderInTestApp(
+        <SecretsContextProvider>
+          <Stepper
+            manifest={manifest}
+            onCreate={onCreate}
+            extensions={[
+              {
+                name: 'FieldExtension',
+                component: FieldExtension,
+              },
+            ]}
+          />
+        </SecretsContextProvider>,
+      );
+
+      await act(async () => {
+        fireEvent.click(getByRole('button', { name: 'Review' }));
+      });
+
+      await act(async () => {
+        fireEvent.click(getByRole('button', { name: 'Create' }));
+      });
+
+      expect(onCreate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          thing: { repoOrg: 'backstage' },
+        }),
+      );
+    });
+  });
 });
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index 809291a9f7..0b4cbbc94a 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -124,11 +124,9 @@ export const Stepper = (stepperProps: StepperProps) => {
   const apiHolder = useApiHolder();
   const [activeStep, setActiveStep] = useState(0);
   const [isValidating, setIsValidating] = useState(false);
-
   const [initialState] = useFormDataFromQuery(props.initialState);
-  const [stepsState, setStepsState] = useState<Record<string, JsonValue>[]>(
-    steps.map(() => initialState),
-  );
+  const [stepsState, setStepsState] =
+    useState<Record<string, JsonValue>>(initialState);
 
   const [errors, setErrors] = useState<undefined | FormValidation>();
   const styles = useStyles();
@@ -163,71 +161,65 @@ export const Stepper = (stepperProps: StepperProps) => {
     });
   }, [steps, activeStep, validators, apiHolder]);
 
-  const handleBack = () => {
+  const handleBack = useCallback(() => {
     setActiveStep(prevActiveStep => prevActiveStep - 1);
-  };
-
-  const handleChange = (e: IChangeEvent) => {
-    setStepsState(current => {
-      const newState = [...current];
-      newState[activeStep] = {
-        ...e.formData,
-      };
-      return newState;
-    });
-  };
+  }, [setActiveStep]);
 
   const currentStep = useTransformSchemaToProps(steps[activeStep], { layouts });
 
-  const handleNext = async ({
-    formData = {},
-  }: {
-    formData?: Record<string, JsonValue>;
-  }) => {
-    // 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 {
-      setStepsState(current => {
-        const newState = [...current];
-        newState[activeStep] = {
-          ...formData,
-        };
-        return newState;
-      });
-      setErrors(undefined);
-      setActiveStep(prevActiveStep => {
-        const stepNum = prevActiveStep + 1;
-        analytics.captureEvent('click', `Next Step (${stepNum})`);
-        return stepNum;
-      });
-    }
-  };
-
   const {
     formContext: propFormContext,
     uiSchema: propUiSchema,
+    liveOmit: _shouldLiveOmit,
+    omitExtraData: _shouldOmitExtraData,
     ...restFormProps
   } = props.formProps ?? {};
 
+  const handleChange = useCallback(
+    (e: IChangeEvent) => {
+      setStepsState(current => {
+        return { ...current, ...e.formData };
+      });
+    },
+    [setStepsState],
+  );
+
+  const handleNext = useCallback(
+    async ({ formData = {} }: { formData?: Record<string, JsonValue> }) => {
+      // 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);
+
+      setStepsState(current => ({
+        ...current,
+        ...formData,
+      }));
+
+      setIsValidating(false);
+
+      if (hasErrors(returnedValidation)) {
+        setErrors(returnedValidation);
+      } else {
+        setErrors(undefined);
+        setActiveStep(prevActiveStep => {
+          const stepNum = prevActiveStep + 1;
+          analytics.captureEvent('click', `Next Step (${stepNum})`);
+          return stepNum;
+        });
+      }
+    },
+    [validation, analytics],
+  );
+
   const mergedUiSchema = merge({}, propUiSchema, currentStep?.uiSchema);
 
-  const formState = stepsState.reduce((acc, step) => {
-    return { ...acc, ...step };
-  }, {});
-
   const handleCreate = useCallback(() => {
-    props.onCreate(formState);
+    props.onCreate(stepsState);
     analytics.captureEvent('click', `${createLabel}`);
-  }, [props, formState, analytics, createLabel]);
+  }, [props, stepsState, analytics, createLabel]);
 
   return (
     <>
@@ -265,12 +257,10 @@ export const Stepper = (stepperProps: StepperProps) => {
             key={activeStep}
             validator={validator}
             extraErrors={errors as unknown as ErrorSchema}
-            formData={{ ...stepsState[activeStep] }}
-            formContext={{ ...propFormContext, formData: formState }}
+            formData={stepsState}
+            formContext={{ ...propFormContext, formData: stepsState }}
             schema={currentStep.schema}
             uiSchema={mergedUiSchema}
-            omitExtraData
-            liveOmit
             onSubmit={handleNext}
             fields={fields}
             showErrorList="top"
@@ -304,7 +294,7 @@ export const Stepper = (stepperProps: StepperProps) => {
         ReviewStepComponent ? (
           <ReviewStepComponent
             disableButtons={isValidating}
-            formData={formState}
+            formData={stepsState}
             handleBack={handleBack}
             handleReset={() => {}}
             steps={steps}
@@ -312,7 +302,7 @@ export const Stepper = (stepperProps: StepperProps) => {
           />
         ) : (
           <>
-            <ReviewStateComponent formState={formState} schemas={steps} />
+            <ReviewStateComponent formState={stepsState} schemas={steps} />
             <div className={styles.footer}>
               <Button
                 onClick={handleBack}
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
index 9afc18c438..31f5ac2881 100644
--- a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
+++ b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
@@ -121,6 +121,7 @@ export const Workflow = (workflowProps: WorkflowProps): JSX.Element | null => {
           subheader={
             <MarkdownContent
               className={styles.markdown}
+              linkTarget="_blank"
               content={
                 description ?? sortedManifest.description ?? 'No description'
               }
diff --git a/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.test.ts b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.test.ts
new file mode 100644
index 0000000000..d9bba3e34c
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createScaffolderFormDecorator } from './createScaffolderFormDecorator';
+
+describe('createScaffolderFormDecorator', () => {
+  it('should return a decorator', () => {
+    const decorator = createScaffolderFormDecorator({
+      id: 'test',
+      deps: {},
+      decorator: async () => {},
+    });
+
+    expect(decorator).toMatchInlineSnapshot(`
+      {
+        "$$type": "@backstage/scaffolder/FormDecorator",
+        "TInput": null,
+        "decorator": [Function],
+        "deps": {},
+        "id": "test",
+        "version": "v1",
+      }
+    `);
+  });
+
+  it('should allow passing schema and be typesafe', () => {
+    const decorator = createScaffolderFormDecorator({
+      id: 'test',
+      deps: {},
+      schema: {
+        input: {
+          name: z => z.string(),
+          age: z => z.number(),
+        },
+      },
+      decorator: async ctx => {
+        const name: string = ctx.input.name;
+
+        // @ts-expect-error
+        const number: string = ctx.input.age;
+
+        expect([name, number]).toBeDefined();
+      },
+    });
+
+    expect(decorator).toMatchInlineSnapshot(`
+      {
+        "$$type": "@backstage/scaffolder/FormDecorator",
+        "TInput": null,
+        "decorator": [Function],
+        "deps": {},
+        "id": "test",
+        "schema": {
+          "input": {
+            "age": [Function],
+            "name": [Function],
+          },
+        },
+        "version": "v1",
+      }
+    `);
+  });
+});
diff --git a/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts
new file mode 100644
index 0000000000..0064ae0397
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AnyApiRef } from '@backstage/core-plugin-api';
+import { JsonObject, JsonValue } from '@backstage/types';
+import { OpaqueFormDecorator } from '@internal/scaffolder';
+import { z } from 'zod';
+
+/** @alpha */
+export type ScaffolderFormDecoratorContext<
+  TInput extends JsonObject = JsonObject,
+> = {
+  input: TInput;
+  formState: Record<string, JsonValue>;
+
+  setFormState: (
+    fn: (currentState: Record<string, JsonValue>) => Record<string, JsonValue>,
+  ) => void;
+  setSecrets: (
+    fn: (currentState: Record<string, string>) => Record<string, string>,
+  ) => void;
+};
+
+/** @alpha */
+export type ScaffolderFormDecorator<TInput extends JsonObject = JsonObject> = {
+  readonly $$type: '@backstage/scaffolder/FormDecorator';
+  readonly id: string;
+  readonly TInput: TInput;
+};
+
+/**
+ * Method for creating decorators which can be used to collect
+ * secrets from the user before submitting to the backend.
+ * @alpha
+ */
+export function createScaffolderFormDecorator<
+  TInputSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType } = {
+    [key in string]: (zImpl: typeof z) => z.ZodType;
+  },
+  TDeps extends { [key in string]: AnyApiRef } = { [key in string]: AnyApiRef },
+  TInput extends JsonObject = {
+    [key in keyof TInputSchema]: z.infer<ReturnType<TInputSchema[key]>>;
+  },
+>(options: {
+  id: string;
+  schema?: {
+    input?: TInputSchema;
+  };
+  deps?: TDeps;
+  decorator: (
+    ctx: ScaffolderFormDecoratorContext<TInput>,
+    deps: TDeps extends { [key in string]: AnyApiRef }
+      ? { [key in keyof TDeps]: TDeps[key]['T'] }
+      : never,
+  ) => Promise<void>;
+}): ScaffolderFormDecorator<TInput> {
+  return OpaqueFormDecorator.createInstance('v1', {
+    ...options,
+    TInput: null as unknown as TInput,
+  } as {
+    id: string;
+    schema?: {
+      input?: TInputSchema;
+    };
+    TInput: TInput;
+    deps?: TDeps;
+    decorator: (
+      ctx: ScaffolderFormDecoratorContext,
+      deps: { [key in string]: AnyApiRef['T'] },
+    ) => Promise<void>;
+  });
+}
diff --git a/plugins/scaffolder-react/src/next/extensions/index.ts b/plugins/scaffolder-react/src/next/extensions/index.ts
new file mode 100644
index 0000000000..73bfa749f6
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/extensions/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './createScaffolderFormDecorator';
diff --git a/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts b/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts
index 4b4f21ae71..452e3a67a8 100644
--- a/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts
+++ b/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts
@@ -22,15 +22,21 @@ import { TemplateParameterSchema } from '@backstage/plugin-scaffolder-react';
 /**
  * @alpha
  */
-export const useTemplateParameterSchema = (templateRef: string) => {
+export const useTemplateParameterSchema = (
+  templateRef: string,
+): { manifest?: TemplateParameterSchema; loading: boolean; error?: Error } => {
   const scaffolderApi = useApi(scaffolderApiRef);
-  const { value, loading, error } = useAsync(
+  const {
+    value: manifest,
+    loading,
+    error,
+  } = useAsync(
     () => scaffolderApi.getTemplateParameterSchema(templateRef),
     [scaffolderApi, templateRef],
   );
 
   return {
-    manifest: value as TemplateParameterSchema | undefined,
+    manifest,
     loading,
     error,
   };
diff --git a/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts
index 1e714eb874..b3c8e83431 100644
--- a/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts
+++ b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { useMemo } from 'react';
 import { LayoutOptions } from '../../layouts';
 import { type ParsedTemplateSchema } from './useTemplateSchema';
 
@@ -28,24 +29,24 @@ export const useTransformSchemaToProps = (
   const objectFieldTemplate = step?.uiSchema['ui:ObjectFieldTemplate'] as
     | string
     | undefined;
+  return useMemo(() => {
+    if (typeof objectFieldTemplate !== 'string') {
+      return step;
+    }
 
-  if (typeof objectFieldTemplate !== 'string') {
-    return step;
-  }
+    const Layout = layouts.find(
+      layout => layout.name === objectFieldTemplate,
+    )?.component;
 
-  const Layout = layouts.find(
-    layout => layout.name === objectFieldTemplate,
-  )?.component;
-
-  if (!Layout) {
-    return step;
-  }
-
-  return {
-    ...step,
-    uiSchema: {
-      ...step.uiSchema,
-      ['ui:ObjectFieldTemplate']: Layout,
-    },
-  };
+    if (!Layout) {
+      return step;
+    }
+    return {
+      ...step,
+      uiSchema: {
+        ...step.uiSchema,
+        ['ui:ObjectFieldTemplate']: Layout,
+      },
+    };
+  }, [layouts, objectFieldTemplate, step]);
 };
diff --git a/plugins/scaffolder-react/src/next/index.ts b/plugins/scaffolder-react/src/next/index.ts
index 07f4565166..9c967a5db9 100644
--- a/plugins/scaffolder-react/src/next/index.ts
+++ b/plugins/scaffolder-react/src/next/index.ts
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './api';
 export * from './components';
 export * from './lib';
 export * from './hooks';
 export * from './overridableComponents';
 export * from './blueprints';
+export * from './extensions';
diff --git a/plugins/scaffolder-react/src/types.ts b/plugins/scaffolder-react/src/types.ts
index c1c26f32bb..5f557198c6 100644
--- a/plugins/scaffolder-react/src/types.ts
+++ b/plugins/scaffolder-react/src/types.ts
@@ -33,4 +33,5 @@ export type TemplateParameterSchema = {
     description?: string;
     schema: JsonObject;
   }>;
+  EXPERIMENTAL_formDecorators?: { id: string; input?: JsonObject }[];
 };
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index a448f8d10e..98f1eb2f0b 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,196 @@
 # @backstage/plugin-scaffolder
 
+## 1.27.2-next.2
+
+### Patch Changes
+
+- 184161f: Scaffolder field extensions registered with `FormFieldBlueprint` are now collected in the `useCustomFieldExtensions` hook, enabling them for use in the scaffolder.
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/plugin-scaffolder-react@1.14.2-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-react@0.4.29-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.1
+
+## 1.27.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-scaffolder-react@1.14.2-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+
+## 1.27.2-next.0
+
+### Patch Changes
+
+- 3c62a50: Experimental support for `formDecorators` to enable secret collection and mutations to the parameters for scaffolder tasks
+- c4ffd13: Added the autocomplete feature to GitlabRepoUrlPicker
+- 9951ba4: Updated dependency `@rjsf/utils` to `5.23.1`.
+  Updated dependency `@rjsf/core` to `5.23.1`.
+  Updated dependency `@rjsf/material-ui` to `5.23.1`.
+  Updated dependency `@rjsf/validator-ajv8` to `5.23.1`.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-scaffolder-common@1.5.8-next.0
+  - @backstage/plugin-scaffolder-react@1.14.2-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.27.0
+
+### Minor Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- 99471cd: fix(scaffolder): use `onInputChange` in `RepoUrlPicker` to fix issue with the value not updating properly
+- 8e4bed4: Updated dependency `idb-keyval` to `5.1.5`.
+- 7669af3: Revert the change of the option label for `EntityPicker`
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-scaffolder-react@1.14.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-scaffolder-common@1.5.7
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-react@0.4.28
+
+## 1.27.0-next.3
+
+### Minor Changes
+
+- f61d4cc: Add scaffolder permission `scaffolder.template.management` for accessing the template management features
+- 69fb6e7: Fix `contextMenu` not being disabled bug in new scaffolder pages
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.5.7-next.0
+  - @backstage/plugin-scaffolder-react@1.14.0-next.3
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+
+## 1.26.3-next.2
+
+### Patch Changes
+
+- 8e4bed4: Updated dependency `idb-keyval` to `5.1.5`.
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/plugin-scaffolder-react@1.13.3-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## 1.26.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-react@1.13.3-next.1
+
+## 1.26.2-next.0
+
+### Patch Changes
+
+- 99471cd: fix(scaffolder): use `onInputChange` in `RepoUrlPicker` to fix issue with the value not updating properly
+- 7669af3: Revert the change of the option label for `EntityPicker`
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.2-next.0
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-permission-react@0.4.27
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 1.26.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 3ed7050a8a..96f189506d 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "1.26.0",
+  "version": "1.27.2-next.2",
   "description": "The Backstage plugin that helps you create new things",
   "backstage": {
     "role": "frontend-plugin",
@@ -81,15 +81,15 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@react-hookz/web": "^24.0.0",
-    "@rjsf/core": "5.21.2",
-    "@rjsf/material-ui": "5.21.2",
-    "@rjsf/utils": "5.21.2",
-    "@rjsf/validator-ajv8": "5.21.2",
+    "@rjsf/core": "5.23.1",
+    "@rjsf/material-ui": "5.23.1",
+    "@rjsf/utils": "5.23.1",
+    "@rjsf/validator-ajv8": "5.23.1",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
     "git-url-parse": "^15.0.0",
     "humanize-duration": "^3.25.1",
-    "idb-keyval": "5.0.2",
+    "idb-keyval": "5.1.5",
     "json-schema": "^0.4.0",
     "json-schema-library": "^9.0.0",
     "jszip": "^3.10.1",
diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index 4253b2b914..e272b57655 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -7,12 +7,14 @@
 
 import { AnyApiFactory } from '@backstage/frontend-plugin-api';
 import { AnyRouteRefParams } from '@backstage/frontend-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExtensionInput } from '@backstage/frontend-plugin-api';
 import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
 import { FieldExtensionOptions } from '@backstage/plugin-scaffolder-react';
 import { FormField } from '@internal/scaffolder';
+import { formFieldsApiRef } from '@backstage/plugin-scaffolder-react/alpha';
 import type { FormProps as FormProps_2 } from '@rjsf/core';
 import { FormProps as FormProps_3 } from '@backstage/plugin-scaffolder-react';
 import { FrontendPlugin } from '@backstage/frontend-plugin-api';
@@ -23,6 +25,8 @@ import { PathParams } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { ReviewStepProps } from '@backstage/plugin-scaffolder-react';
 import { RouteRef } from '@backstage/frontend-plugin-api';
+import { ScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha';
+import { ScaffolderFormFieldsApi } from '@backstage/plugin-scaffolder-react/alpha';
 import { SubRouteRef } from '@backstage/frontend-plugin-api';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react';
@@ -49,9 +53,7 @@ const _default: FrontendPlugin<
     }>;
   },
   {
-    'api:scaffolder': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
+    'api:scaffolder/form-fields': ExtensionDefinition<{
       config: {};
       configInput: {};
       output: ConfigurableExtensionDataRef<
@@ -59,7 +61,21 @@ const _default: FrontendPlugin<
         'core.api.factory',
         {}
       >;
-      inputs: {};
+      inputs: {
+        formFields: ExtensionInput<
+          ConfigurableExtensionDataRef<
+            () => Promise<FormField>,
+            'scaffolder.form-field-loader',
+            {}
+          >,
+          {
+            singleton: false;
+            optional: false;
+          }
+        >;
+      };
+      kind: 'api';
+      name: 'form-fields';
       params: {
         factory: AnyApiFactory;
       };
@@ -126,7 +142,9 @@ const _default: FrontendPlugin<
         field: () => Promise<FormField>;
       };
     }>;
-    'api:scaffolder/form-fields': ExtensionDefinition<{
+    'api:scaffolder': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
       config: {};
       configInput: {};
       output: ConfigurableExtensionDataRef<
@@ -134,21 +152,7 @@ const _default: FrontendPlugin<
         'core.api.factory',
         {}
       >;
-      inputs: {
-        formFields: ExtensionInput<
-          ConfigurableExtensionDataRef<
-            () => Promise<FormField>,
-            'scaffolder.form-field-loader',
-            {}
-          >,
-          {
-            singleton: false;
-            optional: false;
-          }
-        >;
-      };
-      kind: 'api';
-      name: 'form-fields';
+      inputs: {};
       params: {
         factory: AnyApiFactory;
       };
@@ -157,6 +161,23 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
+// @alpha (undocumented)
+export class DefaultScaffolderFormDecoratorsApi
+  implements ScaffolderFormDecoratorsApi
+{
+  // (undocumented)
+  static create(options?: {
+    decorators: ScaffolderFormDecorator[];
+  }): DefaultScaffolderFormDecoratorsApi;
+  // (undocumented)
+  getFormDecorators(): Promise<ScaffolderFormDecorator[]>;
+}
+
+// @alpha (undocumented)
+export const formDecoratorsApiRef: ApiRef<ScaffolderFormDecoratorsApi>;
+
+export { formFieldsApiRef };
+
 // @alpha @deprecated
 export type FormProps = Pick<
   FormProps_2,
@@ -170,6 +191,14 @@ export type ScaffolderCustomFieldExplorerClassKey =
   | 'fieldForm'
   | 'preview';
 
+// @alpha (undocumented)
+export interface ScaffolderFormDecoratorsApi {
+  // (undocumented)
+  getFormDecorators(): Promise<ScaffolderFormDecorator[]>;
+}
+
+export { ScaffolderFormFieldsApi };
+
 // @public (undocumented)
 export type ScaffolderTemplateEditorClassKey =
   | 'root'
diff --git a/plugins/scaffolder/report.api.md b/plugins/scaffolder/report.api.md
index 8a1d3db179..453b482ce2 100644
--- a/plugins/scaffolder/report.api.md
+++ b/plugins/scaffolder/report.api.md
@@ -499,6 +499,7 @@ export type RouterProps = {
     editor?: boolean;
     actions?: boolean;
     tasks?: boolean;
+    create?: boolean;
   };
 };
 
@@ -530,7 +531,8 @@ export class ScaffolderClient implements ScaffolderApi_2 {
     context?: Record<string, string>;
   }): Promise<{
     results: {
-      title: string;
+      title?: string;
+      id: string;
     }[];
   }>;
   // (undocumented)
diff --git a/plugins/scaffolder/src/alpha/api.tsx b/plugins/scaffolder/src/alpha/api.tsx
deleted file mode 100644
index 06364cd6e9..0000000000
--- a/plugins/scaffolder/src/alpha/api.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {
-  ApiBlueprint,
-  createApiFactory,
-  discoveryApiRef,
-  fetchApiRef,
-  identityApiRef,
-} from '@backstage/frontend-plugin-api';
-import { scmIntegrationsApiRef } from '@backstage/integration-react';
-import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
-import { ScaffolderClient } from '../api';
-
-export const scaffolderApi = ApiBlueprint.make({
-  params: {
-    factory: createApiFactory({
-      api: scaffolderApiRef,
-      deps: {
-        discoveryApi: discoveryApiRef,
-        scmIntegrationsApi: scmIntegrationsApiRef,
-        fetchApi: fetchApiRef,
-        identityApi: identityApiRef,
-      },
-      factory: ({ discoveryApi, scmIntegrationsApi, fetchApi, identityApi }) =>
-        new ScaffolderClient({
-          discoveryApi,
-          scmIntegrationsApi,
-          fetchApi,
-          identityApi,
-        }),
-    }),
-  },
-});
diff --git a/plugins/scaffolder/src/alpha/api/FormDecoratorsApi.ts b/plugins/scaffolder/src/alpha/api/FormDecoratorsApi.ts
new file mode 100644
index 0000000000..13c4b6d1a2
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/api/FormDecoratorsApi.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ScaffolderFormDecoratorsApi } from './types';
+import { ScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha';
+
+/** @alpha */
+export class DefaultScaffolderFormDecoratorsApi
+  implements ScaffolderFormDecoratorsApi
+{
+  private constructor(
+    private readonly options: {
+      decorators: Array<ScaffolderFormDecorator>;
+    },
+  ) {}
+
+  static create(options?: { decorators: ScaffolderFormDecorator[] }) {
+    return new DefaultScaffolderFormDecoratorsApi(
+      options ?? { decorators: [] },
+    );
+  }
+
+  async getFormDecorators(): Promise<ScaffolderFormDecorator[]> {
+    return this.options.decorators;
+  }
+}
diff --git a/plugins/scaffolder/src/alpha/api/index.ts b/plugins/scaffolder/src/alpha/api/index.ts
index bbc30ef50b..07d4b65a3b 100644
--- a/plugins/scaffolder/src/alpha/api/index.ts
+++ b/plugins/scaffolder/src/alpha/api/index.ts
@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 
-export { formFieldsApiRef } from './ref';
-export type { ScaffolderFormFieldsApi } from './types';
+export { formDecoratorsApiRef } from './ref';
+export type { ScaffolderFormDecoratorsApi } from './types';
+export { DefaultScaffolderFormDecoratorsApi } from './FormDecoratorsApi';
diff --git a/plugins/scaffolder/src/alpha/api/ref.ts b/plugins/scaffolder/src/alpha/api/ref.ts
index 52bc44e674..532669d0ad 100644
--- a/plugins/scaffolder/src/alpha/api/ref.ts
+++ b/plugins/scaffolder/src/alpha/api/ref.ts
@@ -15,8 +15,9 @@
  */
 
 import { createApiRef } from '@backstage/frontend-plugin-api';
-import { ScaffolderFormFieldsApi } from './types';
+import { ScaffolderFormDecoratorsApi } from './types';
 
-export const formFieldsApiRef = createApiRef<ScaffolderFormFieldsApi>({
-  id: 'plugin.scaffolder.form-fields',
+/** @alpha */
+export const formDecoratorsApiRef = createApiRef<ScaffolderFormDecoratorsApi>({
+  id: 'plugin.scaffolder.form-decorators',
 });
diff --git a/plugins/scaffolder/src/alpha/api/types.ts b/plugins/scaffolder/src/alpha/api/types.ts
index 81f08b18e2..1d2d331adf 100644
--- a/plugins/scaffolder/src/alpha/api/types.ts
+++ b/plugins/scaffolder/src/alpha/api/types.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { FormFieldExtensionData } from '@backstage/plugin-scaffolder-react/alpha';
+import { ScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha';
 
-export interface ScaffolderFormFieldsApi {
-  getFormFields(): Promise<FormFieldExtensionData[]>;
+/** @alpha */
+export interface ScaffolderFormDecoratorsApi {
+  getFormDecorators(): Promise<ScaffolderFormDecorator[]>;
 }
diff --git a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
index 18211d185a..7d978e5c38 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
@@ -33,6 +33,8 @@ import { rootRouteRef } from '../../../routes';
 import { ANNOTATION_EDIT_URL } from '@backstage/catalog-model';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
+import { ScaffolderFormDecoratorsApi } from '../../api/types';
+import { formDecoratorsApiRef } from '../../api/ref';
 
 jest.mock('react-router-dom', () => {
   return {
@@ -55,11 +57,16 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   autocomplete: jest.fn(),
 };
 
+const scaffolderDecoratorsMock: jest.Mocked<ScaffolderFormDecoratorsApi> = {
+  getFormDecorators: jest.fn().mockResolvedValue([]),
+};
+
 const catalogApi = catalogApiMock.mock();
 const analyticsApi = mockApis.analytics();
 
 const apis = TestApiRegistry.from(
   [scaffolderApiRef, scaffolderApiMock],
+  [formDecoratorsApiRef, scaffolderDecoratorsMock],
   [catalogApiRef, catalogApi],
   [analyticsApiRef, analyticsApi],
   [catalogApiRef, catalogApi],
diff --git a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.tsx b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.tsx
index b5e24a7d52..2ed6de4479 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import React, { useState } from 'react';
 import { Navigate, useNavigate } from 'react-router-dom';
 import useAsync from 'react-use/esm/useAsync';
 import {
@@ -36,9 +36,12 @@ import {
 } from '@backstage/plugin-scaffolder-react';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 
-import { Workflow } from '@backstage/plugin-scaffolder-react/alpha';
+import {
+  Workflow,
+  useTemplateParameterSchema,
+} from '@backstage/plugin-scaffolder-react/alpha';
 import { JsonValue } from '@backstage/types';
-import { Header, Page } from '@backstage/core-components';
+import { Header, Page, Progress } from '@backstage/core-components';
 
 import {
   rootRouteRef,
@@ -49,6 +52,7 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { scaffolderTranslationRef } from '../../../translation';
 
 import { TemplateWizardPageContextMenu } from './TemplateWizardPageContextMenu';
+import { useFormDecorators } from '../../hooks';
 
 /**
  * @alpha
@@ -70,9 +74,10 @@ export type TemplateWizardPageProps = {
 export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
   const rootRef = useRouteRef(rootRouteRef);
   const taskRoute = useRouteRef(scaffolderTaskRouteRef);
-  const { secrets } = useTemplateSecrets();
+  const { secrets: contextSecrets } = useTemplateSecrets();
   const scaffolderApi = useApi(scaffolderApiRef);
   const catalogApi = useApi(catalogApiRef);
+  const [isCreating, setIsCreating] = useState(false);
   const navigate = useNavigate();
   const { templateName, namespace } = useRouteRefParams(
     selectedTemplateRouteRef,
@@ -85,12 +90,26 @@ export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
     name: templateName,
   });
 
+  const { manifest } = useTemplateParameterSchema(templateRef);
+  const decorators = useFormDecorators({ manifest });
+
   const { value: editUrl } = useAsync(async () => {
     const data = await catalogApi.getEntityByRef(templateRef);
     return data?.metadata.annotations?.[ANNOTATION_EDIT_URL];
   }, [templateRef, catalogApi]);
 
-  const onCreate = async (values: Record<string, JsonValue>) => {
+  const onCreate = async (initialValues: Record<string, JsonValue>) => {
+    if (isCreating) {
+      return;
+    }
+
+    setIsCreating(true);
+
+    const { formState: values, secrets } = await decorators.run({
+      formState: initialValues,
+      secrets: contextSecrets,
+    });
+
     const { taskId } = await scaffolderApi.scaffold({
       templateRef,
       values,
@@ -113,6 +132,7 @@ export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
         >
           <TemplateWizardPageContextMenu editUrl={editUrl} />
         </Header>
+        {isCreating && <Progress />}
         <Workflow
           namespace={namespace}
           templateName={templateName}
diff --git a/plugins/scaffolder/src/alpha/extensions.tsx b/plugins/scaffolder/src/alpha/extensions.tsx
index 191dcf407c..493b0d7114 100644
--- a/plugins/scaffolder/src/alpha/extensions.tsx
+++ b/plugins/scaffolder/src/alpha/extensions.tsx
@@ -21,11 +21,19 @@ import {
 import {
   NavItemBlueprint,
   PageBlueprint,
+  ApiBlueprint,
+  createApiFactory,
+  discoveryApiRef,
+  fetchApiRef,
+  identityApiRef,
 } from '@backstage/frontend-plugin-api';
 import React from 'react';
 import { rootRouteRef } from '../routes';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import { FormFieldBlueprint } from '@backstage/plugin-scaffolder-react/alpha';
+import { scmIntegrationsApiRef } from '@backstage/integration-react';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderClient } from '../api';
 
 export const scaffolderPage = PageBlueprint.make({
   params: {
@@ -50,3 +58,24 @@ export const repoUrlPickerFormField = FormFieldBlueprint.make({
     field: () => import('./fields/RepoUrlPicker').then(m => m.RepoUrlPicker),
   },
 });
+
+export const scaffolderApi = ApiBlueprint.make({
+  params: {
+    factory: createApiFactory({
+      api: scaffolderApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+        scmIntegrationsApi: scmIntegrationsApiRef,
+        fetchApi: fetchApiRef,
+        identityApi: identityApiRef,
+      },
+      factory: ({ discoveryApi, scmIntegrationsApi, fetchApi, identityApi }) =>
+        new ScaffolderClient({
+          discoveryApi,
+          scmIntegrationsApi,
+          fetchApi,
+          identityApi,
+        }),
+    }),
+  },
+});
diff --git a/plugins/scaffolder/src/alpha/hooks/index.ts b/plugins/scaffolder/src/alpha/hooks/index.ts
new file mode 100644
index 0000000000..fd9b0f7912
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/hooks/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './useFormDecorators';
diff --git a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx
new file mode 100644
index 0000000000..92475c3eea
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { DefaultScaffolderFormDecoratorsApi } from '../api/FormDecoratorsApi';
+import { createScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha';
+import { createApiRef, errorApiRef } from '@backstage/core-plugin-api';
+
+import { TestApiProvider } from '@backstage/test-utils';
+import { renderHook, waitFor } from '@testing-library/react';
+import { useFormDecorators } from './useFormDecorators';
+import React from 'react';
+import { formDecoratorsApiRef } from '../api/ref';
+import { TemplateParameterSchema } from '@backstage/plugin-scaffolder-react';
+
+describe('useFormDecorators', () => {
+  const mockApiRef = createApiRef<{
+    test: (input: string) => void;
+  }>({ id: 'test' });
+
+  const mockApiImplementation = { test: jest.fn() };
+
+  const mockDecorator = createScaffolderFormDecorator({
+    id: 'test',
+    deps: { mockApiRef },
+    schema: {
+      input: {
+        test: z => z.string(),
+      },
+    },
+    async decorator({ input: { test } }, { mockApiRef: mock }) {
+      mock.test(test);
+    },
+  });
+
+  const manifest: TemplateParameterSchema = {
+    EXPERIMENTAL_formDecorators: [{ id: 'test', input: { test: 'hello' } }],
+    steps: [],
+    title: 'test',
+  };
+
+  it('should run the form decorators for a given manifest with the correct input', async () => {
+    const renderedHook = renderHook(() => useFormDecorators({ manifest }), {
+      wrapper: ({ children }) => (
+        <TestApiProvider
+          apis={[
+            [mockApiRef, mockApiImplementation],
+            [
+              formDecoratorsApiRef,
+              DefaultScaffolderFormDecoratorsApi.create({
+                decorators: [mockDecorator],
+              }),
+            ],
+            [errorApiRef, { post: () => {} }],
+          ]}
+        >
+          {children}
+        </TestApiProvider>
+      ),
+    });
+
+    await waitFor(async () => {
+      const result = renderedHook.result.current!;
+
+      await result.run({
+        formState: {},
+        secrets: {},
+      });
+
+      expect(mockApiImplementation.test).toHaveBeenCalledWith('hello');
+    });
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts
new file mode 100644
index 0000000000..8469a89bec
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { errorApiRef, useApi, useApiHolder } from '@backstage/core-plugin-api';
+import { formDecoratorsApiRef } from '../api/ref';
+import useAsync from 'react-use/esm/useAsync';
+import { useMemo } from 'react';
+import { ScaffolderFormDecoratorContext } from '@backstage/plugin-scaffolder-react/alpha';
+import { OpaqueFormDecorator } from '@internal/scaffolder';
+import { TemplateParameterSchema } from '@backstage/plugin-scaffolder-react';
+import { JsonValue } from '@backstage/types';
+
+/** @internal */
+type BoundFieldDecorator = {
+  decorator: (ctx: ScaffolderFormDecoratorContext) => Promise<void>;
+};
+
+export const useFormDecorators = ({
+  manifest,
+}: {
+  manifest?: TemplateParameterSchema;
+}) => {
+  const formDecoratorsApi = useApi(formDecoratorsApiRef);
+  const errorApi = useApi(errorApiRef);
+  const { value: decorators } = useAsync(
+    () => formDecoratorsApi.getFormDecorators(),
+    [],
+  );
+  const apiHolder = useApiHolder();
+
+  const boundDecorators = useMemo(() => {
+    const decoratorsMap = new Map<string, BoundFieldDecorator>();
+
+    for (const decorator of decorators ?? []) {
+      try {
+        const { decorator: decoratorFn, deps } =
+          OpaqueFormDecorator.toInternal(decorator);
+
+        const resolvedDeps = Object.entries(deps ?? {}).map(([key, value]) => {
+          const api = apiHolder.get(value);
+          if (!api) {
+            throw new Error(
+              `Failed to resolve apiRef ${value.id} for form decorator ${decorator.id} it will be disabled`,
+            );
+          }
+          return [key, api];
+        });
+
+        decoratorsMap.set(decorator.id, {
+          decorator: ctx => decoratorFn(ctx, Object.fromEntries(resolvedDeps)),
+        });
+      } catch (ex) {
+        errorApi.post(ex);
+        return undefined;
+      }
+    }
+    return decoratorsMap;
+  }, [apiHolder, decorators, errorApi]);
+
+  return {
+    run: async (opts: {
+      formState: Record<string, JsonValue>;
+      secrets: Record<string, string>;
+    }) => {
+      let formState: Record<string, JsonValue> = { ...opts.formState };
+      let secrets: Record<string, string> = {};
+
+      if (manifest?.EXPERIMENTAL_formDecorators) {
+        // for each of the form decorators, go and call the decorator with the context
+        await Promise.all(
+          manifest.EXPERIMENTAL_formDecorators.map(async decorator => {
+            const formDecorator = boundDecorators?.get(decorator.id);
+            if (!formDecorator) {
+              errorApi.post(
+                new Error(`Failed to find form decorator ${decorator.id}`),
+              );
+              return;
+            }
+
+            await formDecorator.decorator({
+              setSecrets: (
+                handler: (
+                  oldState: Record<string, string>,
+                ) => Record<string, string>,
+              ) => {
+                secrets = { ...handler(secrets) };
+              },
+              setFormState: (
+                handler: (
+                  oldState: Record<string, JsonValue>,
+                ) => Record<string, JsonValue>,
+              ) => {
+                formState = { ...handler(formState) };
+              },
+              formState,
+              input: decorator.input ?? {},
+            });
+          }),
+        );
+      }
+
+      return { formState, secrets };
+    },
+  };
+};
diff --git a/plugins/scaffolder/src/alpha/index.ts b/plugins/scaffolder/src/alpha/index.ts
index bd3104a274..d239f44b4f 100644
--- a/plugins/scaffolder/src/alpha/index.ts
+++ b/plugins/scaffolder/src/alpha/index.ts
@@ -23,5 +23,11 @@ export {
 } from './components';
 
 export { scaffolderTranslationRef } from '../translation';
+export * from './api';
+
+export {
+  formFieldsApiRef,
+  type ScaffolderFormFieldsApi,
+} from '@backstage/plugin-scaffolder-react/alpha';
 
 export { default } from './plugin';
diff --git a/plugins/scaffolder/src/alpha/plugin.tsx b/plugins/scaffolder/src/alpha/plugin.tsx
index 54e375e875..44ec1f5d4c 100644
--- a/plugins/scaffolder/src/alpha/plugin.tsx
+++ b/plugins/scaffolder/src/alpha/plugin.tsx
@@ -26,13 +26,13 @@ import {
   selectedTemplateRouteRef,
   viewTechDocRouteRef,
 } from '../routes';
-import { scaffolderApi } from './api';
 import {
   repoUrlPickerFormField,
   scaffolderNavItem,
   scaffolderPage,
+  scaffolderApi,
 } from './extensions';
-import { formFieldsApi } from './api/FormFieldsApi';
+import { formFieldsApi } from '@backstage/plugin-scaffolder-react/alpha';
 
 /** @alpha */
 export default createFrontendPlugin({
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index df032b536d..01e163bb30 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -22,10 +22,6 @@ import {
 } from '@backstage/core-plugin-api';
 import { ResponseError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
-import { Observable } from '@backstage/types';
-import qs from 'qs';
-import queryString from 'qs';
-import ObservableImpl from 'zen-observable';
 import {
   ListActionsResponse,
   LogEvent,
@@ -40,10 +36,13 @@ import {
   ScaffolderTask,
   TemplateParameterSchema,
 } from '@backstage/plugin-scaffolder-react';
+import { Observable } from '@backstage/types';
 import {
   EventSourceMessage,
   fetchEventSource,
 } from '@microsoft/fetch-event-source';
+import { default as qs, default as queryString } from 'qs';
+import ObservableImpl from 'zen-observable';
 
 /**
  * An API to interact with the scaffolder backend.
@@ -365,7 +364,7 @@ export class ScaffolderClient implements ScaffolderApi {
     provider: string;
     resource: string;
     context?: Record<string, string>;
-  }): Promise<{ results: { title: string }[] }> {
+  }): Promise<{ results: { title?: string; id: string }[] }> {
     const baseUrl = await this.discoveryApi.getBaseUrl('scaffolder');
 
     const url = `${baseUrl}/v2/autocomplete/${provider}/${resource}`;
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
index 539a5697d3..f85c1f0e6b 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
@@ -407,7 +407,16 @@ export const ActionPageContent = () => {
     </>
   );
 };
-export const ActionsPage = () => {
+
+export type ActionsPageProps = {
+  contextMenu?: {
+    editor?: boolean;
+    tasks?: boolean;
+    create?: boolean;
+  };
+};
+
+export const ActionsPage = (props: ActionsPageProps) => {
   const navigate = useNavigate();
   const editorLink = useRouteRef(editRouteRef);
   const tasksLink = useRouteRef(scaffolderListTaskRouteRef);
@@ -415,10 +424,19 @@ export const ActionsPage = () => {
   const { t } = useTranslationRef(scaffolderTranslationRef);
 
   const scaffolderPageContextMenuProps = {
-    onEditorClicked: () => navigate(editorLink()),
+    onEditorClicked:
+      props?.contextMenu?.editor !== false
+        ? () => navigate(editorLink())
+        : undefined,
     onActionsClicked: undefined,
-    onTasksClicked: () => navigate(tasksLink()),
-    onCreateClicked: () => navigate(createLink()),
+    onTasksClicked:
+      props?.contextMenu?.tasks !== false
+        ? () => navigate(tasksLink())
+        : undefined,
+    onCreateClicked:
+      props?.contextMenu?.create !== false
+        ? () => navigate(createLink())
+        : undefined,
   };
 
   return (
diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
index b07d7c7fd3..26c8d8c36f 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
@@ -46,6 +46,11 @@ import { scaffolderTranslationRef } from '../../translation';
 
 export interface MyTaskPageProps {
   initiallySelectedFilter?: 'owned' | 'all';
+  contextMenu?: {
+    editor?: boolean;
+    actions?: boolean;
+    create?: boolean;
+  };
 }
 
 const ListTaskPageContent = (props: MyTaskPageProps) => {
@@ -161,10 +166,19 @@ export const ListTasksPage = (props: MyTaskPageProps) => {
   const { t } = useTranslationRef(scaffolderTranslationRef);
 
   const scaffolderPageContextMenuProps = {
-    onEditorClicked: () => navigate(editorLink()),
-    onActionsClicked: () => navigate(actionsLink()),
+    onEditorClicked:
+      props?.contextMenu?.editor !== false
+        ? () => navigate(editorLink())
+        : undefined,
+    onActionsClicked:
+      props?.contextMenu?.actions !== false
+        ? () => navigate(actionsLink())
+        : undefined,
     onTasksClicked: undefined,
-    onCreateClicked: () => navigate(createLink()),
+    onCreateClicked:
+      props?.contextMenu?.create !== false
+        ? () => navigate(createLink())
+        : undefined,
   };
   return (
     <Page themeId="home">
diff --git a/plugins/scaffolder/src/components/Router/Router.tsx b/plugins/scaffolder/src/components/Router/Router.tsx
index 1121fd2766..6c06322867 100644
--- a/plugins/scaffolder/src/components/Router/Router.tsx
+++ b/plugins/scaffolder/src/components/Router/Router.tsx
@@ -60,7 +60,10 @@ import {
   CustomFieldsPage,
 } from '../../alpha/components/TemplateEditorPage';
 import { RequirePermission } from '@backstage/plugin-permission-react';
-import { taskReadPermission } from '@backstage/plugin-scaffolder-common/alpha';
+import {
+  taskReadPermission,
+  templateManagementPermission,
+} from '@backstage/plugin-scaffolder-common/alpha';
 
 /**
  * The Props for the Scaffolder Router
@@ -96,6 +99,8 @@ export type RouterProps = {
     actions?: boolean;
     /** Whether to show a link to the tasks page */
     tasks?: boolean;
+    /** Whether to show a link to the create page (on /create subroutes) */
+    create?: boolean;
   };
 };
 
@@ -174,51 +179,62 @@ export const Router = (props: PropsWithChildren<RouterProps>) => {
       <Route
         path={editRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateIntroPage />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateIntroPage />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route
         path={customFieldsRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <CustomFieldsPage fieldExtensions={fieldExtensions} />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <CustomFieldsPage fieldExtensions={fieldExtensions} />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route
         path={templateFormRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateFormPage
-              layouts={customLayouts}
-              formProps={props.formProps}
-              fieldExtensions={fieldExtensions}
-            />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateFormPage
+                layouts={customLayouts}
+                formProps={props.formProps}
+                fieldExtensions={fieldExtensions}
+              />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
 
-      <Route path={actionsRouteRef.path} element={<ActionsPage />} />
+      <Route
+        path={actionsRouteRef.path}
+        element={<ActionsPage contextMenu={props.contextMenu} />}
+      />
       <Route
         path={scaffolderListTaskRouteRef.path}
         element={
           <RequirePermission permission={taskReadPermission}>
-            <ListTasksPage />
+            <ListTasksPage contextMenu={props.contextMenu} />
           </RequirePermission>
         }
       />
       <Route
         path={editorRouteRef.path}
         element={
-          <SecretsContextProvider>
-            <TemplateEditorPage
-              layouts={customLayouts}
-              formProps={props.formProps}
-              fieldExtensions={fieldExtensions}
-            />
-          </SecretsContextProvider>
+          <RequirePermission permission={templateManagementPermission}>
+            <SecretsContextProvider>
+              <TemplateEditorPage
+                layouts={customLayouts}
+                formProps={props.formProps}
+                fieldExtensions={fieldExtensions}
+              />
+            </SecretsContextProvider>
+          </RequirePermission>
         }
       />
       <Route
diff --git a/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx b/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
index 26853d6d05..aa3b0e0c20 100644
--- a/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoBranchPicker/BitbucketRepoBranchPicker.tsx
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+import { useApi } from '@backstage/core-plugin-api';
 import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import FormControl from '@material-ui/core/FormControl';
-import React, { useCallback, useState } from 'react';
+import FormHelperText from '@material-ui/core/FormHelperText';
 import TextField from '@material-ui/core/TextField';
 import Autocomplete from '@material-ui/lab/Autocomplete';
+import React, { useCallback, useState } from 'react';
 import useDebounce from 'react-use/esm/useDebounce';
-import { useApi } from '@backstage/core-plugin-api';
 import { BaseRepoBranchPickerProps } from './types';
-import FormHelperText from '@material-ui/core/FormHelperText';
 
 /**
  * The underlying component that is rendered in the form for the `BitbucketRepoBranchPicker`
@@ -66,7 +66,7 @@ export const BitbucketRepoBranchPicker = ({
         provider: 'bitbucket-cloud',
       })
       .then(({ results }) => {
-        setAvailableBranches(results.map(r => r.title));
+        setAvailableBranches(results.map(r => r.title!));
       })
       .catch(() => {
         setAvailableBranches([]);
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
index 05d04886e4..af3952ff51 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { BitbucketRepoPicker } from './BitbucketRepoPicker';
-import { fireEvent, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import {
   ScaffolderApi,
   scaffolderApiRef,
 } from '@backstage/plugin-scaffolder-react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { fireEvent, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
 import { act } from 'react-dom/test-utils';
+import { BitbucketRepoPicker } from './BitbucketRepoPicker';
 
 describe('BitbucketRepoPicker', () => {
   const scaffolderApiMock: Partial<ScaffolderApi> = {
     autocomplete: jest.fn().mockImplementation(opts =>
       Promise.resolve({
-        results: [{ title: `${opts.resource}_example` }],
+        results: [{ id: `${opts.resource}_example` }],
       }),
     ),
   };
@@ -266,7 +266,7 @@ describe('BitbucketRepoPicker', () => {
       // Verify that the available repos are updated
       await waitFor(() =>
         expect(onChange).toHaveBeenCalledWith({
-          availableRepos: ['repositories_example'],
+          availableRepos: [{ name: 'repositories_example' }],
         }),
       );
     });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
index 28cd0cf5bc..45a6439a63 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useCallback, useEffect, useState } from 'react';
+import { Select, SelectItem } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
-import { Select, SelectItem } from '@backstage/core-components';
-import { BaseRepoUrlPickerProps } from './types';
-import Autocomplete from '@material-ui/lab/Autocomplete';
 import TextField from '@material-ui/core/TextField';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import React, { useCallback, useEffect, useState } from 'react';
 import useDebounce from 'react-use/esm/useDebounce';
-import { useApi } from '@backstage/core-plugin-api';
-import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
-import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { scaffolderTranslationRef } from '../../../translation';
+import { BaseRepoUrlPickerProps } from './types';
 
 /**
  * The underlying component that is rendered in the form for the `BitbucketRepoPicker`
@@ -89,7 +89,7 @@ export const BitbucketRepoPicker = (
         provider: 'bitbucket-cloud',
       })
       .then(({ results }) => {
-        setAvailableWorkspaces(results.map(r => r.title));
+        setAvailableWorkspaces(results.map(r => r.id));
       })
       .catch(() => {
         setAvailableWorkspaces([]);
@@ -118,7 +118,7 @@ export const BitbucketRepoPicker = (
         provider: 'bitbucket-cloud',
       })
       .then(({ results }) => {
-        setAvailableProjects(results.map(r => r.title));
+        setAvailableProjects(results.map(r => r.id));
       })
       .catch(() => {
         setAvailableProjects([]);
@@ -148,7 +148,11 @@ export const BitbucketRepoPicker = (
         provider: 'bitbucket-cloud',
       })
       .then(({ results }) => {
-        onChange({ availableRepos: results.map(r => r.title) });
+        onChange({
+          availableRepos: results.map(r => {
+            return { name: r.id };
+          }),
+        });
       })
       .catch(() => {
         onChange({ availableRepos: [] });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
index f3d6e2da91..a8fb42cae3 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
@@ -14,22 +14,36 @@
  * limitations under the License.
  */
 
+import {
+  ScaffolderApi,
+  scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { fireEvent } from '@testing-library/react';
 import React from 'react';
 import { GitlabRepoPicker } from './GitlabRepoPicker';
-import { fireEvent } from '@testing-library/react';
-import { renderInTestApp } from '@backstage/test-utils';
 
 describe('GitlabRepoPicker', () => {
+  const scaffolderApiMock: Partial<ScaffolderApi> = {
+    autocomplete: jest.fn().mockImplementation(opts =>
+      Promise.resolve({
+        results: [{ title: `${opts.resource}_example` }],
+      }),
+    ),
+  };
   describe('owner field', () => {
     it('renders a select if there is a list of allowed owners', async () => {
       const allowedOwners = ['owner1', 'owner2'];
       const { findByText } = await renderInTestApp(
-        <GitlabRepoPicker
-          onChange={jest.fn()}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-          allowedOwners={allowedOwners}
-        />,
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={jest.fn()}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+            allowedOwners={allowedOwners}
+          />
+          ,
+        </TestApiProvider>,
       );
 
       expect(await findByText('owner1')).toBeInTheDocument();
@@ -40,12 +54,15 @@ describe('GitlabRepoPicker', () => {
       const onChange = jest.fn();
       const allowedOwners = ['owner1', 'owner2'];
       const { getByRole } = await renderInTestApp(
-        <GitlabRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-          allowedOwners={allowedOwners}
-        />,
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={onChange}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+            allowedOwners={allowedOwners}
+          />
+          ,
+        </TestApiProvider>,
       );
 
       await fireEvent.change(getByRole('combobox'), {
@@ -59,12 +76,15 @@ describe('GitlabRepoPicker', () => {
       const onChange = jest.fn();
       const allowedOwners = ['owner1'];
       const { getByRole } = await renderInTestApp(
-        <GitlabRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-          allowedOwners={allowedOwners}
-        />,
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={onChange}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+            allowedOwners={allowedOwners}
+          />
+          ,
+        </TestApiProvider>,
       );
 
       expect(getByRole('combobox')).toBeDisabled();
@@ -73,14 +93,20 @@ describe('GitlabRepoPicker', () => {
     it('should display free text if no allowed owners are passed', async () => {
       const onChange = jest.fn();
       const { getAllByRole } = await renderInTestApp(
-        <GitlabRepoPicker
-          onChange={onChange}
-          rawErrors={[]}
-          state={{ repoName: 'repo' }}
-        />,
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={onChange}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+          />
+        </TestApiProvider>,
       );
       const ownerField = getAllByRole('textbox')[0];
-      fireEvent.change(ownerField, { target: { value: 'my-mock-owner' } });
+      ownerField.focus();
+      fireEvent.change(ownerField, {
+        target: { value: 'my-mock-owner' },
+      });
+      ownerField.blur();
 
       expect(onChange).toHaveBeenCalledWith({ owner: 'my-mock-owner' });
     });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index c0879008a1..d97c9431ee 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
@@ -13,28 +13,101 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import { Select, SelectItem } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import TextField from '@material-ui/core/TextField';
-import { Select, SelectItem } from '@backstage/core-components';
-import { BaseRepoUrlPickerProps } from './types';
-import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import React, { useCallback, useState } from 'react';
+import useDebounce from 'react-use/esm/useDebounce';
 import { scaffolderTranslationRef } from '../../../translation';
+import { BaseRepoUrlPickerProps } from './types';
 
 export const GitlabRepoPicker = (
   props: BaseRepoUrlPickerProps<{
     allowedOwners?: string[];
     allowedRepos?: string[];
+    accessToken?: string;
   }>,
 ) => {
-  const { allowedOwners = [], state, onChange, rawErrors } = props;
+  const { allowedOwners = [], state, onChange, rawErrors, accessToken } = props;
+  const [availableGroups, setAvailableGroups] = useState<
+    { title: string; id: string }[]
+  >([]);
   const { t } = useTranslationRef(scaffolderTranslationRef);
   const ownerItems: SelectItem[] = allowedOwners
     ? allowedOwners.map(i => ({ label: i, value: i }))
     : [{ label: 'Loading...', value: 'loading' }];
 
-  const { owner } = state;
+  const { owner, host } = state;
+
+  const scaffolderApi = useApi(scaffolderApiRef);
+
+  const updateAvailableGroups = useCallback(() => {
+    if (!scaffolderApi.autocomplete || !accessToken || !host) {
+      setAvailableGroups([]);
+      return;
+    }
+
+    scaffolderApi
+      .autocomplete({
+        token: accessToken,
+        resource: 'groups',
+        provider: 'gitlab',
+        context: { host },
+      })
+      .then(({ results }) => {
+        setAvailableGroups(
+          results.map(r => {
+            return {
+              title: r.title!,
+              id: r.id,
+            };
+          }),
+        );
+      })
+      .catch(() => {
+        setAvailableGroups([]);
+      });
+  }, [scaffolderApi, accessToken, host]);
+
+  useDebounce(updateAvailableGroups, 500, [updateAvailableGroups]);
+
+  // Update available repositories when client is available and group changes
+  const updateAvailableRepositories = useCallback(() => {
+    if (!scaffolderApi.autocomplete || !accessToken || !host || !owner) {
+      onChange({ availableRepos: [] });
+      return;
+    }
+
+    const selectedGroup = availableGroups.find(group => group.title === owner);
+
+    scaffolderApi
+      .autocomplete({
+        token: accessToken,
+        resource: 'repositories',
+        context: {
+          id: selectedGroup?.id ?? '',
+          host,
+        },
+        provider: 'gitlab',
+      })
+      .then(({ results }) => {
+        onChange({
+          availableRepos: results.map(r => {
+            return { name: r.title!, id: r.id };
+          }),
+        });
+      })
+      .catch(() => {
+        onChange({ availableRepos: [] });
+      });
+  }, [scaffolderApi, accessToken, host, owner, onChange, availableGroups]);
+
+  useDebounce(updateAvailableRepositories, 500, [updateAvailableRepositories]);
 
   return (
     <>
@@ -64,12 +137,21 @@ export const GitlabRepoPicker = (
             </FormHelperText>
           </>
         ) : (
-          <TextField
-            id="ownerInput"
-            label={t('fields.gitlabRepoPicker.owner.inputTitle')}
-            onChange={e => onChange({ owner: e.target.value })}
-            helperText={t('fields.gitlabRepoPicker.owner.description')}
+          <Autocomplete
             value={owner}
+            onChange={(_, newValue) => {
+              onChange({ owner: newValue || '' });
+            }}
+            options={availableGroups.map(group => group.title)}
+            renderInput={params => (
+              <TextField
+                {...params}
+                label={t('fields.gitlabRepoPicker.owner.title')}
+                required
+              />
+            )}
+            freeSolo
+            autoSelect
           />
         )}
       </FormControl>
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index 3c9ca9c2ca..18da234012 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -15,26 +15,26 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import {
-  scmIntegrationsApiRef,
   scmAuthApiRef,
+  scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import React, { useEffect, useState, useMemo, useCallback } from 'react';
-import { GithubRepoPicker } from './GithubRepoPicker';
-import { GiteaRepoPicker } from './GiteaRepoPicker';
-import { GitlabRepoPicker } from './GitlabRepoPicker';
-import { AzureRepoPicker } from './AzureRepoPicker';
-import { BitbucketRepoPicker } from './BitbucketRepoPicker';
-import { GerritRepoPicker } from './GerritRepoPicker';
-import { RepoUrlPickerHost } from './RepoUrlPickerHost';
-import { RepoUrlPickerRepoName } from './RepoUrlPickerRepoName';
-import { parseRepoPickerUrl, serializeRepoPickerUrl } from './utils';
-import { RepoUrlPickerFieldSchema } from './schema';
-import { RepoUrlPickerState } from './types';
-import useDebounce from 'react-use/esm/useDebounce';
 import { useTemplateSecrets } from '@backstage/plugin-scaffolder-react';
 import Box from '@material-ui/core/Box';
 import Divider from '@material-ui/core/Divider';
 import Typography from '@material-ui/core/Typography';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import useDebounce from 'react-use/esm/useDebounce';
+import { AzureRepoPicker } from './AzureRepoPicker';
+import { BitbucketRepoPicker } from './BitbucketRepoPicker';
+import { GerritRepoPicker } from './GerritRepoPicker';
+import { GiteaRepoPicker } from './GiteaRepoPicker';
+import { GithubRepoPicker } from './GithubRepoPicker';
+import { GitlabRepoPicker } from './GitlabRepoPicker';
+import { RepoUrlPickerHost } from './RepoUrlPickerHost';
+import { RepoUrlPickerRepoName } from './RepoUrlPickerRepoName';
+import { RepoUrlPickerFieldSchema } from './schema';
+import { RepoUrlPickerState } from './types';
+import { parseRepoPickerUrl, serializeRepoPickerUrl } from './utils';
 
 export { RepoUrlPickerSchema } from './schema';
 
@@ -203,6 +203,10 @@ export const RepoUrlPicker = (
           rawErrors={rawErrors}
           state={state}
           onChange={updateLocalState}
+          accessToken={
+            uiSchema?.['ui:options']?.requestUserCredentials?.secretsKey &&
+            secrets[uiSchema['ui:options'].requestUserCredentials.secretsKey]
+          }
         />
       )}
       {hostType === 'bitbucket' && (
@@ -238,7 +242,11 @@ export const RepoUrlPicker = (
         repoName={state.repoName}
         allowedRepos={allowedRepos}
         onChange={repo =>
-          setState(prevState => ({ ...prevState, repoName: repo }))
+          setState(prevState => ({
+            ...prevState,
+            repoName: repo.name,
+            id: repo.id || '',
+          }))
         }
         rawErrors={rawErrors}
         availableRepos={state.availableRepos}
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
index ec4853c714..f78abc2dfb 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
-import { RepoUrlPickerRepoName } from './RepoUrlPickerRepoName';
+import { renderInTestApp } from '@backstage/test-utils';
 import { fireEvent } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { renderInTestApp } from '@backstage/test-utils';
+import { RepoUrlPickerRepoName } from './RepoUrlPickerRepoName';
 
 describe('RepoUrlPickerRepoName', () => {
   it('should call onChange with the first allowed repo if there is none set already', async () => {
@@ -32,7 +32,7 @@ describe('RepoUrlPickerRepoName', () => {
       />,
     );
 
-    expect(onChange).toHaveBeenCalledWith('foo');
+    expect(onChange).toHaveBeenCalledWith({ name: 'foo' });
   });
 
   it('should render a dropdown of all the options', async () => {
@@ -78,11 +78,11 @@ describe('RepoUrlPickerRepoName', () => {
       textArea.blur();
     });
 
-    expect(onChange).toHaveBeenCalledWith('foo');
+    expect(onChange).toHaveBeenCalledWith({ name: 'foo' });
   });
 
   it('should autocomplete with provided availableRepos', async () => {
-    const availableRepos = ['foo', 'bar'];
+    const availableRepos = [{ name: 'foo' }, { name: 'bar' }];
 
     const onChange = jest.fn();
 
@@ -100,11 +100,11 @@ describe('RepoUrlPickerRepoName', () => {
 
     // Verify that available repos are shown
     for (const repo of availableRepos) {
-      expect(getByText(repo)).toBeInTheDocument();
+      expect(getByText(repo.name)).toBeInTheDocument();
     }
 
     // Verify that selecting an option calls onChange
-    await userEvent.click(getByText(availableRepos[0]));
+    await userEvent.click(getByText(availableRepos[0].name));
     expect(onChange).toHaveBeenCalledWith(availableRepos[0]);
   });
 });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
index 9c63140d1c..d23a4bcd86 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useEffect } from 'react';
 import { Select, SelectItem } from '@backstage/core-components';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
-import Autocomplete from '@material-ui/lab/Autocomplete';
 import TextField from '@material-ui/core/TextField';
-import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import React, { useEffect } from 'react';
 import { scaffolderTranslationRef } from '../../../translation';
+import { AvailableRepositories } from './types';
 
 export const RepoUrlPickerRepoName = (props: {
   repoName?: string;
   allowedRepos?: string[];
-  onChange: (host: string) => void;
+  onChange: (chosenRepo: AvailableRepositories) => void;
   rawErrors: string[];
-  availableRepos?: string[];
+  availableRepos?: AvailableRepositories[];
 }) => {
   const { repoName, allowedRepos, onChange, rawErrors, availableRepos } = props;
   const { t } = useTranslationRef(scaffolderTranslationRef);
@@ -37,7 +38,7 @@ export const RepoUrlPickerRepoName = (props: {
     if (!repoName) {
       // Set the first of the allowedRepos option if that available
       if (allowedRepos?.length) {
-        onChange(allowedRepos[0]);
+        onChange({ name: allowedRepos[0] });
       }
     }
   }, [allowedRepos, repoName, onChange]);
@@ -58,7 +59,9 @@ export const RepoUrlPickerRepoName = (props: {
             native
             label={t('fields.repoUrlPicker.repository.title')}
             onChange={selected =>
-              onChange(String(Array.isArray(selected) ? selected[0] : selected))
+              onChange({
+                name: String(Array.isArray(selected) ? selected[0] : selected),
+              })
             }
             disabled={allowedRepos.length === 1}
             selected={repoName}
@@ -67,10 +70,13 @@ export const RepoUrlPickerRepoName = (props: {
         ) : (
           <Autocomplete
             value={repoName}
-            onChange={(_, newValue) => {
-              onChange(newValue || '');
+            onInputChange={(_, newValue) => {
+              const selectedRepo = availableRepos?.find(
+                r => r.name === newValue,
+              );
+              onChange(selectedRepo || { name: newValue || '' });
             }}
-            options={availableRepos || []}
+            options={(availableRepos || []).map(r => r.name)}
             renderInput={params => (
               <TextField
                 {...params}
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
index 9489901d61..d37e764eae 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
@@ -13,6 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export interface AvailableRepositories {
+  name: string;
+  id?: string;
+}
+
 export interface RepoUrlPickerState {
   host?: string;
   owner?: string;
@@ -20,7 +25,8 @@ export interface RepoUrlPickerState {
   organization?: string;
   workspace?: string;
   project?: string;
-  availableRepos?: string[];
+  id?: string;
+  availableRepos?: AvailableRepositories[];
 }
 
 export type BaseRepoUrlPickerProps<T extends {} = {}> = T & {
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.test.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.test.ts
index c90b357cf1..ce3c938e31 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.test.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.test.ts
@@ -53,9 +53,10 @@ describe('utils', () => {
           organization: 'organization',
           workspace: 'workspace',
           project: 'backstage',
+          id: '1234',
         }),
       ).toBe(
-        'github.com?owner=owner&repo=backstage&organization=organization&workspace=workspace&project=backstage',
+        'github.com?owner=owner&repo=backstage&organization=organization&workspace=workspace&project=backstage&id=1234',
       );
     });
   });
@@ -64,7 +65,7 @@ describe('utils', () => {
     it('should parse a complete string', () => {
       expect(
         parseRepoPickerUrl(
-          'github.com?owner=owner&repo=backstage&organization=organization&workspace=workspace&project=backstage',
+          'github.com?owner=owner&repo=backstage&organization=organization&workspace=workspace&project=backstage&id=1234',
         ),
       ).toEqual({
         host: 'github.com',
@@ -73,6 +74,7 @@ describe('utils', () => {
         organization: 'organization',
         workspace: 'workspace',
         project: 'backstage',
+        id: '1234',
       });
     });
   });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.ts
index 408b87413b..145a3e256f 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/utils.ts
@@ -37,6 +37,9 @@ export function serializeRepoPickerUrl(data: RepoUrlPickerState) {
   if (data.project) {
     params.set('project', data.project);
   }
+  if (data.id) {
+    params.set('id', data.id);
+  }
 
   return `${data.host}?${params.toString()}`;
 }
@@ -50,6 +53,7 @@ export function parseRepoPickerUrl(
   let organization = '';
   let workspace = '';
   let project = '';
+  let id = '';
 
   try {
     if (url) {
@@ -60,9 +64,10 @@ export function parseRepoPickerUrl(
       organization = parsed.searchParams.get('organization') || '';
       workspace = parsed.searchParams.get('workspace') || '';
       project = parsed.searchParams.get('project') || '';
+      id = parsed.searchParams.get('id') || '';
     }
   } catch {
     /* ok */
   }
-  return { host, owner, repoName, organization, workspace, project };
+  return { host, owner, repoName, organization, workspace, project, id };
 }
diff --git a/plugins/scaffolder/src/plugin.tsx b/plugins/scaffolder/src/plugin.tsx
index 8b24e86069..17592b5826 100644
--- a/plugins/scaffolder/src/plugin.tsx
+++ b/plugins/scaffolder/src/plugin.tsx
@@ -78,6 +78,9 @@ import {
 } from './components/fields/MyGroupsPicker/MyGroupsPicker';
 import { RepoBranchPicker } from './components/fields/RepoBranchPicker/RepoBranchPicker';
 import { RepoBranchPickerSchema } from './components/fields/RepoBranchPicker/schema';
+import { formDecoratorsApiRef } from './alpha/api/ref';
+import { DefaultScaffolderFormDecoratorsApi } from './alpha/api/FormDecoratorsApi';
+import { formFieldsApiRef } from '@backstage/plugin-scaffolder-react/alpha';
 
 /**
  * The main plugin export for the scaffolder.
@@ -102,6 +105,16 @@ export const scaffolderPlugin = createPlugin({
           identityApi,
         }),
     }),
+    createApiFactory({
+      api: formDecoratorsApiRef,
+      deps: {},
+      factory: () => DefaultScaffolderFormDecoratorsApi.create(),
+    }),
+    createApiFactory({
+      api: formFieldsApiRef,
+      deps: {},
+      factory: () => ({ getFormFields: async () => [] }),
+    }),
   ],
   routes: {
     root: rootRouteRef,
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index 19054522cf..cc3e8edf26 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,137 @@
 # @backstage/plugin-search-backend-module-catalog
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.5
+
+### Patch Changes
+
+- 0b8f344: Fixed a bug where the `filter` setting of the collator was not permitted to be an array.
+- 1a1e2f4: Fix search collator text formatting for catalog entities without description
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- 0b8f344: Fixed a bug where the `filter` setting of the collator was not permitted to be an array.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-catalog/README.md b/plugins/search-backend-module-catalog/README.md
index 607c246390..f6793b93f5 100644
--- a/plugins/search-backend-module-catalog/README.md
+++ b/plugins/search-backend-module-catalog/README.md
@@ -16,12 +16,10 @@ Add the collator to your backend instance, along with the search plugin itself:
 ```tsx
 // packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleCatalogCollator } from '@backstage/plugin-search-backend-module-catalog/alpha';
 
 const backend = createBackend();
-backend.add(searchPlugin);
-backend.add(searchModuleCatalogCollator);
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
 backend.start();
 ```
 
@@ -35,12 +33,8 @@ This module also has an extension point, which lets you inject advanced customiz
 // packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
 import { createBackendModule } from '@backstage/backend-plugin-api';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
 import { CatalogCollatorEntityTransformer } from '@backstage/plugin-search-backend-module-catalog';
-import {
-  searchModuleCatalogCollator,
-  catalogCollatorExtensionPoint,
-} from '@backstage/plugin-search-backend-module-catalog/alpha';
+import { catalogCollatorExtensionPoint } from '@backstage/plugin-search-backend-module-catalog/alpha';
 
 const customTransformer: CatalogCollatorEntityTransformer = entity => ({
   title: entity.metadata.title || entity.metadata.name,
@@ -54,8 +48,8 @@ const customTransformer: CatalogCollatorEntityTransformer = entity => ({
 });
 
 const backend = createBackend();
-backend.add(searchPlugin);
-backend.add(searchModuleCatalogCollator);
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
 backend.add(
   createBackendModule({
     pluginId: 'search',
@@ -63,7 +57,7 @@ backend.add(
     register(reg) {
       reg.registerInit({
         deps: { collator: catalogCollatorExtensionPoint },
-        init({ collator }) {
+        async init({ collator }) {
           collator.setEntityTransformer(customTransformer);
         },
       });
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index 57acaacf48..c25990cee0 100644
--- a/plugins/search-backend-module-catalog/package.json
+++ b/plugins/search-backend-module-catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-catalog",
-  "version": "0.2.3",
+  "version": "0.2.6-next.2",
   "description": "A module for the search backend that exports catalog modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
index 3fe6a9c3e5..b0b7465f5b 100644
--- a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
+++ b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.test.ts
@@ -147,5 +147,34 @@ describe('DefaultCatalogCollatorEntityTransformer', () => {
         owner: '',
       });
     });
+
+    it('sets text correctly when description is not provided', async () => {
+      const userEntityWithoutDescription = {
+        ...userEntity,
+        metadata: {
+          ...userEntity.metadata,
+          description: undefined,
+        },
+        spec: {
+          profile: {
+            ...userEntity.spec.profile,
+            email: undefined,
+          },
+        },
+      };
+
+      const document = defaultCatalogCollatorEntityTransformer(
+        userEntityWithoutDescription,
+      );
+
+      expect(document).toMatchObject({
+        title: userEntity.metadata.name,
+        text: userEntity.spec.profile.displayName,
+        namespace: 'default',
+        componentType: 'other',
+        lifecycle: '',
+        owner: '',
+      });
+    });
   });
 });
diff --git a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
index db239b8669..8acc3e24b8 100644
--- a/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
+++ b/plugins/search-backend-module-catalog/src/collators/defaultCatalogCollatorEntityTransformer.ts
@@ -19,7 +19,9 @@ import { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransfo
 
 const getDocumentText = (entity: Entity): string => {
   const documentTexts: string[] = [];
-  documentTexts.push(entity.metadata.description || '');
+  if (entity.metadata.description) {
+    documentTexts.push(entity.metadata.description);
+  }
 
   if (isUserEntity(entity) || isGroupEntity(entity)) {
     if (entity.spec?.profile?.displayName) {
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index faf9ae0ad2..4e6344382b 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,97 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.6.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 1.6.3-next.1
+
+### Patch Changes
+
+- 991c9fe: Update the ElasticSearchSearchEngine translator to handle phrase searches.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.6.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.6.2
+
+### Patch Changes
+
+- dae59c1: Updated dependency `@short.io/opensearch-mock` to `^0.4.0`.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.6.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.6.2-next.0
+
+### Patch Changes
+
+- dae59c1: Updated dependency `@short.io/opensearch-mock` to `^0.4.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.6.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index 897ec4a6c7..b53dd1f095 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
-  "version": "1.6.0",
+  "version": "1.6.3-next.2",
   "description": "A module for the search backend that implements search using ElasticSearch",
   "backstage": {
     "role": "backend-plugin-module",
@@ -58,7 +58,7 @@
     "aws4": "^1.12.0",
     "elastic-builder": "^2.16.0",
     "lodash": "^4.17.21",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index 3f64e0b768..379b712469 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -185,12 +185,11 @@ describe('ElasticSearchSearchEngine', () => {
       expect(queryBody).toEqual({
         query: {
           bool: {
-            must: {
+            should: {
               multi_match: {
                 query: 'testTerm',
                 fields: ['*'],
                 fuzziness: 'auto',
-                minimum_should_match: 1,
               },
             },
             filter: {
@@ -205,6 +204,56 @@ describe('ElasticSearchSearchEngine', () => {
       });
     });
 
+    it('should return translated query with phrase terms', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: '"test phrase" anotherTerm "another phrase"',
+        filters: {},
+      }) as ElasticSearchConcreteQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            should: [
+              {
+                multi_match: {
+                  query: 'test phrase',
+                  fields: ['*'],
+                  type: 'phrase',
+                },
+              },
+              {
+                multi_match: {
+                  query: 'another phrase',
+                  fields: ['*'],
+                  type: 'phrase',
+                },
+              },
+              {
+                multi_match: {
+                  query: 'anotherTerm',
+                  fields: ['*'],
+                  fuzziness: 'auto',
+                },
+              },
+            ],
+            filter: [],
+          },
+        },
+        from: 0,
+        size: 25,
+      });
+    });
+
     it('should pass page cursor', async () => {
       const translatorUnderTest = inspectableSearchEngine.getTranslator();
 
@@ -225,12 +274,11 @@ describe('ElasticSearchSearchEngine', () => {
         query: {
           bool: {
             filter: [],
-            must: {
+            should: {
               multi_match: {
                 query: 'testTerm',
                 fields: ['*'],
                 fuzziness: 'auto',
-                minimum_should_match: 1,
               },
             },
           },
@@ -264,12 +312,11 @@ describe('ElasticSearchSearchEngine', () => {
       expect(queryBody).toEqual({
         query: {
           bool: {
-            must: {
+            should: {
               multi_match: {
                 query: 'testTerm',
                 fields: ['*'],
                 fuzziness: 'auto',
-                minimum_should_match: 1,
               },
             },
             filter: [
@@ -320,12 +367,11 @@ describe('ElasticSearchSearchEngine', () => {
       expect(queryBody).toEqual({
         query: {
           bool: {
-            must: {
+            should: {
               multi_match: {
                 query: 'testTerm',
                 fields: ['*'],
                 fuzziness: 'auto',
-                minimum_should_match: 1,
               },
             },
             filter: {
@@ -382,12 +428,11 @@ describe('ElasticSearchSearchEngine', () => {
         query: {
           bool: {
             filter: [],
-            must: {
+            should: {
               multi_match: {
                 query: 'testTerm',
                 fields: ['*'],
                 fuzziness: 'auto',
-                minimum_should_match: 1,
               },
             },
           },
@@ -708,12 +753,11 @@ describe('ElasticSearchSearchEngine', () => {
         body: {
           query: {
             bool: {
-              must: {
+              should: {
                 multi_match: {
                   query: 'testTerm',
                   fields: ['*'],
                   fuzziness: 'auto',
-                  minimum_should_match: 1,
                 },
               },
               filter: [],
@@ -747,7 +791,7 @@ describe('ElasticSearchSearchEngine', () => {
         body: {
           query: {
             bool: {
-              must: {
+              should: {
                 match_all: {},
               },
               filter: [],
@@ -782,7 +826,7 @@ describe('ElasticSearchSearchEngine', () => {
         body: {
           query: {
             bool: {
-              must: {
+              should: {
                 match_all: {},
               },
               filter: [],
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index e2934da404..16233a5e78 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -246,18 +246,40 @@ export class ElasticSearchSearchEngine implements SearchEngine {
           'Failed to add filters to query. Unrecognized filter type',
         );
       });
-    const esbQuery = isBlank(term)
-      ? esb.matchAllQuery()
-      : esb
-          .multiMatchQuery(['*'], term)
-          .fuzziness('auto')
-          .minimumShouldMatch(1);
+
+    const esbQueries = [];
+    // https://regex101.com/r/Lr0MqS/1
+    const phraseTerms = term.match(/"[^"]*"/g);
+
+    if (isBlank(term)) {
+      const esbQuery = esb.matchAllQuery();
+      esbQueries.push(esbQuery);
+    } else if (phraseTerms && phraseTerms.length > 0) {
+      let restTerm = term;
+      for (const phraseTerm of phraseTerms) {
+        restTerm = restTerm.replace(phraseTerm, '');
+        const esbPhraseQuery = esb
+          .multiMatchQuery(['*'], phraseTerm.replace(/"/g, ''))
+          .type('phrase');
+        esbQueries.push(esbPhraseQuery);
+      }
+      if (restTerm?.length > 0) {
+        const esbRestQuery = esb
+          .multiMatchQuery(['*'], restTerm.trim())
+          .fuzziness('auto');
+        esbQueries.push(esbRestQuery);
+      }
+    } else {
+      const esbQuery = esb.multiMatchQuery(['*'], term).fuzziness('auto');
+      esbQueries.push(esbQuery);
+    }
+
     const pageSize = query.pageLimit || 25;
     const { page } = decodePageCursor(pageCursor);
 
     let esbRequestBodySearch = esb
       .requestBodySearch()
-      .query(esb.boolQuery().filter(filter).must([esbQuery]))
+      .query(esb.boolQuery().filter(filter).should(esbQueries))
       .from(page * pageSize)
       .size(pageSize);
 
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index 8e7a38953f..ba73639260 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,89 @@
 # @backstage/plugin-search-backend-module-explore
 
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.5
+
+### Patch Changes
+
+- a9a7c7c: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.7`.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.2.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- a9a7c7c: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.7`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-explore/README.md b/plugins/search-backend-module-explore/README.md
index d91ee92163..aaf6aabeb9 100644
--- a/plugins/search-backend-module-explore/README.md
+++ b/plugins/search-backend-module-explore/README.md
@@ -16,12 +16,10 @@ Add the collator to your backend instance, along with the search plugin itself:
 ```tsx
 // packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleExploreCollator } from '@backstage/plugin-search-backend-module-explore/alpha';
 
 const backend = createBackend();
-backend.add(searchPlugin);
-backend.add(searchModuleExploreCollator);
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-explore'));
 backend.start();
 ```
 
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index b9c5a82cb5..6adf7c2dd3 100644
--- a/plugins/search-backend-module-explore/package.json
+++ b/plugins/search-backend-module-explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-explore",
-  "version": "0.2.3",
+  "version": "0.2.6-next.2",
   "description": "A module for the search backend that exports explore modules",
   "backstage": {
     "role": "backend-plugin-module",
@@ -48,13 +48,12 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage-community/plugin-explore-common": "^0.0.6",
+    "@backstage-community/plugin-explore-common": "^0.0.7",
     "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/plugin-search-backend-node": "workspace:^",
-    "@backstage/plugin-search-common": "workspace:^",
-    "node-fetch": "^2.7.0"
+    "@backstage/plugin-search-common": "workspace:^"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/search-backend-module-explore/src/collators/ToolDocumentCollatorFactory.ts b/plugins/search-backend-module-explore/src/collators/ToolDocumentCollatorFactory.ts
index da047fe8ab..bafbb9cbfe 100644
--- a/plugins/search-backend-module-explore/src/collators/ToolDocumentCollatorFactory.ts
+++ b/plugins/search-backend-module-explore/src/collators/ToolDocumentCollatorFactory.ts
@@ -29,7 +29,6 @@ import {
   DocumentCollatorFactory,
   IndexableDocument,
 } from '@backstage/plugin-search-common';
-import fetch from 'node-fetch';
 import { Readable } from 'stream';
 
 /**
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index f3e28c9233..c922d8ac0e 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.39-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.5.39-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.38
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.5.38-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.5.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.5.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.5.38-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.5.36
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index 5ac63ce0b1..cc9ee21240 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
-  "version": "0.5.36",
+  "version": "0.5.39-next.2",
   "description": "A module for the search backend that implements search using PostgreSQL",
   "backstage": {
     "role": "backend-plugin-module",
@@ -56,7 +56,7 @@
     "@backstage/plugin-search-common": "workspace:^",
     "knex": "^3.0.0",
     "lodash": "^4.17.21",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
index c638ffc3f9..d68b36fb54 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import { Knex as KnexType } from 'knex';
-import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
+import {
+  TestDatabaseId,
+  TestDatabases,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { PgSearchHighlightOptions } from '../PgSearchEngine';
 import { DatabaseDocumentStore } from './DatabaseDocumentStore';
@@ -32,18 +35,6 @@ const highlightOptions: PgSearchHighlightOptions = {
   fragmentDelimiter: ' ... ',
 };
 
-function createDatabaseManager(
-  client: KnexType,
-  skipMigrations: boolean = false,
-) {
-  return {
-    getClient: async () => client,
-    migrations: {
-      skip: skipMigrations,
-    },
-  };
-}
-
 jest.setTimeout(60_000);
 
 describe('DatabaseDocumentStore', () => {
@@ -66,8 +57,7 @@ describe('DatabaseDocumentStore', () => {
       'should fail to create, %p',
       async databaseId => {
         const knex = await databases.init(databaseId);
-        const databaseManager = createDatabaseManager(knex);
-
+        const databaseManager = mockServices.database({ knex });
         await expect(
           async () => await DatabaseDocumentStore.create(databaseManager),
         ).rejects.toThrow();
@@ -82,7 +72,7 @@ describe('DatabaseDocumentStore', () => {
 
     async function createStore(databaseId: TestDatabaseId) {
       const knex = await databases.init(databaseId);
-      const databaseManager = createDatabaseManager(knex);
+      const databaseManager = mockServices.database({ knex });
       const store = await DatabaseDocumentStore.create(databaseManager);
 
       return { store, knex };
diff --git a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
index a6b2f4b549..15d4ca465b 100644
--- a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
+++ b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
@@ -1,5 +1,87 @@
 # @backstage/plugin-search-backend-module-stack-overflow-collator
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.3.3
+
+### Patch Changes
+
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.3.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 0.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-stack-overflow-collator/package.json b/plugins/search-backend-module-stack-overflow-collator/package.json
index c956553288..6138afa68d 100644
--- a/plugins/search-backend-module-stack-overflow-collator/package.json
+++ b/plugins/search-backend-module-stack-overflow-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-stack-overflow-collator",
-  "version": "0.3.1",
+  "version": "0.3.4-next.2",
   "description": "A module for the search backend that exports stack overflow modules",
   "backstage": {
     "role": "backend-plugin-module",
@@ -35,12 +35,10 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/plugin-search-backend-node": "workspace:^",
     "@backstage/plugin-search-common": "workspace:^",
-    "node-fetch": "^2.7.0",
     "qs": "^6.9.4"
   },
   "devDependencies": {
diff --git a/plugins/search-backend-module-stack-overflow-collator/src/collators/StackOverflowQuestionsCollatorFactory.ts b/plugins/search-backend-module-stack-overflow-collator/src/collators/StackOverflowQuestionsCollatorFactory.ts
index 33ceb4f870..af9a2a852b 100644
--- a/plugins/search-backend-module-stack-overflow-collator/src/collators/StackOverflowQuestionsCollatorFactory.ts
+++ b/plugins/search-backend-module-stack-overflow-collator/src/collators/StackOverflowQuestionsCollatorFactory.ts
@@ -20,7 +20,7 @@ import {
 } from '@backstage/plugin-search-common';
 import { Config } from '@backstage/config';
 import { Readable } from 'stream';
-import fetch from 'node-fetch';
+
 import qs from 'qs';
 import { LoggerService } from '@backstage/backend-plugin-api';
 
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index 18a22277fa..6c95c3a9e0 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,135 @@
 # @backstage/plugin-search-backend-module-techdocs
 
+## 0.3.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 0.3.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- ed0aaec: Update README
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## 0.3.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/plugins/search-backend-module-techdocs/README.md b/plugins/search-backend-module-techdocs/README.md
index 63094cca7d..341d5b858a 100644
--- a/plugins/search-backend-module-techdocs/README.md
+++ b/plugins/search-backend-module-techdocs/README.md
@@ -16,12 +16,10 @@ Add the collator to your backend instance, along with the search plugin itself:
 ```tsx
 // packages/backend/src/index.ts
 import { createBackend } from '@backstage/backend-defaults';
-import { searchPlugin } from '@backstage/plugin-search-backend/alpha';
-import { searchModuleTechDocsCollator } from '@backstage/plugin-search-backend-module-techdocs/alpha';
 
 const backend = createBackend();
-backend.add(searchPlugin);
-backend.add(searchModuleTechDocsCollator);
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 backend.start();
 ```
 
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index 465764a913..e519fbc483 100644
--- a/plugins/search-backend-module-techdocs/package.json
+++ b/plugins/search-backend-module-techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-techdocs",
-  "version": "0.3.0",
+  "version": "0.3.4-next.2",
   "description": "A module for the search backend that exports techdocs modules",
   "backstage": {
     "role": "backend-plugin-module",
@@ -60,7 +60,6 @@
     "@backstage/plugin-search-common": "workspace:^",
     "@backstage/plugin-techdocs-node": "workspace:^",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "p-limit": "^3.1.0"
   },
   "devDependencies": {
diff --git a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
index 0b53b33b30..3a586fd306 100644
--- a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
@@ -34,7 +34,6 @@ import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/al
 import { Permission } from '@backstage/plugin-permission-common';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { TechDocsDocument } from '@backstage/plugin-techdocs-node';
-import fetch from 'node-fetch';
 import pLimit from 'p-limit';
 import { Readable } from 'stream';
 import { TechDocsCollatorEntityTransformer } from './TechDocsCollatorEntityTransformer';
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index ce4b300f3f..a1ad348d43 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,101 @@
 # @backstage/plugin-search-backend-node
 
+## 1.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 1.3.6-next.1
+
+### Patch Changes
+
+- 5ae8a2c: Removed unnecessary dependency on `@backstage/backend-defaults`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.3.5
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.3.5-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.3.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 9d45f9d323..be0dedcee6 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "1.3.3",
+  "version": "1.3.6-next.2",
   "description": "A library for Backstage backend plugins that want to interact with the search backend plugin",
   "backstage": {
     "role": "node-library",
@@ -53,7 +53,6 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
@@ -63,10 +62,11 @@
     "lodash": "^4.17.21",
     "lunr": "^2.3.9",
     "ndjson": "^2.0.0",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@types/ndjson": "^2.0.1"
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index 645c1f4a05..4ff7f3d774 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,145 @@
 # @backstage/plugin-search-backend
 
+## 1.8.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-permission-node@0.8.6-next.2
+  - @backstage/backend-openapi-utils@0.4.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 1.8.0-next.1
+
+### Minor Changes
+
+- 384e494: Internal updates to generated code.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/plugin-search-backend-node@1.3.6-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-permission-node@0.8.6-next.1
+  - @backstage/backend-openapi-utils@0.3.1-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/backend-openapi-utils@0.3.1-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-permission-node@0.8.6-next.0
+  - @backstage/plugin-search-backend-node@1.3.6-next.0
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.7.0
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/backend-openapi-utils@0.3.0
+  - @backstage/plugin-search-backend-node@1.3.5
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-permission-node@0.8.5
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.7.0-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.3
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.7.0-next.2
+
+### Minor Changes
+
+- 39fd704: Internal update to use the new generated server types from `backstage-cli package schema openapi generate --server`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/backend-openapi-utils@0.3.0-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.2
+  - @backstage/plugin-search-backend-node@1.3.5-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-openapi-utils@0.2.1-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.1
+  - @backstage/plugin-search-backend-node@1.3.5-next.1
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.6.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-openapi-utils@0.2.1-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.5-next.0
+  - @backstage/plugin-search-backend-node@1.3.5-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.6.0
 
 ### Minor Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 826af24eeb..b64ab4d306 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "1.6.0",
+  "version": "1.8.0-next.2",
   "description": "The Backstage backend plugin that provides your backstage app with search",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/search-backend/src/schema/openapi.yaml b/plugins/search-backend/src/schema/openapi.yaml
index cbf3db273a..b1b8e83f58 100644
--- a/plugins/search-backend/src/schema/openapi.yaml
+++ b/plugins/search-backend/src/schema/openapi.yaml
@@ -175,4 +175,4 @@ paths:
           allowReserved: true
           schema:
             type: object
-            additionalProperties: true
+            additionalProperties: {}
diff --git a/plugins/search-backend/src/schema/openapi/generated/apis/Api.server.ts b/plugins/search-backend/src/schema/openapi/generated/apis/Api.server.ts
new file mode 100644
index 0000000000..d23648d8b5
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/apis/Api.server.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200Response } from '../models/Query200Response.model';
+
+/**
+ * @public
+ */
+export type Query = {
+  query: {
+    term?: string;
+    filters?: { [key: string]: any };
+    types?: Array<string>;
+    pageCursor?: string;
+    pageLimit?: number;
+    unknown?: { [key: string]: any };
+  };
+  response: Query200Response | Error;
+};
+
+export type EndpointMap = {
+  '#get|/query': Query;
+};
diff --git a/plugins/search-backend/src/schema/openapi/generated/apis/index.ts b/plugins/search-backend/src/schema/openapi/generated/apis/index.ts
new file mode 100644
index 0000000000..a3cdbbebd2
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/apis/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+export * from './Api.server';
diff --git a/plugins/search-backend/src/schema/openapi/generated/index.ts b/plugins/search-backend/src/schema/openapi/generated/index.ts
new file mode 100644
index 0000000000..69c39313c6
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './apis';
+export * from './router';
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts
new file mode 100644
index 0000000000..0a51c67fef
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorError.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorError {
+  name: string;
+  message: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
new file mode 100644
index 0000000000..d44dcb66d9
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorRequest.model.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorRequest {
+  method: string;
+  url: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
new file mode 100644
index 0000000000..91c120483d
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ErrorResponse.model.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * @public
+ */
+export interface ErrorResponse {
+  statusCode: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts
new file mode 100644
index 0000000000..3e6af947ec
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/ModelError.model.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { ErrorError } from '../models/ErrorError.model';
+import { ErrorRequest } from '../models/ErrorRequest.model';
+import { ErrorResponse } from '../models/ErrorResponse.model';
+
+/**
+ * @public
+ */
+export interface ModelError {
+  error: ErrorError;
+  request: ErrorRequest;
+  response: ErrorResponse;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts
new file mode 100644
index 0000000000..8ddb2a0b63
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200Response.model.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200ResponseResultsInner } from '../models/Query200ResponseResultsInner.model';
+
+/**
+ * @public
+ */
+export interface Query200Response {
+  results: Array<Query200ResponseResultsInner>;
+  nextPageCursor?: string;
+  previousPageCursor?: string;
+  numberOfResults?: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts
new file mode 100644
index 0000000000..ec635c8e5b
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInner.model.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+import { Query200ResponseResultsInnerDocument } from '../models/Query200ResponseResultsInnerDocument.model';
+
+/**
+ * @public
+ */
+export interface Query200ResponseResultsInner {
+  /**
+   * The \"type\" of the given document.
+   */
+  type: string;
+  document: Query200ResponseResultsInnerDocument;
+  /**
+   * Optional result highlight. Useful for improving the search result display/experience.
+   */
+  highlight?: any;
+  /**
+   * Optional result rank, where 1 is the first/top result returned.  Useful for understanding search effectiveness in analytics.
+   */
+  rank?: number;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts
new file mode 100644
index 0000000000..9e82274aa7
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/Query200ResponseResultsInnerDocument.model.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
+/**
+ * The raw value of the document, as indexed.
+ * @public
+ */
+export interface Query200ResponseResultsInnerDocument {
+  /**
+   * The primary name of the document (e.g. name, title, identifier, etc).
+   */
+  title?: string;
+  /**
+   * Free-form text of the document (e.g. description, content, etc).
+   */
+  text?: string;
+  /**
+   * The relative or absolute URL of the document (target when a search result is clicked).
+   */
+  location?: string;
+}
diff --git a/plugins/search-backend/src/schema/openapi/generated/models/index.ts b/plugins/search-backend/src/schema/openapi/generated/models/index.ts
new file mode 100644
index 0000000000..d38087bf8c
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/generated/models/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from '../models/ErrorError.model';
+export * from '../models/ErrorRequest.model';
+export * from '../models/ErrorResponse.model';
+export * from '../models/ModelError.model';
+export * from '../models/Query200Response.model';
+export * from '../models/Query200ResponseResultsInner.model';
+export * from '../models/Query200ResponseResultsInnerDocument.model';
diff --git a/plugins/search-backend/src/schema/openapi.generated.ts b/plugins/search-backend/src/schema/openapi/generated/router.ts
similarity index 95%
rename from plugins/search-backend/src/schema/openapi.generated.ts
rename to plugins/search-backend/src/schema/openapi/generated/router.ts
index 1e6adfb08f..a7dd980142 100644
--- a/plugins/search-backend/src/schema/openapi.generated.ts
+++ b/plugins/search-backend/src/schema/openapi/generated/router.ts
@@ -17,7 +17,8 @@
 // ******************************************************************
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
-import { createValidatedOpenApiRouter } from '@backstage/backend-openapi-utils';
+import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
+import { EndpointMap } from './';
 
 export const spec = {
   openapi: '3.0.3',
@@ -252,7 +253,7 @@ export const spec = {
             allowReserved: true,
             schema: {
               type: 'object',
-              additionalProperties: true,
+              additionalProperties: {},
             },
           },
         ],
@@ -261,5 +262,11 @@ export const spec = {
   },
 } as const;
 export const createOpenApiRouter = async (
-  options?: Parameters<typeof createValidatedOpenApiRouter>['1'],
-) => createValidatedOpenApiRouter<typeof spec>(spec, options);
+  options?: Parameters<
+    typeof createValidatedOpenApiRouterFromGeneratedEndpointMap
+  >['1'],
+) =>
+  createValidatedOpenApiRouterFromGeneratedEndpointMap<EndpointMap>(
+    spec,
+    options,
+  );
diff --git a/plugins/search-backend/src/schema/openapi/index.ts b/plugins/search-backend/src/schema/openapi/index.ts
new file mode 100644
index 0000000000..db98243cbf
--- /dev/null
+++ b/plugins/search-backend/src/schema/openapi/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './generated';
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 9c22290a63..ab2d929ec1 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -32,7 +32,7 @@ import {
 } from '@backstage/plugin-search-common';
 import { SearchEngine } from '@backstage/plugin-search-backend-node';
 import { AuthorizedSearchEngine } from './AuthorizedSearchEngine';
-import { createOpenApiRouter } from '../schema/openapi.generated';
+import { createOpenApiRouter } from '../schema/openapi';
 import {
   AuthService,
   DiscoveryService,
diff --git a/plugins/search-common/CHANGELOG.md b/plugins/search-common/CHANGELOG.md
index 3bdf90fe85..279d2450de 100644
--- a/plugins/search-common/CHANGELOG.md
+++ b/plugins/search-common/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-common
 
+## 1.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+
+## 1.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-permission-common@0.8.2
+
 ## 1.2.14
 
 ### Patch Changes
diff --git a/plugins/search-common/package.json b/plugins/search-common/package.json
index 10524c1515..ece78fae8c 100644
--- a/plugins/search-common/package.json
+++ b/plugins/search-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-common",
-  "version": "1.2.14",
+  "version": "1.2.16-next.0",
   "description": "Common functionalities for Search, to be shared between various search-enabled plugins",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 7d480990df..b49d54c56b 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,97 @@
 # @backstage/plugin-search-react
 
+## 1.8.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.16-next.0
+
+## 1.8.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.8.4-next.0
+
+### Patch Changes
+
+- d311c84: Use Select from core-components and update Lifecycle filter to use Select instead checkboxes.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.8.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.8.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.8.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
+## 1.8.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.8.1
 
 ### Patch Changes
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index b29acd5dbd..163165fe37 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.8.1",
+  "version": "1.8.4-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "search",
@@ -68,7 +68,8 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "lodash": "^4.17.21",
     "qs": "^6.9.4",
-    "react-use": "^17.3.2"
+    "react-use": "^17.3.2",
+    "uuid": "^11.0.2"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
index e155a093d5..e28558b73a 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
@@ -289,12 +289,14 @@ describe('SearchFilter', () => {
         expect(screen.getByRole('listbox')).toBeInTheDocument();
       });
 
-      expect(
-        screen.getByRole('option', { name: values[0] }),
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole('option', { name: values[1] }),
-      ).toBeInTheDocument();
+      await waitFor(() => {
+        expect(
+          screen.getByRole('option', { name: values[0] }),
+        ).toBeInTheDocument();
+        expect(
+          screen.getByRole('option', { name: values[1] }),
+        ).toBeInTheDocument();
+      });
     });
 
     it('Renders correctly based on filter state', async () => {
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.tsx
index acfa6aec3b..f5f85f3f56 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.tsx
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-import React, { ReactElement, ChangeEvent } from 'react';
+import React, { ReactElement, ChangeEvent, useRef } from 'react';
+import { capitalize } from 'lodash';
+import { v4 as uuid } from 'uuid';
 import FormControl from '@material-ui/core/FormControl';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
-import InputLabel from '@material-ui/core/InputLabel';
 import Checkbox from '@material-ui/core/Checkbox';
-import Select from '@material-ui/core/Select';
-import MenuItem from '@material-ui/core/MenuItem';
 import FormLabel from '@material-ui/core/FormLabel';
-import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
+import { Select, SelectedItems } from '@backstage/core-components';
 
 import { useSearch } from '../../context';
 import {
@@ -161,7 +160,6 @@ export const SelectFilter = (props: SearchFilterComponentProps) => {
     values: givenValues,
     valuesDebounceMs,
   } = props;
-  const classes = useStyles();
   useDefaultFilterValue(name, defaultValue);
   const asyncValues =
     typeof givenValues === 'function' ? givenValues : undefined;
@@ -173,19 +171,21 @@ export const SelectFilter = (props: SearchFilterComponentProps) => {
     defaultValues,
     valuesDebounceMs,
   );
+  const allOptionValue = useRef(uuid());
+  const allOption = { value: allOptionValue.current, label: 'All' };
   const { filters, setFilters } = useSearch();
 
-  const handleChange = (e: ChangeEvent<{ value: unknown }>) => {
-    const {
-      target: { value },
-    } = e;
-
+  const handleChange = (value: SelectedItems) => {
     setFilters(prevFilters => {
       const { [name]: filter, ...others } = prevFilters;
-      return value ? { ...others, [name]: value as string } : others;
+      return value !== allOptionValue.current
+        ? { ...others, [name]: value as string }
+        : others;
     });
   };
 
+  const items = [allOption, ...values.map(value => ({ value, label: value }))];
+
   return (
     <FormControl
       disabled={loading}
@@ -194,27 +194,12 @@ export const SelectFilter = (props: SearchFilterComponentProps) => {
       fullWidth
       data-testid="search-selectfilter-next"
     >
-      {label ? (
-        <InputLabel className={classes.label} margin="dense">
-          {label}
-        </InputLabel>
-      ) : null}
       <Select
-        variant="outlined"
-        value={filters[name] || ''}
+        label={label ?? capitalize(name)}
+        selected={(filters[name] || allOptionValue.current) as string}
         onChange={handleChange}
-      >
-        <MenuItem value="">
-          <em>All</em>
-        </MenuItem>
-        {values.map((value: string) => (
-          <MenuItem key={value} value={value}>
-            <Typography variant="inherit" noWrap>
-              {value}
-            </Typography>
-          </MenuItem>
-        ))}
-      </Select>
+        items={items}
+      />
     </FormControl>
   );
 };
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index ce1338bdba..0ba1ed8577 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,136 @@
 # @backstage/plugin-search
 
+## 1.4.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+
+## 1.4.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+
+## 1.4.21-next.0
+
+### Patch Changes
+
+- d311c84: Use Select from core-components and update Lifecycle filter to use Select instead checkboxes.
+- Updated dependencies
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+
+## 1.4.19
+
+### Patch Changes
+
+- a4ccc82: Removes the card UI from the search results type filter for a cleaner UI consistent with other filters
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+
+## 1.4.19-next.3
+
+### Patch Changes
+
+- a4ccc82: Removes the card UI from the search results type filter for a cleaner UI consistent with other filters
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+
+## 1.4.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## 1.4.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+
+## 1.4.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+
 ## 1.4.18
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 86ee6dd6db..2437e82fb0 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "1.4.18",
+  "version": "1.4.21-next.2",
   "description": "The Backstage plugin that provides your backstage app with search",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/search/report-alpha.api.md b/plugins/search/report-alpha.api.md
index 9b8f21fa43..d4a016bbe2 100644
--- a/plugins/search/report-alpha.api.md
+++ b/plugins/search/report-alpha.api.md
@@ -22,21 +22,6 @@ const _default: FrontendPlugin<
   },
   {},
   {
-    'api:search': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'nav-item:search': ExtensionDefinition<{
       kind: 'nav-item';
       name: undefined;
@@ -58,6 +43,21 @@ const _default: FrontendPlugin<
         routeRef: RouteRef<undefined>;
       };
     }>;
+    'api:search': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
     'page:search': ExtensionDefinition<{
       config: {
         noTrack: boolean;
diff --git a/plugins/search/src/components/SearchType/SearchType.Accordion.tsx b/plugins/search/src/components/SearchType/SearchType.Accordion.tsx
index bdd13f2fb2..2a6c2b1939 100644
--- a/plugins/search/src/components/SearchType/SearchType.Accordion.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.Accordion.tsx
@@ -20,9 +20,7 @@ import { searchApiRef, useSearch } from '@backstage/plugin-search-react';
 import Accordion from '@material-ui/core/Accordion';
 import AccordionSummary from '@material-ui/core/AccordionSummary';
 import AccordionDetails from '@material-ui/core/AccordionDetails';
-import Card from '@material-ui/core/Card';
-import CardContent from '@material-ui/core/CardContent';
-import CardHeader from '@material-ui/core/CardHeader';
+import Box from '@material-ui/core/Box';
 import Divider from '@material-ui/core/Divider';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
@@ -30,16 +28,11 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
 import ListItemText from '@material-ui/core/ListItemText';
 import { makeStyles } from '@material-ui/core/styles';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import Typography from '@material-ui/core/Typography';
 import AllIcon from '@material-ui/icons/FontDownload';
 import useAsync from 'react-use/esm/useAsync';
 
 const useStyles = makeStyles(theme => ({
-  card: {
-    backgroundColor: 'rgba(0, 0, 0, .11)',
-  },
-  cardContent: {
-    paddingTop: theme.spacing(1),
-  },
   icon: {
     color: theme.palette.text.primary,
   },
@@ -149,61 +142,61 @@ export const SearchTypeAccordion = (props: SearchTypeAccordionProps) => {
   }, [filters, showCounts, term, types]);
 
   return (
-    <Card className={classes.card}>
-      <CardHeader title={name} titleTypographyProps={{ variant: 'overline' }} />
-      <CardContent className={classes.cardContent}>
-        <Accordion
-          className={classes.accordion}
-          expanded={expanded}
-          onChange={toggleExpanded}
+    <Box>
+      <Typography variant="body2" component="h2">
+        {name}
+      </Typography>
+      <Accordion
+        className={classes.accordion}
+        expanded={expanded}
+        onChange={toggleExpanded}
+      >
+        <AccordionSummary
+          classes={{
+            root: classes.accordionSummary,
+            content: classes.accordionSummaryContent,
+          }}
+          expandIcon={<ExpandMoreIcon className={classes.icon} />}
+          IconButtonProps={{ size: 'small' }}
         >
-          <AccordionSummary
-            classes={{
-              root: classes.accordionSummary,
-              content: classes.accordionSummaryContent,
-            }}
-            expandIcon={<ExpandMoreIcon className={classes.icon} />}
-            IconButtonProps={{ size: 'small' }}
+          {expanded
+            ? 'Collapse'
+            : definedTypes.filter(t => t.value === selected)[0]!.name}
+        </AccordionSummary>
+        <AccordionDetails classes={{ root: classes.accordionDetails }}>
+          <List
+            className={classes.list}
+            component="nav"
+            aria-label="filter by type"
+            disablePadding
+            dense
           >
-            {expanded
-              ? 'Collapse'
-              : definedTypes.filter(t => t.value === selected)[0]!.name}
-          </AccordionSummary>
-          <AccordionDetails classes={{ root: classes.accordionDetails }}>
-            <List
-              className={classes.list}
-              component="nav"
-              aria-label="filter by type"
-              disablePadding
-              dense
-            >
-              {definedTypes.map(type => (
-                <Fragment key={type.value}>
-                  <Divider />
-                  <ListItem
-                    selected={
-                      types[0] === type.value ||
-                      (types.length === 0 && type.value === '')
-                    }
-                    onClick={handleClick(type.value)}
-                    button
-                  >
-                    <ListItemIcon>
-                      {cloneElement(type.icon, {
-                        className: classes.listItemIcon,
-                      })}
-                    </ListItemIcon>
-                    <ListItemText
-                      primary={type.name}
-                      secondary={resultCounts && resultCounts[type.value]}
-                    />
-                  </ListItem>
-                </Fragment>
-              ))}
-            </List>
-          </AccordionDetails>
-        </Accordion>
-      </CardContent>
-    </Card>
+            {definedTypes.map(type => (
+              <Fragment key={type.value}>
+                <Divider />
+                <ListItem
+                  selected={
+                    types[0] === type.value ||
+                    (types.length === 0 && type.value === '')
+                  }
+                  onClick={handleClick(type.value)}
+                  button
+                >
+                  <ListItemIcon>
+                    {cloneElement(type.icon, {
+                      className: classes.listItemIcon,
+                    })}
+                  </ListItemIcon>
+                  <ListItemText
+                    primary={type.name}
+                    secondary={resultCounts && resultCounts[type.value]}
+                  />
+                </ListItem>
+              </Fragment>
+            ))}
+          </List>
+        </AccordionDetails>
+      </Accordion>
+    </Box>
   );
 };
diff --git a/plugins/signals-backend/CHANGELOG.md b/plugins/signals-backend/CHANGELOG.md
index e9033604f0..1f150846bf 100644
--- a/plugins/signals-backend/CHANGELOG.md
+++ b/plugins/signals-backend/CHANGELOG.md
@@ -1,5 +1,106 @@
 # @backstage/plugin-signals-backend
 
+## 0.2.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.2.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- 1e624ca: Restrict `@types/express` version range from `*` to `^4.17.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- a1e01ff: The signals backend now supports scaled deployments where clients may be connecting to one of many signal backend instances.
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-node@0.1.14
+
+## 0.2.3-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.3
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- a1e01ff: The signals backend now supports scaled deployments where clients may be connecting to one of many signal backend instances.
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.0
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/signals-backend/dev/index.ts b/plugins/signals-backend/dev/index.ts
index 39021a9fcd..6cb97d4bd9 100644
--- a/plugins/signals-backend/dev/index.ts
+++ b/plugins/signals-backend/dev/index.ts
@@ -52,7 +52,7 @@ const signalDebug = createBackendPlugin({
 });
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 backend.add(import('@backstage/plugin-auth-backend'));
 backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
 backend.add(import('../src'));
diff --git a/plugins/signals-backend/package.json b/plugins/signals-backend/package.json
index dce239fee6..d02600143e 100644
--- a/plugins/signals-backend/package.json
+++ b/plugins/signals-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-backend",
-  "version": "0.2.1",
+  "version": "0.2.4-next.2",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "signals",
@@ -44,12 +44,11 @@
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/plugin-signals-node": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@types/express": "*",
+    "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "http-proxy-middleware": "^2.0.0",
-    "node-fetch": "^2.7.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "winston": "^3.2.1",
     "ws": "^8.18.0",
     "yn": "^4.0.0"
diff --git a/plugins/signals-node/CHANGELOG.md b/plugins/signals-node/CHANGELOG.md
index cad3a86f16..942c47d4ef 100644
--- a/plugins/signals-node/CHANGELOG.md
+++ b/plugins/signals-node/CHANGELOG.md
@@ -1,5 +1,95 @@
 # @backstage/plugin-signals-node
 
+## 0.1.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-events-node@0.4.6-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+
+## 0.1.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-events-node@0.4.6-next.1
+
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-events-node@0.4.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/types@1.2.0
+
+## 0.1.14
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- 5d74716: Remove unused backend-common dependency
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/plugin-events-node@0.4.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+
+## 0.1.14-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+
+## 0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.5-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## 0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-events-node@0.4.4-next.1
+
+## 0.1.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/signals-node/package.json b/plugins/signals-node/package.json
index e74816f1a2..4e0d5a2212 100644
--- a/plugins/signals-node/package.json
+++ b/plugins/signals-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-node",
-  "version": "0.1.12",
+  "version": "0.1.15-next.2",
   "description": "Node.js library for the signals plugin",
   "backstage": {
     "role": "node-library",
@@ -37,14 +37,13 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-events-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "express": "^4.17.1",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
diff --git a/plugins/signals-react/CHANGELOG.md b/plugins/signals-react/CHANGELOG.md
index efd2612ed4..9d95a4c6b8 100644
--- a/plugins/signals-react/CHANGELOG.md
+++ b/plugins/signals-react/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-signals-react
 
+## 0.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/types@1.2.0
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.2.0
+  - @backstage/core-plugin-api@1.10.1
+
 ## 0.0.6
 
 ### Patch Changes
diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json
index c76a8c1b4e..e665f58814 100644
--- a/plugins/signals-react/package.json
+++ b/plugins/signals-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-react",
-  "version": "0.0.6",
+  "version": "0.0.8-next.0",
   "description": "Web library for the signals plugin",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/signals/CHANGELOG.md b/plugins/signals/CHANGELOG.md
index df76a97efe..daf237cbd1 100644
--- a/plugins/signals/CHANGELOG.md
+++ b/plugins/signals/CHANGELOG.md
@@ -1,5 +1,83 @@
 # @backstage/plugin-signals
 
+## 0.0.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+
+## 0.0.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.0.12
+
+### Patch Changes
+
+- 4e58bc7: Upgrade to uuid v11 internally
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/core-components@0.16.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/plugin-signals-react@0.0.7
+
+## 0.0.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## 0.0.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
+## 0.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+
 ## 0.0.11
 
 ### Patch Changes
diff --git a/plugins/signals/package.json b/plugins/signals/package.json
index 902fea08c6..46a061bce9 100644
--- a/plugins/signals/package.json
+++ b/plugins/signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals",
-  "version": "0.0.11",
+  "version": "0.0.14-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "signals",
@@ -47,7 +47,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
     "react-use": "^17.2.4",
-    "uuid": "^9.0.0"
+    "uuid": "^11.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 40a50f4e5e..83b4e6aff5 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,125 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.43-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.26.0-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/test-utils@1.7.3-next.1
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-techdocs@1.11.3-next.2
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 1.0.43-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/plugin-catalog@1.25.2-next.1
+  - @backstage/plugin-techdocs@1.11.3-next.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 1.0.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/plugin-techdocs@1.11.3-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/test-utils@1.7.3-next.0
+  - @backstage/plugin-catalog@1.25.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## 1.0.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0
+  - @backstage/plugin-techdocs@1.11.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-app-api@1.15.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.1
+  - @backstage/test-utils@1.7.1
+  - @backstage/plugin-search-react@1.8.2
+
+## 1.0.41-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.25.0-next.3
+  - @backstage/plugin-techdocs@1.11.1-next.3
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 1.0.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.1-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs@1.11.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 1.0.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.11.1-next.1
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.1-next.0
+  - @backstage/plugin-catalog@1.24.1-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 1.0.41-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.11.1-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration-react@1.2.0
+  - @backstage/test-utils@1.7.0
+  - @backstage/plugin-catalog@1.24.1-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-react@1.8.2-next.0
+
 ## 1.0.40
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index e72b9c5a08..5e02da282f 100644
--- a/plugins/techdocs-addons-test-utils/package.json
+++ b/plugins/techdocs-addons-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-addons-test-utils",
-  "version": "1.0.40",
+  "version": "1.0.43-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "techdocs-addons",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 6d9b39d5ed..af73504d8d 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,150 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.11.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-catalog-node@1.15.0-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.2
+  - @backstage/plugin-techdocs-node@1.12.15-next.2
+  - @backstage/catalog-client@1.9.0-next.2
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/plugin-catalog-common@1.1.2-next.0
+  - @backstage/plugin-permission-common@0.8.3-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.11.4-next.1
+
+### Patch Changes
+
+- 5c9cc05: Use native fetch instead of node-fetch
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.15.0-next.1
+  - @backstage/catalog-client@1.9.0-next.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.1
+
+## 1.11.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.3.4-next.0
+  - @backstage/plugin-techdocs-node@1.12.15-next.0
+  - @backstage/catalog-client@1.8.1-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-catalog-node@1.14.1-next.0
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.11.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0
+  - @backstage/config@1.3.0
+  - @backstage/plugin-catalog-node@1.14.0
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-permission-common@0.8.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-catalog-common@1.1.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13
+
+## 1.11.2-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.3
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.3
+
+## 1.11.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.8.0-next.1
+  - @backstage/plugin-catalog-node@1.14.0-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.2
+
+## 1.11.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-node@1.14.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.1
+
+## 1.11.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.14.0-next.0
+  - @backstage/catalog-client@1.8.0-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.3.2-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-node@1.12.13-next.0
+
 ## 1.11.0
 
 ### Minor Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 8b6957a9a3..95d87a2d37 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "1.11.0",
+  "version": "1.11.4-next.2",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
   "backstage": {
     "role": "backend-plugin",
@@ -77,7 +77,6 @@
     "fs-extra": "^11.2.0",
     "knex": "^3.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.7.0",
     "p-limit": "^3.1.0",
     "winston": "^3.2.1"
   },
@@ -85,7 +84,7 @@
     "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
-    "msw": "^1.0.0",
+    "msw": "^2.0.0",
     "supertest": "^7.0.0"
   },
   "configSchema": "config.d.ts"
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts
index e010856792..c825f0dbb7 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts
@@ -22,7 +22,7 @@ import {
   registerMswTestHooks,
 } from '@backstage/backend-test-utils';
 import { setupServer } from 'msw/node';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import { ConfigReader } from '@backstage/config';
 import { TECHDOCS_ANNOTATION } from '@backstage/plugin-techdocs-common';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
@@ -106,12 +106,12 @@ describe('TechDocs Collator', () => {
       });
 
       worker.use(
-        rest.get(
+        http.get(
           'http://test-backend/static/docs/default/Component/test-entity-with-docs/search/search_index.json',
-          (_, res, ctx) => res(ctx.status(200), ctx.json(mockSearchDocIndex)),
+          () => HttpResponse.json(mockSearchDocIndex),
         ),
-        rest.get('http://test-backend/entities', (_, res, ctx) =>
-          res(ctx.status(200), ctx.json(expectedEntities)),
+        http.get('http://test-backend/entities', () =>
+          HttpResponse.json(expectedEntities),
         ),
       );
     });
@@ -164,12 +164,12 @@ describe('TechDocs Collator', () => {
       });
 
       worker.use(
-        rest.get(
+        http.get(
           'http://test-backend/static/docs/default/component/test-entity-with-docs/search/search_index.json',
-          (_, res, ctx) => res(ctx.status(200), ctx.json(mockSearchDocIndex)),
+          () => HttpResponse.json(mockSearchDocIndex),
         ),
-        rest.get('http://test-backend/entities', (_, res, ctx) =>
-          res(ctx.status(200), ctx.json(expectedEntities)),
+        http.get('http://test-backend/entities', () =>
+          HttpResponse.json(expectedEntities),
         ),
       );
     });
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
index 635833676c..3e852971a9 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -21,7 +21,6 @@ import {
   RELATION_OWNED_BY,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
-import fetch from 'node-fetch';
 import unescape from 'lodash/unescape';
 import { Logger } from 'winston';
 import pLimit from 'p-limit';
diff --git a/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts b/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts
index a611613716..bef5a9c433 100644
--- a/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts
+++ b/plugins/techdocs-backend/src/service/DocsSynchronizer.test.ts
@@ -27,28 +27,23 @@ import * as winston from 'winston';
 import { TechDocsCache } from '../cache';
 import { DocsBuilder, shouldCheckForUpdate } from '../DocsBuilder';
 import { DocsSynchronizer, DocsSynchronizerSyncOpts } from './DocsSynchronizer';
-import { mockServices } from '@backstage/backend-test-utils';
+import {
+  mockServices,
+  registerMswTestHooks,
+} from '@backstage/backend-test-utils';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
 
 jest.mock('../DocsBuilder');
 jest.useFakeTimers();
 
-jest.mock('node-fetch', () => ({
-  __esModule: true,
-  default: async () => {
-    return {
-      json: async () => {
-        return {
-          build_timestamp: 123,
-        };
-      },
-    };
-  },
-}));
-
 const MockedDocsBuilder = DocsBuilder as jest.MockedClass<typeof DocsBuilder>;
 
 describe('DocsSynchronizer', () => {
+  const worker = setupServer();
+  registerMswTestHooks(worker);
+
   const preparers: jest.Mocked<PreparerBuilder> = {
     register: jest.fn(),
     get: jest.fn(),
@@ -101,6 +96,13 @@ describe('DocsSynchronizer', () => {
       scmIntegrations: ScmIntegrations.fromConfig(new ConfigReader({})),
       cache,
     });
+
+    worker.use(
+      http.get(
+        'http://backstage.local/api/techdocs/static/docs/default/component/test/techdocs_metadata.json',
+        () => HttpResponse.json({ build_timestamp: 123 }),
+      ),
+    );
   });
 
   afterEach(() => {
diff --git a/plugins/techdocs-backend/src/service/DocsSynchronizer.ts b/plugins/techdocs-backend/src/service/DocsSynchronizer.ts
index e4b67e920e..a1375ec142 100644
--- a/plugins/techdocs-backend/src/service/DocsSynchronizer.ts
+++ b/plugins/techdocs-backend/src/service/DocsSynchronizer.ts
@@ -27,7 +27,6 @@ import {
   PreparerBuilder,
   PublisherBase,
 } from '@backstage/plugin-techdocs-node';
-import fetch from 'node-fetch';
 import pLimit, { Limit } from 'p-limit';
 import { PassThrough } from 'stream';
 import * as winston from 'winston';
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index 0278e8ad74..53dff26045 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 1.1.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 1.1.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## 1.1.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+
+## 1.1.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 1.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 1.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+
 ## 1.1.16
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 0c140bc5af..38409d7da1 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-module-addons-contrib",
-  "version": "1.1.16",
+  "version": "1.1.19-next.2",
   "description": "Plugin module for contributed TechDocs Addons",
   "backstage": {
     "role": "frontend-plugin-module",
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index eb21d4c853..aaa30561a0 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,118 @@
 # @backstage/plugin-techdocs-node
 
+## 1.12.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-aws-node@0.1.14-next.0
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.15-next.0
+
+### Patch Changes
+
+- 5f04976: Fixed a bug that caused missing code in published packages.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/integration-aws-node@0.1.13
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration@1.15.2
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.13-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration-aws-node@0.1.13-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.15.1
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
 ## 1.12.12
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index 02134322cd..00af4b6925 100644
--- a/plugins/techdocs-node/package.json
+++ b/plugins/techdocs-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-node",
-  "version": "1.12.12",
+  "version": "1.12.15-next.2",
   "description": "Common node.js functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 8c5fca7d60..f7718a56ae 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,86 @@
 # @backstage/plugin-techdocs-react
 
+## 1.2.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.10
+
+### Patch Changes
+
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/core-components@0.16.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
+## 1.2.10-next.0
+
+### Patch Changes
+
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/version-bridge@1.0.10
+
 ## 1.2.9
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index b7fc534409..63975614ca 100644
--- a/plugins/techdocs-react/package.json
+++ b/plugins/techdocs-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-react",
-  "version": "1.2.9",
+  "version": "1.2.12-next.2",
   "description": "Shared frontend utilities for TechDocs and Addons",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 8ed8ff6cde..4b26300756 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,199 @@
 # @backstage/plugin-techdocs
 
+## 1.11.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/config@1.3.1-next.0
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/integration@1.16.0-next.1
+  - @backstage/integration-react@1.2.2-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.2
+  - @backstage/plugin-search-common@1.2.16-next.0
+  - @backstage/plugin-search-react@1.8.4-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.2
+
+## 1.11.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.1
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.4-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.1
+
+## 1.11.3-next.0
+
+### Patch Changes
+
+- 7d8777d: Added support for the Search bar in docs residing in the entity page tab, and not only the global "/docs" page.
+- Updated dependencies
+  - @backstage/integration@1.16.0-next.0
+  - @backstage/plugin-search-react@1.8.4-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/config@1.3.0
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/integration-react@1.2.2-next.0
+  - @backstage/plugin-auth-react@0.1.10-next.0
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.12-next.0
+
+## 1.11.1
+
+### Patch Changes
+
+- 37a7810: Fixed an issue where `<TechDocsReaderPageContent />` would re-render infinitely under certain conditions.
+- e937ae7: Fix an issue with index page of documentation site being re-rendered.
+- 90246a9: Fix techdocs config schema for custom elements sanitizer
+- 605bdc0: Avoid page re-rendering when clicking on anchor links in the same documentation page.
+- 4f0cb89: Added DomPurify sanitizer configuration for custom elements implementing RFC https://github.com/backstage/backstage/issues/26988.
+  See https://backstage.io/docs/features/techdocs/how-to-guides#how-to-enable-custom-elements-in-techdocs for how to enable it in the configuration.
+- f246178: Removed `canvas` dev dependency.
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/theme@0.6.1
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/plugin-techdocs-react@1.2.10
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/integration@1.15.2
+  - @backstage/integration-react@1.2.1
+  - @backstage/plugin-auth-react@0.1.8
+  - @backstage/plugin-search-common@1.2.15
+  - @backstage/plugin-search-react@1.8.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.11.1-next.3
+
+### Patch Changes
+
+- e937ae7: Fix an issue with index page of documentation site being re-rendered.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.2
+
+## 1.11.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 1.11.1-next.1
+
+### Patch Changes
+
+- 90246a9: Fix techdocs config schema for custom elements sanitizer
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/plugin-auth-react@0.1.8-next.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.1
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.1
+
+## 1.11.1-next.0
+
+### Patch Changes
+
+- 605bdc0: Avoid page re-rendering when clicking on anchor links in the same documentation page.
+- 4f0cb89: Added DomPurify sanitizer configuration for custom elements implementing RFC https://github.com/backstage/backstage/issues/26988.
+  See https://backstage.io/docs/features/techdocs/how-to-guides#how-to-enable-custom-elements-in-techdocs for how to enable it in the configuration.
+- f246178: Removed `canvas` dev dependency.
+- 4a2f73a: Fix an issue that caused the current documentation page to be re-rendered when navigating to
+  another one.
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/plugin-techdocs-react@1.2.10-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/integration@1.15.1
+  - @backstage/integration-react@1.2.0
+  - @backstage/theme@0.6.0
+  - @backstage/plugin-auth-react@0.1.8-next.0
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.2-next.0
+  - @backstage/plugin-techdocs-common@0.1.0
+
 ## 1.11.0
 
 ### Minor Changes
diff --git a/plugins/techdocs/config.d.ts b/plugins/techdocs/config.d.ts
index 6103f273b5..bfc98a7927 100644
--- a/plugins/techdocs/config.d.ts
+++ b/plugins/techdocs/config.d.ts
@@ -49,7 +49,7 @@ export interface Config {
        *  this will allow all custom elements with tag name matching `^backstage-` like <backstage-custom-element /> etc.
        * @visibility frontend
        */
-      allowedCustomElementTagNameRegExp: string;
+      allowedCustomElementTagNameRegExp?: string;
       /**
        * Allows listed custom element attribute name regex
        * Example:
@@ -57,7 +57,7 @@ export interface Config {
        *  this will allow all custom element attributes matching `attribute1` or `attribute2` like <backstage-custom-element attribute1="yes" attribute2/>
        * @visibility frontend
        */
-      allowedCustomElementAttributeNameRegExp: string;
+      allowedCustomElementAttributeNameRegExp?: string;
     };
   };
 }
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 8f990e32dc..637fc42c35 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "1.11.0",
+  "version": "1.11.3-next.2",
   "description": "The Backstage plugin that renders technical documentation for your components",
   "backstage": {
     "role": "frontend-plugin",
@@ -99,7 +99,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/dompurify": "^3.0.0",
     "@types/react": "^18.0.0",
-    "canvas": "^2.10.2",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
     "react-router-dom": "^6.3.0"
diff --git a/plugins/techdocs/report-alpha.api.md b/plugins/techdocs/report-alpha.api.md
index 63e078dd43..d39c9d31ed 100644
--- a/plugins/techdocs/report-alpha.api.md
+++ b/plugins/techdocs/report-alpha.api.md
@@ -31,21 +31,6 @@ const _default: FrontendPlugin<
   },
   {},
   {
-    'api:techdocs': ExtensionDefinition<{
-      kind: 'api';
-      name: undefined;
-      config: {};
-      configInput: {};
-      output: ConfigurableExtensionDataRef<
-        AnyApiFactory,
-        'core.api.factory',
-        {}
-      >;
-      inputs: {};
-      params: {
-        factory: AnyApiFactory;
-      };
-    }>;
     'page:techdocs': ExtensionDefinition<{
       kind: 'page';
       name: undefined;
@@ -97,6 +82,21 @@ const _default: FrontendPlugin<
         routeRef: RouteRef<undefined>;
       };
     }>;
+    'api:techdocs': ExtensionDefinition<{
+      kind: 'api';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
     'api:techdocs/storage': ExtensionDefinition<{
       kind: 'api';
       name: 'storage';
diff --git a/plugins/techdocs/report.api.md b/plugins/techdocs/report.api.md
index c58a946287..2cc3934f62 100644
--- a/plugins/techdocs/report.api.md
+++ b/plugins/techdocs/report.api.md
@@ -371,6 +371,7 @@ export const TechDocsReaderPageContent: (
 export type TechDocsReaderPageContentProps = {
   entityRef?: CompoundEntityRef;
   withSearch?: boolean;
+  searchResultUrlMapper?: (url: string) => string;
   onReady?: () => void;
 };
 
@@ -431,6 +432,7 @@ export type TechDocsSearchProps = {
   entityId: CompoundEntityRef;
   entityTitle?: string;
   debounceTime?: number;
+  searchResultUrlMapper?: (url: string) => string;
 };
 
 // @public
diff --git a/plugins/techdocs/src/EntityPageDocs.tsx b/plugins/techdocs/src/EntityPageDocs.tsx
index 07222190ae..70a0517ded 100644
--- a/plugins/techdocs/src/EntityPageDocs.tsx
+++ b/plugins/techdocs/src/EntityPageDocs.tsx
@@ -25,12 +25,24 @@ import React from 'react';
 import { TechDocsReaderPage } from './plugin';
 import { TechDocsReaderPageContent } from './reader/components/TechDocsReaderPageContent';
 import { TechDocsReaderPageSubheader } from './reader/components/TechDocsReaderPageSubheader';
+import { useEntityPageTechDocsRedirect } from './search/hooks/useTechDocsLocation';
 
-type EntityPageDocsProps = { entity: Entity };
+type EntityPageDocsProps = {
+  entity: Entity;
+  /**
+   * Show or hide the content search bar, defaults to true.
+   */
+  withSearch?: boolean;
+};
 
-export const EntityPageDocs = ({ entity }: EntityPageDocsProps) => {
+export const EntityPageDocs = ({
+  entity,
+  withSearch = true,
+}: EntityPageDocsProps) => {
   let entityRef = getCompoundEntityRef(entity);
 
+  const searchResultUrlMapper = useEntityPageTechDocsRedirect(entityRef);
+
   if (entity.metadata.annotations?.[TECHDOCS_EXTERNAL_ANNOTATION]) {
     try {
       entityRef = parseEntityRef(
@@ -44,7 +56,10 @@ export const EntityPageDocs = ({ entity }: EntityPageDocsProps) => {
   return (
     <TechDocsReaderPage entityRef={entityRef}>
       <TechDocsReaderPageSubheader />
-      <TechDocsReaderPageContent withSearch={false} />
+      <TechDocsReaderPageContent
+        withSearch={withSearch}
+        searchResultUrlMapper={searchResultUrlMapper}
+      />
     </TechDocsReaderPage>
   );
 };
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx
index 21418a716e..f8b3129feb 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx
@@ -64,6 +64,13 @@ export type TechDocsReaderPageContentProps = {
    * Show or hide the search bar, defaults to true.
    */
   withSearch?: boolean;
+  /**
+   * If {@link TechDocsReaderPageContentProps.withSearch | withSearch} is true,
+   * this will redirect the search result urls, e.g. turn search results into
+   * links within the "Docs" tab of the entity page, instead of the global docs
+   * page.
+   */
+  searchResultUrlMapper?: (url: string) => string;
   /**
    * Callback called when the content is rendered.
    */
@@ -76,7 +83,7 @@ export type TechDocsReaderPageContentProps = {
  */
 export const TechDocsReaderPageContent = withTechDocsReaderProvider(
   (props: TechDocsReaderPageContentProps) => {
-    const { withSearch = true, onReady } = props;
+    const { withSearch = true, searchResultUrlMapper, onReady } = props;
     const classes = useStyles();
 
     const {
@@ -142,6 +149,7 @@ export const TechDocsReaderPageContent = withTechDocsReaderProvider(
               <TechDocsSearch
                 entityId={entityRef}
                 entityTitle={entityMetadata?.metadata?.title}
+                searchResultUrlMapper={searchResultUrlMapper}
               />
             </Grid>
           )}
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
index 3656d22326..8d23ed7b8b 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx
@@ -47,6 +47,7 @@ import {
   handleMetaRedirects,
 } from '../../transformers';
 import { useNavigateUrl } from './useNavigateUrl';
+import { useParams } from 'react-router-dom';
 
 const MOBILE_MEDIA_QUERY = 'screen and (max-width: 76.1875em)';
 
@@ -69,6 +70,7 @@ export const useTechDocsReaderDom = (
   const scmIntegrationsApi = useApi(scmIntegrationsApiRef);
 
   const { state, path, content: rawPage } = useTechDocsReader();
+  const { '*': currPath = '' } = useParams();
 
   const [dom, setDom] = useState<HTMLElement | null>(null);
   const isStyleLoading = useShadowDomStylesLoading(dom);
@@ -277,8 +279,8 @@ export const useTechDocsReaderDom = (
       }
 
       // Skip this update if the location's path has changed but the state
-      // contains a page for another page that isn't loaded yet.
-      if (!window.location.pathname.endsWith(path)) {
+      // contains a page that isn't loaded yet.
+      if (currPath !== path) {
         return;
       }
 
@@ -297,7 +299,7 @@ export const useTechDocsReaderDom = (
     return () => {
       shouldReplaceContent = false;
     };
-  }, [rawPage, path, preRender, postRender]);
+  }, [rawPage, currPath, path, preRender, postRender]);
 
   return dom;
 };
diff --git a/plugins/techdocs/src/reader/components/useReaderState.test.tsx b/plugins/techdocs/src/reader/components/useReaderState.test.tsx
index 60898ab288..cfa7d76ba1 100644
--- a/plugins/techdocs/src/reader/components/useReaderState.test.tsx
+++ b/plugins/techdocs/src/reader/components/useReaderState.test.tsx
@@ -687,5 +687,43 @@ describe('useReaderState', () => {
         expect.any(Function),
       );
     });
+
+    it('should return the same data if re-rendered', async () => {
+      techdocsStorageApi.getEntityDocs.mockResolvedValue('my content');
+      techdocsStorageApi.syncEntityDocs.mockImplementation(async () => {
+        return 'cached';
+      });
+
+      const { result, rerender } = renderHook(
+        () => useReaderState('Component', 'default', 'backstage', '/example'),
+        { wrapper: Wrapper },
+      );
+
+      expect(result.current).toEqual({
+        state: 'CHECKING',
+        path: '/example',
+        content: undefined,
+        contentErrorMessage: undefined,
+        syncErrorMessage: undefined,
+        buildLog: [],
+        contentReload: expect.any(Function),
+      });
+
+      await waitFor(() => {
+        expect(result.current).toEqual({
+          state: 'CONTENT_FRESH',
+          path: '/example',
+          content: 'my content',
+          contentErrorMessage: undefined,
+          syncErrorMessage: undefined,
+          buildLog: [],
+          contentReload: expect.any(Function),
+        });
+      });
+      const firstResult = result.current;
+
+      rerender();
+      expect(result.current).toBe(firstResult);
+    });
   });
 });
diff --git a/plugins/techdocs/src/reader/components/useReaderState.ts b/plugins/techdocs/src/reader/components/useReaderState.ts
index 251ae6e3d5..459c6a3728 100644
--- a/plugins/techdocs/src/reader/components/useReaderState.ts
+++ b/plugins/techdocs/src/reader/components/useReaderState.ts
@@ -343,13 +343,24 @@ export function useReaderState(
     [state.activeSyncState, state.content, state.contentLoading],
   );
 
-  return {
-    state: displayState,
-    contentReload,
-    path: state.path,
-    content: state.content,
-    contentErrorMessage: state.contentError?.toString(),
-    syncErrorMessage: state.syncError?.toString(),
-    buildLog: state.buildLog,
-  };
+  return useMemo(
+    () => ({
+      state: displayState,
+      contentReload,
+      path: state.path,
+      content: state.content,
+      contentErrorMessage: state.contentError?.toString(),
+      syncErrorMessage: state.syncError?.toString(),
+      buildLog: state.buildLog,
+    }),
+    [
+      displayState,
+      contentReload,
+      state.path,
+      state.content,
+      state.contentError,
+      state.syncError,
+      state.buildLog,
+    ],
+  );
 }
diff --git a/plugins/techdocs/src/search/components/TechDocsSearch.tsx b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
index ce77d547db..b283581fa2 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearch.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
@@ -34,6 +34,7 @@ export type TechDocsSearchProps = {
   entityId: CompoundEntityRef;
   entityTitle?: string;
   debounceTime?: number;
+  searchResultUrlMapper?: (url: string) => string;
 };
 
 type TechDocsDoc = {
@@ -58,7 +59,12 @@ const isTechDocsSearchResult = (
 };
 
 const TechDocsSearchBar = (props: TechDocsSearchProps) => {
-  const { entityId, entityTitle, debounceTime = 150 } = props;
+  const {
+    entityId,
+    entityTitle,
+    debounceTime = 150,
+    searchResultUrlMapper,
+  } = props;
   const [open, setOpen] = useState(false);
   const navigate = useNavigate();
   const {
@@ -102,7 +108,9 @@ const TechDocsSearchBar = (props: TechDocsSearchProps) => {
   ) => {
     if (isTechDocsSearchResult(selection)) {
       const { location } = selection.document;
-      navigate(location);
+      navigate(
+        searchResultUrlMapper ? searchResultUrlMapper(location) : location,
+      );
     }
   };
 
diff --git a/plugins/techdocs/src/search/hooks/useTechDocsLocation.ts b/plugins/techdocs/src/search/hooks/useTechDocsLocation.ts
new file mode 100644
index 0000000000..737dd2839c
--- /dev/null
+++ b/plugins/techdocs/src/search/hooks/useTechDocsLocation.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useMemo } from 'react';
+
+import { CompoundEntityRef } from '@backstage/catalog-model';
+import { useRouteRef } from '@backstage/core-plugin-api';
+
+import { rootCatalogDocsRouteRef, rootDocsRouteRef } from '../../routes';
+
+const trimStartSlash = (path: string) => path.replace(/^\/+/, '');
+const trimEndSlash = (path: string) => path.replace(/\/+$/, '');
+
+/**
+ * Returns a function that takes a location to a Tech Docs entry, and returns a
+ * new location, re-routed to the catalog page tab.
+ *
+ * @internal
+ */
+export function useEntityPageTechDocsRedirect(entityRef: CompoundEntityRef) {
+  const { kind, name, namespace } = entityRef;
+
+  const routeDocsRoot = useRouteRef(rootDocsRouteRef);
+  const routeDocsCatalog = useRouteRef(rootCatalogDocsRouteRef);
+
+  // Re-routes a /docs/:namespace/:kind/:name/* location into
+  // /catalog/:namespace/:kind/:name/docs/*, while handling situations where
+  // these defaults are changed.
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const reRouteLocationToCatalog = useMemo(() => {
+    const rootDocsPath = trimEndSlash(routeDocsRoot({ kind, namespace, name }));
+    const catalogDocsPath = trimEndSlash(routeDocsCatalog());
+
+    return (url: string): string => {
+      if (
+        url
+          .toLocaleLowerCase('en-US')
+          .startsWith(rootDocsPath.toLocaleLowerCase('en-US'))
+      ) {
+        const suffix = trimStartSlash(url.slice(rootDocsPath.length));
+        return suffix.length === 0 || suffix.startsWith('#')
+          ? `${catalogDocsPath}${suffix}`
+          : `${catalogDocsPath}/${suffix}`;
+      }
+      return url;
+    };
+  }, [routeDocsRoot, routeDocsCatalog, kind, name, namespace]);
+
+  return reRouteLocationToCatalog;
+}
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index 2ce9d0e06a..43a06fba57 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,117 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.2.28-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.2
+  - @backstage/backend-plugin-api@1.1.0-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.2
+  - @backstage/plugin-signals-node@0.1.15-next.2
+  - @backstage/config@1.3.1-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.28-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.5-next.1
+  - @backstage/backend-defaults@0.6.0-next.1
+  - @backstage/backend-plugin-api@1.1.0-next.1
+  - @backstage/plugin-signals-node@0.1.15-next.1
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.6.0-next.0
+  - @backstage/backend-plugin-api@1.0.3-next.0
+  - @backstage/plugin-auth-node@0.5.5-next.0
+  - @backstage/config@1.3.0
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-node@0.1.15-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.27
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.3.0
+  - @backstage/backend-defaults@0.5.3
+  - @backstage/types@1.2.0
+  - @backstage/plugin-auth-node@0.5.4
+  - @backstage/backend-plugin-api@1.0.2
+  - @backstage/plugin-signals-node@0.1.14
+  - @backstage/errors@1.2.5
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.27-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.3
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/plugin-signals-node@0.1.14-next.3
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.27-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.2
+  - @backstage/plugin-auth-node@0.5.4-next.2
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.2
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.2-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.5.4-next.1
+  - @backstage/plugin-signals-node@0.1.14-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.2.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.4-next.0
+  - @backstage/backend-defaults@0.5.3-next.0
+  - @backstage/backend-plugin-api@1.0.2-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.14-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.2.25
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index 2d2cf939af..93942be61f 100644
--- a/plugins/user-settings-backend/package.json
+++ b/plugins/user-settings-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings-backend",
-  "version": "0.2.25",
+  "version": "0.2.28-next.2",
   "description": "The Backstage backend plugin to manage user settings",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/user-settings-backend/src/database/DatabaseUserSettingsStore.test.ts b/plugins/user-settings-backend/src/database/DatabaseUserSettingsStore.test.ts
index eb50e26179..3b8b18e61c 100644
--- a/plugins/user-settings-backend/src/database/DatabaseUserSettingsStore.test.ts
+++ b/plugins/user-settings-backend/src/database/DatabaseUserSettingsStore.test.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
+import {
+  TestDatabaseId,
+  TestDatabases,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { Knex } from 'knex';
 import {
   DatabaseUserSettingsStore,
@@ -29,12 +33,7 @@ const databases = TestDatabases.create({
 
 async function createStore(databaseId: TestDatabaseId) {
   const knex = await databases.init(databaseId);
-  const databaseManager = {
-    getClient: async () => knex,
-    migrations: {
-      skip: false,
-    },
-  };
+  const databaseManager = mockServices.database({ knex });
 
   return {
     knex,
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index bcd0baf1ea..90a75362e3 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,149 @@
 # @backstage/plugin-user-settings
 
+## 0.8.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.4-next.2
+  - @backstage/plugin-catalog-react@1.14.3-next.2
+  - @backstage/errors@1.2.6-next.0
+  - @backstage/catalog-model@1.7.2-next.0
+  - @backstage/core-app-api@1.15.3-next.1
+  - @backstage/core-components@0.16.2-next.2
+  - @backstage/core-plugin-api@1.10.2-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.2
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.8-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.3-next.1
+  - @backstage/core-components@0.16.2-next.1
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/core-compat-api@0.3.4-next.1
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.3-next.1
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.15.3-next.0
+  - @backstage/plugin-catalog-react@1.14.3-next.0
+  - @backstage/frontend-plugin-api@0.9.3-next.0
+  - @backstage/theme@0.6.3-next.0
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.4-next.0
+  - @backstage/core-components@0.16.2-next.0
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/types@1.2.0
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1
+  - @backstage/types@1.2.0
+  - @backstage/plugin-catalog-react@1.14.1
+  - @backstage/core-components@0.16.0
+  - @backstage/core-app-api@1.15.2
+  - @backstage/catalog-model@1.7.1
+  - @backstage/core-compat-api@0.3.2
+  - @backstage/core-plugin-api@1.10.1
+  - @backstage/errors@1.2.5
+  - @backstage/frontend-plugin-api@0.9.1
+  - @backstage/plugin-signals-react@0.0.7
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.15-next.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.2
+  - @backstage/plugin-catalog-react@1.14.1-next.3
+  - @backstage/core-compat-api@0.3.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.2
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.1-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.1
+  - @backstage/core-components@0.16.0-next.1
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.1
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## 0.8.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.16.0-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1
+  - @backstage/core-compat-api@0.3.2-next.0
+  - @backstage/core-plugin-api@1.10.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.1-next.0
+  - @backstage/theme@0.6.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-react@1.14.1-next.0
+  - @backstage/plugin-signals-react@0.0.6
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.8.14
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 539c1e39e7..6aaadd9161 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.8.14",
+  "version": "0.8.17-next.2",
   "description": "A Backstage plugin that provides a settings page",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/storybook/.storybook/main.ts b/storybook/.storybook/main.ts
index 50d657d8d8..e2f5baf207 100644
--- a/storybook/.storybook/main.ts
+++ b/storybook/.storybook/main.ts
@@ -43,6 +43,7 @@ const config: StorybookConfig = {
     getAbsolutePath('@chromatic-com/storybook'),
     getAbsolutePath('@storybook/addon-interactions'),
     getAbsolutePath('@storybook/addon-themes'),
+    getAbsolutePath('@storybook/addon-storysource'),
   ],
   framework: {
     name: getAbsolutePath('@storybook/react-vite'),
diff --git a/storybook/package.json b/storybook/package.json
index 3ac73efaae..0e41f658fb 100644
--- a/storybook/package.json
+++ b/storybook/package.json
@@ -14,6 +14,7 @@
     ]
   },
   "dependencies": {
+    "@storybook/addon-storysource": "^8.3.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
@@ -33,7 +34,7 @@
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^9.11.1",
-    "eslint-plugin-storybook": "^0.9.0",
+    "eslint-plugin-storybook": "^0.11.0",
     "globals": "^15.9.0",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index e7fadd0b3e..80d4a3e7fd 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -221,13 +221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@base2/pretty-print-object@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@base2/pretty-print-object@npm:1.0.1"
-  checksum: 1e8a5af578037a9d47d72f815983f9e4efb038e5f03e7635fc893194c5daa723215d71af33267893a9b618656c8eaea7be931b1c063c9b066a40994be0d23545
-  languageName: node
-  linkType: hard
-
 "@chromatic-com/storybook@npm:^1.9.0":
   version: 1.9.0
   resolution: "@chromatic-com/storybook@npm:1.9.0"
@@ -248,9 +241,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/aix-ppc64@npm:0.23.1"
+"@esbuild/aix-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/aix-ppc64@npm:0.24.0"
   conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
@@ -262,9 +255,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm64@npm:0.23.1"
+"@esbuild/android-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm64@npm:0.24.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -276,9 +269,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm@npm:0.23.1"
+"@esbuild/android-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm@npm:0.24.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -290,9 +283,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-x64@npm:0.23.1"
+"@esbuild/android-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-x64@npm:0.24.0"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -304,9 +297,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-arm64@npm:0.23.1"
+"@esbuild/darwin-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-arm64@npm:0.24.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -318,9 +311,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-x64@npm:0.23.1"
+"@esbuild/darwin-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-x64@npm:0.24.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -332,9 +325,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-arm64@npm:0.23.1"
+"@esbuild/freebsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-arm64@npm:0.24.0"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -346,9 +339,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-x64@npm:0.23.1"
+"@esbuild/freebsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-x64@npm:0.24.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -360,9 +353,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm64@npm:0.23.1"
+"@esbuild/linux-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm64@npm:0.24.0"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -374,9 +367,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm@npm:0.23.1"
+"@esbuild/linux-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm@npm:0.24.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -388,9 +381,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ia32@npm:0.23.1"
+"@esbuild/linux-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ia32@npm:0.24.0"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -402,9 +395,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-loong64@npm:0.23.1"
+"@esbuild/linux-loong64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-loong64@npm:0.24.0"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -416,9 +409,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-mips64el@npm:0.23.1"
+"@esbuild/linux-mips64el@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-mips64el@npm:0.24.0"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -430,9 +423,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ppc64@npm:0.23.1"
+"@esbuild/linux-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ppc64@npm:0.24.0"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -444,9 +437,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-riscv64@npm:0.23.1"
+"@esbuild/linux-riscv64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-riscv64@npm:0.24.0"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -458,9 +451,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-s390x@npm:0.23.1"
+"@esbuild/linux-s390x@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-s390x@npm:0.24.0"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -472,9 +465,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-x64@npm:0.23.1"
+"@esbuild/linux-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-x64@npm:0.24.0"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
@@ -486,16 +479,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/netbsd-x64@npm:0.23.1"
+"@esbuild/netbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/netbsd-x64@npm:0.24.0"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-arm64@npm:0.23.1"
+"@esbuild/openbsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-arm64@npm:0.24.0"
   conditions: os=openbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -507,9 +500,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-x64@npm:0.23.1"
+"@esbuild/openbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-x64@npm:0.24.0"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -521,9 +514,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/sunos-x64@npm:0.23.1"
+"@esbuild/sunos-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/sunos-x64@npm:0.24.0"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -535,9 +528,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-arm64@npm:0.23.1"
+"@esbuild/win32-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-arm64@npm:0.24.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -549,9 +542,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-ia32@npm:0.23.1"
+"@esbuild/win32-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-ia32@npm:0.24.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -563,9 +556,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-x64@npm:0.23.1"
+"@esbuild/win32-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-x64@npm:0.24.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -581,10 +574,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.11.0, @eslint-community/regexpp@npm:^4.4.0":
-  version: 4.11.1
-  resolution: "@eslint-community/regexpp@npm:4.11.1"
-  checksum: 6986685529d30e33c2640973c3d8e7ddd31bef3cc8cb10ad54ddc1dea12680779a2c23a45562aa1462c488137a3570e672d122fac7da22d82294382d915cec70
+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.12.1, @eslint-community/regexpp@npm:^4.4.0":
+  version: 4.12.1
+  resolution: "@eslint-community/regexpp@npm:4.12.1"
+  checksum: 0d628680e204bc316d545b4993d3658427ca404ae646ce541fcc65306b8c712c340e5e573e30fb9f85f4855c0c5f6dca9868931f2fcced06417fbe1a0c6cd2d6
   languageName: node
   linkType: hard
 
@@ -623,10 +616,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.13.0":
-  version: 9.13.0
-  resolution: "@eslint/js@npm:9.13.0"
-  checksum: ad5dd72aa75bd8d5bd3c1ffe68cf748aed7edef5fcf97193eb52af35dbb89a1999f526a0e2c169ef5572afbbbbb5f37d6fd0af2991d9ccdc29f753da5cc0f532
+"@eslint/js@npm:9.14.0":
+  version: 9.14.0
+  resolution: "@eslint/js@npm:9.14.0"
+  checksum: 727767d3c80bf88e08565af10cc3732ca0d272c729bbd39043722a203eea289ec6149ab42d977d2d28a81d99329dceeed091b70db37b868e6659913a0840e17b
   languageName: node
   linkType: hard
 
@@ -638,28 +631,28 @@ __metadata:
   linkType: hard
 
 "@eslint/plugin-kit@npm:^0.2.0":
-  version: 0.2.1
-  resolution: "@eslint/plugin-kit@npm:0.2.1"
+  version: 0.2.3
+  resolution: "@eslint/plugin-kit@npm:0.2.3"
   dependencies:
     levn: ^0.4.1
-  checksum: 3c4fc57ff1fa8f08c9c7c3f2272883fe455faf21e352bd5c7965406d60b366ae8eb913fd53e846a688eaa9eca7f8100428361ac598bd56499fced6991d7b200e
+  checksum: b93b9c3f5b1722d09cc4e609abd4510130f659f70f6417b68ac7c4ad9fbf9e3d4f0ef5b6f2bad106eb8c1c1b2146bd0391e0a1c00ddeae46c917f175b8c0da4b
   languageName: node
   linkType: hard
 
-"@humanfs/core@npm:^0.19.0":
-  version: 0.19.0
-  resolution: "@humanfs/core@npm:0.19.0"
-  checksum: d73c153e9a41efce401cdf8eaa831e5b01630b45a46678eded3803347251a24446f1500b0074750fcab0a88d947609b164a0d5bba57f58ec18167bea01c69ac5
+"@humanfs/core@npm:^0.19.1":
+  version: 0.19.1
+  resolution: "@humanfs/core@npm:0.19.1"
+  checksum: 611e0545146f55ddfdd5c20239cfb7911f9d0e28258787c4fc1a1f6214250830c9367aaaeace0096ed90b6739bee1e9c52ad5ba8adaf74ab8b449119303babfe
   languageName: node
   linkType: hard
 
-"@humanfs/node@npm:^0.16.5":
-  version: 0.16.5
-  resolution: "@humanfs/node@npm:0.16.5"
+"@humanfs/node@npm:^0.16.6":
+  version: 0.16.6
+  resolution: "@humanfs/node@npm:0.16.6"
   dependencies:
-    "@humanfs/core": ^0.19.0
+    "@humanfs/core": ^0.19.1
     "@humanwhocodes/retry": ^0.3.0
-  checksum: ae4799c6bf436450e1b1836f23fdb4ce0eb862df8e02fd498ee7d8ebe552d85fe36ccac81fcfbe39bf43cb49b302ae438d94699a451d1cfc78f64198d4b45674
+  checksum: f9cb52bb235f8b9c6fcff43a7e500669a38f8d6ce26593404a9b56365a1644e0ed60c720dc65ff6a696b1f85f3563ab055bb554ec8674f2559085ba840e47710
   languageName: node
   linkType: hard
 
@@ -670,13 +663,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/retry@npm:^0.3.0, @humanwhocodes/retry@npm:^0.3.1":
+"@humanwhocodes/retry@npm:^0.3.0":
   version: 0.3.1
   resolution: "@humanwhocodes/retry@npm:0.3.1"
   checksum: 7e5517bb51dbea3e02ab6cacef59a8f4b0ca023fc4b0b8cbc40de0ad29f46edd50b897c6e7fba79366a0217e3f48e2da8975056f6c35cfe19d9cc48f1d03c1dd
   languageName: node
   linkType: hard
 
+"@humanwhocodes/retry@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@humanwhocodes/retry@npm:0.4.0"
+  checksum: a1ea6ba7deff692f08770bea159eb53f280d6b56e6a340c238679752c3d2956797e31431a19a0e1cd303cfb130200024d3dc6bec36c7d98edd4789006d19dfd1
+  languageName: node
+  linkType: hard
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -954,9 +954,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addon-actions@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-actions@npm:8.3.6"
+"@storybook/addon-actions@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-actions@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
     "@types/uuid": ^9.0.1
@@ -964,286 +964,260 @@ __metadata:
     polished: ^4.2.2
     uuid: ^9.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 3a663297494d39d846a50d0b372977843a0cfcbb77b622cd499a95274c404e17817d324f90dc8fa22a74040200276d124719de8a703b19a3e79b98e08ed6d403
+    storybook: ^8.4.4
+  checksum: 1d9df025ec0012e8ce8e529f877d1b0df21bae35fb3d9bb442d544826641710ee800a57699f0847e7b7f561b2c5f638cfbf0c7959e5b4e28a8e36dbf8031307f
   languageName: node
   linkType: hard
 
-"@storybook/addon-backgrounds@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-backgrounds@npm:8.3.6"
+"@storybook/addon-backgrounds@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-backgrounds@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
     memoizerific: ^1.11.3
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 91a8154142dafb65f482035e373420027bc6f1664b3ae48aa459a69a466e8a69580f7398d9a70815a86b57d5ea624e9844dbe9c5fc03a9e104eff17fd11f3d14
+    storybook: ^8.4.4
+  checksum: ed094a4b62a5a0a68b11b88544969a3aa5ed9ea47b3e369c8f84d5b53ce0f88008912a790a3a8783a39b9698c5ca7d8089028a019b47d6f82fe43741151297fc
   languageName: node
   linkType: hard
 
-"@storybook/addon-controls@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-controls@npm:8.3.6"
+"@storybook/addon-controls@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-controls@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
     dequal: ^2.0.2
-    lodash: ^4.17.21
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 29eb23a769ebdff8857d604399da6478d55b82ea689df0707828be16754897fedda2997043f1d92964137aab5e40576c994de12fe355432e2c3ea12e3c99006e
+    storybook: ^8.4.4
+  checksum: 46abe5cbd484c70fe757d99535157a07e75493a76b2c4a3aa08f48bb3e547330059d24ef978cd85933dd3b5602b9abc2836a12baef61ea521636d1cfa6585be3
   languageName: node
   linkType: hard
 
-"@storybook/addon-docs@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-docs@npm:8.3.6"
+"@storybook/addon-docs@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-docs@npm:8.4.4"
   dependencies:
     "@mdx-js/react": ^3.0.0
-    "@storybook/blocks": 8.3.6
-    "@storybook/csf-plugin": 8.3.6
-    "@storybook/global": ^5.0.0
-    "@storybook/react-dom-shim": 8.3.6
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    fs-extra: ^11.1.0
+    "@storybook/blocks": 8.4.4
+    "@storybook/csf-plugin": 8.4.4
+    "@storybook/react-dom-shim": 8.4.4
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    rehype-external-links: ^3.0.0
-    rehype-slug: ^6.0.0
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 00bba806e67a83f8dcab67171f9318932ddf0d9b16da3b80923558458d85253b820982ef05419b0b1d8c7ba6bdea4b70308facc081df8102a8f989bdd470d0cd
+    storybook: ^8.4.4
+  checksum: 10154624ca94018b0a51b19915b05cde7953f22d84739e263360072fcd7e46dab94d041575e040148c8250fc4f78a0b46962eb317d7d4d256da27b1bdb513eee
   languageName: node
   linkType: hard
 
 "@storybook/addon-essentials@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/addon-essentials@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/addon-essentials@npm:8.4.4"
   dependencies:
-    "@storybook/addon-actions": 8.3.6
-    "@storybook/addon-backgrounds": 8.3.6
-    "@storybook/addon-controls": 8.3.6
-    "@storybook/addon-docs": 8.3.6
-    "@storybook/addon-highlight": 8.3.6
-    "@storybook/addon-measure": 8.3.6
-    "@storybook/addon-outline": 8.3.6
-    "@storybook/addon-toolbars": 8.3.6
-    "@storybook/addon-viewport": 8.3.6
+    "@storybook/addon-actions": 8.4.4
+    "@storybook/addon-backgrounds": 8.4.4
+    "@storybook/addon-controls": 8.4.4
+    "@storybook/addon-docs": 8.4.4
+    "@storybook/addon-highlight": 8.4.4
+    "@storybook/addon-measure": 8.4.4
+    "@storybook/addon-outline": 8.4.4
+    "@storybook/addon-toolbars": 8.4.4
+    "@storybook/addon-viewport": 8.4.4
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 4b15ece66548adfefe41bcfed67aa60526253a47b36245fa63b523986e106f7399b6a1720f59a260ae89a7629b4ebefafca3a19853c5ccecd0b2f259f8dd0c3a
+    storybook: ^8.4.4
+  checksum: c8dfe7be1eac6280e4ae801a33a02f99f47e0430920d22505b80fe8684eaabaa9c977a34f90c3265185f11ded930c5b29cdc11fbaa715eec57cab95ad4343750
   languageName: node
   linkType: hard
 
-"@storybook/addon-highlight@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-highlight@npm:8.3.6"
+"@storybook/addon-highlight@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-highlight@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: f8ca6d3d6693cba9e7e049c36c7b9ee4d8687dd305f3e87f11f1b8da2b077b6285a45c3ab7a2fe49d3ab273bd7b6b0e1161d12c9fcd0497107ed1985f7e815c6
+    storybook: ^8.4.4
+  checksum: d465e096de2cf5850b29a15dafd1e18f5f82905a164eef483aa40bfd6423aa6746dde1a01d25d71b711eed9cd24eed059874512fae174b758442c6060f1f667f
   languageName: node
   linkType: hard
 
 "@storybook/addon-interactions@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/addon-interactions@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/addon-interactions@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
-    "@storybook/instrumenter": 8.3.6
-    "@storybook/test": 8.3.6
+    "@storybook/instrumenter": 8.4.4
+    "@storybook/test": 8.4.4
     polished: ^4.2.2
     ts-dedent: ^2.2.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: ba8061346255b34d4a8131946350485e7a7d1d3c29796dac4b733385ab8e87bbf9ea01a61f557a50e9bbc7da5aec9d10a6c309ce288950f80550e87a369dde11
+    storybook: ^8.4.4
+  checksum: edd0086f06bef702bc13bfd6700dd771312f01a2f07c5019171865a24cdda44d154bf8ec5e8e57b317a281e2d2fed83ad483a6f08c138e2954e1939f4cc7fe87
   languageName: node
   linkType: hard
 
 "@storybook/addon-links@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/addon-links@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/addon-links@npm:8.4.4"
   dependencies:
     "@storybook/csf": ^0.1.11
     "@storybook/global": ^5.0.0
     ts-dedent: ^2.0.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.6
+    storybook: ^8.4.4
   peerDependenciesMeta:
     react:
       optional: true
-  checksum: 1c6a1483098e5f1292824cb038d7a0efae78a8aee86e940092200b646501a6e4713a24e422fd3dd25781f17e08276dc5156cf3f4838b92a029fff2b4f3eb4e84
+  checksum: cae8eaf94047a6521c488053279f906b140d0a017fa732527ba63fa0d692a379c8c0bc88248a02025c08563c652e86048ae2749adf619ff54dbfb17f4a60b609
   languageName: node
   linkType: hard
 
-"@storybook/addon-measure@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-measure@npm:8.3.6"
+"@storybook/addon-measure@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-measure@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
     tiny-invariant: ^1.3.1
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 1c12baf9681a7b200594ce0bd1ac4a0645994a082fc6536fb24f61be2ae529796dda1dc65b9cfc5e4947ae9036405df62f56369d8ec696a0bd6bc0dcc8a7b7ab
+    storybook: ^8.4.4
+  checksum: 2b47ac51d35365776f527ed316aad028b88b6e75471614dc17adb8f5efa5a6d2cf0718f6ab166f86fea4b1483db5871142a3e68130995fc422c787548dceed00
   languageName: node
   linkType: hard
 
-"@storybook/addon-outline@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-outline@npm:8.3.6"
+"@storybook/addon-outline@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-outline@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: eb3610cd1842c0234217745643aae4acb59af183202a885c3bb7e70a81864b49f15268e0f51bb15eef628068d93e9b76781e4cd7be42c3dbffc1c21d21cccfec
+    storybook: ^8.4.4
+  checksum: 41fcccfa5d97271d014073a75d84aa04b8c626bd7f5403b50fa9d2782ae0c6f85a9ed5821f34f9c551db6e580a1e5d079a3c9c2698cf6a7e5dc909177da25299
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-storysource@npm:^8.3.6":
+  version: 8.4.4
+  resolution: "@storybook/addon-storysource@npm:8.4.4"
+  dependencies:
+    "@storybook/source-loader": 8.4.4
+    estraverse: ^5.2.0
+    tiny-invariant: ^1.3.1
+  peerDependencies:
+    storybook: ^8.4.4
+  checksum: 0dbb3128be8f09727f0f9af921099d25eddc1e538531f2c9078cdbb6b5e29a9890cde9fc2839da25e5b68c035ba48ca8754cb1f5f15ac010ba8473b616cdefed
   languageName: node
   linkType: hard
 
 "@storybook/addon-themes@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-themes@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/addon-themes@npm:8.4.4"
   dependencies:
     ts-dedent: ^2.0.0
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: d4cd65bcb6d3b2d8bf411f10698323dc9de5f3a95f6c71729f7d23aadce53ab0c02f114c51d1fc0821d3ee51824076eafa04816ddbfe6d38784435948985b25a
+    storybook: ^8.4.4
+  checksum: b7961e1b78cd7374b47b920dbbd475d3f626f5fa98a8c43e7dadf286ba8007f194e573375dc3e6dafbc952d749134d7e6f8db0ea28f361d5986ea2f34eb8a93b
   languageName: node
   linkType: hard
 
-"@storybook/addon-toolbars@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-toolbars@npm:8.3.6"
+"@storybook/addon-toolbars@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-toolbars@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 843730ab0111d869c5b913b5ad9aa0fce24e179b6f4c43f9da3fe046a929224943b3efa54652dac290baf2940916f08487f26828afa8ad3bc1523c1a039469a4
+    storybook: ^8.4.4
+  checksum: fd18dd42833304dad2a87c27f8013187da2ebaaa219bec1bae0a269ae5c8e5696584ad5d49d8f3938dee8f29906c87b8b3db21a23aae7caacab4e878b579794f
   languageName: node
   linkType: hard
 
-"@storybook/addon-viewport@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/addon-viewport@npm:8.3.6"
+"@storybook/addon-viewport@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-viewport@npm:8.4.4"
   dependencies:
     memoizerific: ^1.11.3
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: b4cfe34ddcdab01432f9380dcb3d8f9073a26765349ac7e4f5801f83b3162e1db74c759acd914d3445721d39f72b03919a319f08f9ddfbaa623711ccaa139f23
+    storybook: ^8.4.4
+  checksum: da66546f70c437c2a0da184c76c587a526ee325931849e706518a06d598fb272ecf5838b9db52066e0548de5738efde54bd9c024a5ac626c5ca95ad1ec42bc42
   languageName: node
   linkType: hard
 
-"@storybook/blocks@npm:8.3.6, @storybook/blocks@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/blocks@npm:8.3.6"
+"@storybook/blocks@npm:8.4.4, @storybook/blocks@npm:^8.3.5":
+  version: 8.4.4
+  resolution: "@storybook/blocks@npm:8.4.4"
   dependencies:
     "@storybook/csf": ^0.1.11
-    "@storybook/global": ^5.0.0
-    "@storybook/icons": ^1.2.10
-    "@types/lodash": ^4.14.167
-    color-convert: ^2.0.1
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    markdown-to-jsx: ^7.4.5
-    memoizerific: ^1.11.3
-    polished: ^4.2.2
-    react-colorful: ^5.1.2
-    telejson: ^7.2.0
+    "@storybook/icons": ^1.2.12
     ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.6
+    storybook: ^8.4.4
   peerDependenciesMeta:
     react:
       optional: true
     react-dom:
       optional: true
-  checksum: 17b929a9b3ce585740dcd282a085ecdfc35f11393979f5eabbe8cdde9838eb6faa5e0738e20fc3e67f701092b626cbf53298ff68d5d5d370dca0a36a4a823e56
+  checksum: 65a68772c0a43a3b82b4b3fce10c6e0e324482a26020d48d1906517a9e94fcee53b63b93dbba8a796969ca957bc6b1855ea09fc440734867922f6be546fee801
   languageName: node
   linkType: hard
 
-"@storybook/builder-vite@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/builder-vite@npm:8.3.6"
+"@storybook/builder-vite@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/builder-vite@npm:8.4.4"
   dependencies:
-    "@storybook/csf-plugin": 8.3.6
-    "@types/find-cache-dir": ^3.2.1
+    "@storybook/csf-plugin": 8.4.4
     browser-assert: ^1.2.1
-    es-module-lexer: ^1.5.0
-    express: ^4.19.2
-    find-cache-dir: ^3.0.0
-    fs-extra: ^11.1.0
-    magic-string: ^0.30.0
     ts-dedent: ^2.0.0
   peerDependencies:
-    "@preact/preset-vite": "*"
-    storybook: ^8.3.6
-    typescript: ">= 4.3.x"
+    storybook: ^8.4.4
     vite: ^4.0.0 || ^5.0.0
-    vite-plugin-glimmerx: "*"
-  peerDependenciesMeta:
-    "@preact/preset-vite":
-      optional: true
-    typescript:
-      optional: true
-    vite-plugin-glimmerx:
-      optional: true
-  checksum: 3cca69f6e0188d238210d01c721a82d11f54acf3ae6e72d3eb050157a448420131e8957545027b184a13ce68a58fc3c78ea5290030357ecf15638c06bc3ea232
+  checksum: 20942824f7f9ff51b9bbbd65a70cd07d054c31043446d32a86360f26685bcdb23fc92b7da1b22b3ad241ed311ec8b5b7a2e7461796bf275e77825944137eff81
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/components@npm:8.3.6"
+"@storybook/components@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/components@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 778a114ddba6bd71ce18a8659c4c8b9b4cbcfa5665a68e3bae9467c492a218c2d95ded0825cc920984a6017f12ce811f48517812eb0de2183623cd06be677d7a
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: ca60bd5911669112af8d59e1b424e564a681e37c3f6ac59bceea69a08adddb478b965a7207f266591ec0daca74c8f674fdf3e21fdba5c794b80f13331667913a
   languageName: node
   linkType: hard
 
-"@storybook/core@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/core@npm:8.3.6"
+"@storybook/core@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/core@npm:8.4.4"
   dependencies:
     "@storybook/csf": ^0.1.11
-    "@types/express": ^4.17.21
     better-opn: ^3.0.2
     browser-assert: ^1.2.1
-    esbuild: ^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0
+    esbuild: ^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0
     esbuild-register: ^3.5.0
-    express: ^4.19.2
     jsdoc-type-pratt-parser: ^4.0.0
     process: ^0.11.10
     recast: ^0.23.5
     semver: ^7.6.2
     util: ^0.12.5
     ws: ^8.2.3
-  checksum: 06b07b544b14e9badde9f4348282d8b6103af366f7c631656f12a02beb9bc9e150c2859fcb9b72e9690c20f7c240ccc2ace0ccdc0a7cef13187161e3fc952ff3
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
+  checksum: c31995bca74d8c364046bc3f6bbe891331f8e779adaf4b113f57fd9f0c5007f23fa6bb338ffc7cb72ee39e8eec16001cd267de347f90b9aeeb42d6e712d6605e
   languageName: node
   linkType: hard
 
-"@storybook/csf-plugin@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/csf-plugin@npm:8.3.6"
+"@storybook/csf-plugin@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/csf-plugin@npm:8.4.4"
   dependencies:
     unplugin: ^1.3.1
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 08cd3f8563808889877484f112bca7bca496f3ea195e18660941f11644422282062135a40e0f5f732fee9b5d7a214baddf2a9e58eb10d5ff54bd30b61ee0923d
-  languageName: node
-  linkType: hard
-
-"@storybook/csf@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "@storybook/csf@npm:0.0.1"
-  dependencies:
-    lodash: ^4.17.15
-  checksum: fb57fa028b08a51edf44e1a2bf4be40a4607f5c6ccb58aae8924f476a42b9bbd61a0ad521cfc82196f23e6a912caae0a615e70a755e6800b284c91c509fd2de6
+    storybook: ^8.4.4
+  checksum: 109c54af8aabaa64c2eeb8b0b6f1379b3588b8c1c3d4da828e0a0c8f6479960d64adc4635e911484915ac651061aa15e218cde1dd7be27562ce8e6ba79be7cae
   languageName: node
   linkType: hard
 
@@ -1263,7 +1237,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/icons@npm:^1.2.10":
+"@storybook/icons@npm:^1.2.12":
   version: 1.2.12
   resolution: "@storybook/icons@npm:1.2.12"
   peerDependencies:
@@ -1273,56 +1247,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/instrumenter@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/instrumenter@npm:8.3.6"
+"@storybook/instrumenter@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/instrumenter@npm:8.4.4"
   dependencies:
     "@storybook/global": ^5.0.0
-    "@vitest/utils": ^2.0.5
-    util: ^0.12.4
+    "@vitest/utils": ^2.1.1
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 4e6fe75ce1418a117ff765e3e134760a23c3fac234bf25ee52c40d2e69163efff78c271a1e7836909278d528a90a670fc45af2d8b5708f5a014a5875f2992ccf
+    storybook: ^8.4.4
+  checksum: ec76f93b04471536b76134de083483369f44e5414d766a7d183b50e588a846461d5bae59fb3f6a72621c65ee9b907b43c1fb47fcbe5e56040cdf7d8c33a9050a
   languageName: node
   linkType: hard
 
-"@storybook/manager-api@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/manager-api@npm:8.3.6"
+"@storybook/manager-api@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/manager-api@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 94faf62726b948c2f8e52e15ac99f4ca2f5884a874fbecda6a81e58a03ff316d17ed36c8c146bd388bb58dad2a2bd09cd61c6d7fc1ff2cddfc774c2aed34e37c
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 9eac4488f55e1860940e0e850a48f4278a7b6e6325c7381007447626715a8f8e52d6f876f6caaa2597787fb19c40a33f96d34b56558190f7be4772cac7805ebc
   languageName: node
   linkType: hard
 
-"@storybook/preview-api@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/preview-api@npm:8.3.6"
+"@storybook/preview-api@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preview-api@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 5a645dc19308b69020da2ee282860666c6f7ebe45525802cb4da3d4e496f410a30915e570ae4a07b23d429a5d7f0c7254d9f76e6bc236ff2a85b0cc0e56b0ad0
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: ad95ce132d598e8b13da70a319ffdfaf41e5f8629cfb4552a577f3624a92d4a168e1de5220fe7c735babbd5945dd2182448a910b246a458cddde2afe7378461e
   languageName: node
   linkType: hard
 
-"@storybook/react-dom-shim@npm:8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/react-dom-shim@npm:8.3.6"
+"@storybook/react-dom-shim@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/react-dom-shim@npm:8.4.4"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.6
-  checksum: 4d65deef18aef9ad019b5b37fae511934232299418a3278c67ba396f2108e7150223c176eb42adb6ea91e35da8da6f4bbe57a96105c2201a7e6ae1bebad871e5
+    storybook: ^8.4.4
+  checksum: a1d556058ba1cb047113c60b7d0f44f00681635442ecf65cf9784907c735e44196f8daf77b5292de16f4e9a5f8c0f0342ceaf182081003945af08f721648308d
   languageName: node
   linkType: hard
 
 "@storybook/react-vite@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/react-vite@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/react-vite@npm:8.4.4"
   dependencies:
     "@joshwooding/vite-plugin-react-docgen-typescript": 0.3.0
     "@rollup/pluginutils": ^5.0.2
-    "@storybook/builder-vite": 8.3.6
-    "@storybook/react": 8.3.6
+    "@storybook/builder-vite": 8.4.4
+    "@storybook/react": 8.4.4
     find-up: ^5.0.0
     magic-string: ^0.30.0
     react-docgen: ^7.0.0
@@ -1331,85 +1304,84 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.6
+    storybook: ^8.4.4
     vite: ^4.0.0 || ^5.0.0
-  checksum: 7e2bd71e84640497595a9b8263527b2015bec29cff9743ace849e174957c3a6c4d62b216ff1f59bb31a8c11f2127042fff8a4d5ef3afb1857dba170941562b66
+  checksum: 21f13faa861389c7986d708b43861f0f414d57a4129de50d5c4d1a40596bcc28015a77e697e242a67c8fd9a54baf21fac35103919d29b7c891a051cbc1d81ba7
   languageName: node
   linkType: hard
 
-"@storybook/react@npm:8.3.6, @storybook/react@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/react@npm:8.3.6"
+"@storybook/react@npm:8.4.4, @storybook/react@npm:^8.3.5":
+  version: 8.4.4
+  resolution: "@storybook/react@npm:8.4.4"
   dependencies:
-    "@storybook/components": ^8.3.6
+    "@storybook/components": 8.4.4
     "@storybook/global": ^5.0.0
-    "@storybook/manager-api": ^8.3.6
-    "@storybook/preview-api": ^8.3.6
-    "@storybook/react-dom-shim": 8.3.6
-    "@storybook/theming": ^8.3.6
-    "@types/escodegen": ^0.0.6
-    "@types/estree": ^0.0.51
-    "@types/node": ^22.0.0
-    acorn: ^7.4.1
-    acorn-jsx: ^5.3.1
-    acorn-walk: ^7.2.0
-    escodegen: ^2.1.0
-    html-tags: ^3.1.0
-    prop-types: ^15.7.2
-    react-element-to-jsx-string: ^15.0.0
-    semver: ^7.3.7
-    ts-dedent: ^2.0.0
-    type-fest: ~2.19
-    util-deprecate: ^1.0.2
+    "@storybook/manager-api": 8.4.4
+    "@storybook/preview-api": 8.4.4
+    "@storybook/react-dom-shim": 8.4.4
+    "@storybook/theming": 8.4.4
   peerDependencies:
-    "@storybook/test": 8.3.6
+    "@storybook/test": 8.4.4
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.6
+    storybook: ^8.4.4
     typescript: ">= 4.2.x"
   peerDependenciesMeta:
     "@storybook/test":
       optional: true
     typescript:
       optional: true
-  checksum: 4df2dfbab580cc09df9e4acf5eda0e0558671a42086795a432c3987a30006136372b126258ddff5e5c28e3fea5f8e4354f10bc129f3f326d90f5845df8346d98
+  checksum: b155747739dcae8951b76f83938c032ab6a2e793e434dc738dd3d9e547e3d806efe76cecb2c4d0a1716bf83e54953f3f0a920dc501b687356457f522924cd943
   languageName: node
   linkType: hard
 
-"@storybook/test@npm:8.3.6, @storybook/test@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/test@npm:8.3.6"
+"@storybook/source-loader@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/source-loader@npm:8.4.4"
+  dependencies:
+    "@storybook/csf": ^0.1.11
+    es-toolkit: ^1.22.0
+    estraverse: ^5.2.0
+    prettier: ^3.1.1
+  peerDependencies:
+    storybook: ^8.4.4
+  checksum: 5451b9ac27874438adb4ce2ad0bce34ecce2748682c0dad4f2a6033f95cace0bafc6c5bd1ee75812d5cae4406d6e07cfd6e9c594a755f9afc6c80bdeef920925
+  languageName: node
+  linkType: hard
+
+"@storybook/test@npm:8.4.4, @storybook/test@npm:^8.3.5":
+  version: 8.4.4
+  resolution: "@storybook/test@npm:8.4.4"
   dependencies:
     "@storybook/csf": ^0.1.11
     "@storybook/global": ^5.0.0
-    "@storybook/instrumenter": 8.3.6
+    "@storybook/instrumenter": 8.4.4
     "@testing-library/dom": 10.4.0
     "@testing-library/jest-dom": 6.5.0
     "@testing-library/user-event": 14.5.2
     "@vitest/expect": 2.0.5
     "@vitest/spy": 2.0.5
-    util: ^0.12.4
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 58900591f2e70deb47581d5784e6f529debac34a0d2264ecd50139f5cf003bedf907499844181a5a947d040dadff7a223efad7b8ed8cb99be07292ec05e67d15
+    storybook: ^8.4.4
+  checksum: 28cd3e1b26f5b2b411988f5f55d7bcb0d2e15909c0ed425d099a45d47ecd9cdb9104577083f00e5129283e0ea1a73916c3bb98d748651a9c586dd29eb3c0787c
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "@storybook/theming@npm:8.3.6"
+"@storybook/theming@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/theming@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 7b40b35069225d37f71f43e35174717ba6ec8d273eef671a2d37d9745a300c5b3887fa145aee6fdbe4759b2140ddf25e8cbd569074ae1c7d44b0ccc99c1a3451
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 8a39c0c0c519a98491de3c8f29d3c9ab2d2bb5ee616933dd07aaed276cd46635e1b3019902b40dc073e7ee0679b5760234c920e455817a13e8d1d753811553ee
   languageName: node
   linkType: hard
 
 "@storybook/types@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "@storybook/types@npm:8.3.6"
+  version: 8.4.4
+  resolution: "@storybook/types@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.6
-  checksum: 7122388d848cf1d8b7d95c81b8a601d82a455d764f7a625372f344dc0402bbd398db22e1c6cedd66ca3987d61b0f8204ff757e0ff5fc2a77745094dc7b882a2a
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 6960f9b064598e42a75dd259709c8cd85f688c9968e5db2a9ab7eb9cfb8b806ffb7c163630d926ed56625eb8b601d46a037f5f408bc237a1c6df1c8727d023ac
   languageName: node
   linkType: hard
 
@@ -1501,25 +1473,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/body-parser@npm:*":
-  version: 1.19.5
-  resolution: "@types/body-parser@npm:1.19.5"
-  dependencies:
-    "@types/connect": "*"
-    "@types/node": "*"
-  checksum: 1e251118c4b2f61029cc43b0dc028495f2d1957fe8ee49a707fb940f86a9bd2f9754230805598278fe99958b49e9b7e66eec8ef6a50ab5c1f6b93e1ba2aaba82
-  languageName: node
-  linkType: hard
-
-"@types/connect@npm:*":
-  version: 3.4.38
-  resolution: "@types/connect@npm:3.4.38"
-  dependencies:
-    "@types/node": "*"
-  checksum: 7eb1bc5342a9604facd57598a6c62621e244822442976c443efb84ff745246b10d06e8b309b6e80130026a396f19bf6793b7cecd7380169f369dac3bfc46fb99
-  languageName: node
-  linkType: hard
-
 "@types/doctrine@npm:^0.0.9":
   version: 0.0.9
   resolution: "@types/doctrine@npm:0.0.9"
@@ -1527,13 +1480,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/escodegen@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "@types/escodegen@npm:0.0.6"
-  checksum: 7b25aeedd48dbef68345224082c6bc774845cbfc1d9b2ce91a477130fe7ccabf33da126c1d6d55e5dfd838db429a7c80890628a167e5aa55b6a4620974da38d3
-  languageName: node
-  linkType: hard
-
 "@types/estree@npm:1.0.6, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.6":
   version: 1.0.6
   resolution: "@types/estree@npm:1.0.6"
@@ -1541,44 +1487,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:^0.0.51":
-  version: 0.0.51
-  resolution: "@types/estree@npm:0.0.51"
-  checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189
-  languageName: node
-  linkType: hard
-
-"@types/express-serve-static-core@npm:^4.17.33":
-  version: 4.19.6
-  resolution: "@types/express-serve-static-core@npm:4.19.6"
-  dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-    "@types/range-parser": "*"
-    "@types/send": "*"
-  checksum: b0576eddc2d25ccdf10e68ba09598b87a4d7b2ad04a81dc847cb39fe56beb0b6a5cc017b1e00aa0060cb3b38e700384ce96d291a116a0f1e54895564a104aae9
-  languageName: node
-  linkType: hard
-
-"@types/express@npm:^4.17.21":
-  version: 4.17.21
-  resolution: "@types/express@npm:4.17.21"
-  dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": ^4.17.33
-    "@types/qs": "*"
-    "@types/serve-static": "*"
-  checksum: fb238298630370a7392c7abdc80f495ae6c716723e114705d7e3fb67e3850b3859bbfd29391463a3fb8c0b32051847935933d99e719c0478710f8098ee7091c5
-  languageName: node
-  linkType: hard
-
-"@types/find-cache-dir@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@types/find-cache-dir@npm:3.2.1"
-  checksum: bf5c4e96da40247cd9e6327f54dfccda961a0fb2d70e3c71bd05def94de4c2e6fb310fe8ecb0f04ecf5dbc52214e184b55a2337b0f87250d4ae1e2e7d58321e4
-  languageName: node
-  linkType: hard
-
 "@types/glob@npm:^7.1.3":
   version: 7.2.0
   resolution: "@types/glob@npm:7.2.0"
@@ -1589,22 +1497,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/hast@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/hast@npm:3.0.4"
-  dependencies:
-    "@types/unist": "*"
-  checksum: 7a973e8d16fcdf3936090fa2280f408fb2b6a4f13b42edeb5fbd614efe042b82eac68e298e556d50f6b4ad585a3a93c353e9c826feccdc77af59de8dd400d044
-  languageName: node
-  linkType: hard
-
-"@types/http-errors@npm:*":
-  version: 2.0.4
-  resolution: "@types/http-errors@npm:2.0.4"
-  checksum: 1f3d7c3b32c7524811a45690881736b3ef741bf9849ae03d32ad1ab7062608454b150a4e7f1351f83d26a418b2d65af9bdc06198f1c079d75578282884c4e8e3
-  languageName: node
-  linkType: hard
-
 "@types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.9":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
@@ -1612,13 +1504,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:^4.14.167":
-  version: 4.17.12
-  resolution: "@types/lodash@npm:4.17.12"
-  checksum: 7b564e4114f09ce5ae31a2e9493592baf20bb498507f3705c5d91cf838c2298b4f6a06f2d6c8dc608fcac63e210a2b7b13388c7a5e220e15688f813521030127
-  languageName: node
-  linkType: hard
-
 "@types/mdx@npm:^2.0.0":
   version: 2.0.13
   resolution: "@types/mdx@npm:2.0.13"
@@ -1626,13 +1511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mime@npm:^1":
-  version: 1.3.5
-  resolution: "@types/mime@npm:1.3.5"
-  checksum: e29a5f9c4776f5229d84e525b7cd7dd960b51c30a0fb9a028c0821790b82fca9f672dab56561e2acd9e8eed51d431bde52eafdfef30f643586c4162f1aecfc78
-  languageName: node
-  linkType: hard
-
 "@types/minimatch@npm:*":
   version: 5.1.2
   resolution: "@types/minimatch@npm:5.1.2"
@@ -1640,7 +1518,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^22.0.0":
+"@types/node@npm:*":
   version: 22.7.7
   resolution: "@types/node@npm:22.7.7"
   dependencies:
@@ -1656,20 +1534,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/qs@npm:*":
-  version: 6.9.16
-  resolution: "@types/qs@npm:6.9.16"
-  checksum: 2e8918150c12735630f7ee16b770c72949274938c30306025f68aaf977227f41fe0c698ed93db1099e04916d582ac5a1faf7e3c7061c8d885d9169f59a184b6c
-  languageName: node
-  linkType: hard
-
-"@types/range-parser@npm:*":
-  version: 1.2.7
-  resolution: "@types/range-parser@npm:1.2.7"
-  checksum: 95640233b689dfbd85b8c6ee268812a732cf36d5affead89e806fe30da9a430767af8ef2cd661024fd97e19d61f3dec75af2df5e80ec3bea000019ab7028629a
-  languageName: node
-  linkType: hard
-
 "@types/react-dom@npm:^18.0.0":
   version: 18.3.1
   resolution: "@types/react-dom@npm:18.3.1"
@@ -1679,13 +1543,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, @types/react@npm:^18.0.0":
-  version: 18.3.11
-  resolution: "@types/react@npm:18.3.11"
+"@types/react@npm:*, @types/react@npm:^18.0.0":
+  version: 18.3.12
+  resolution: "@types/react@npm:18.3.12"
   dependencies:
     "@types/prop-types": "*"
     csstype: ^3.0.2
-  checksum: 6cbf36673b64e758dd61b16c24139d015f58530e0d476777de26ba83f24b55e142fbf64e3b8f6b3c7b05ed9ba548551b2a62d9ffb0f95743d0a368646a619163
+  checksum: 4ab1577a8c2105a5e316536f724117c90eee5f4bd5c137fc82a2253d8c1fd299dedaa07e8dfc95d6e2f04a4be3cb8b0e1b06098c6233ebd55c508d88099395b7
   languageName: node
   linkType: hard
 
@@ -1703,34 +1567,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/send@npm:*":
-  version: 0.17.4
-  resolution: "@types/send@npm:0.17.4"
-  dependencies:
-    "@types/mime": ^1
-    "@types/node": "*"
-  checksum: cf4db48251bbb03cd6452b4de6e8e09e2d75390a92fd798eca4a803df06444adc94ed050246c94c7ed46fb97be1f63607f0e1f13c3ce83d71788b3e08640e5e0
-  languageName: node
-  linkType: hard
-
-"@types/serve-static@npm:*":
-  version: 1.15.7
-  resolution: "@types/serve-static@npm:1.15.7"
-  dependencies:
-    "@types/http-errors": "*"
-    "@types/node": "*"
-    "@types/send": "*"
-  checksum: bbbf00dbd84719da2250a462270dc68964006e8d62f41fe3741abd94504ba3688f420a49afb2b7478921a1544d3793183ffa097c5724167da777f4e0c7f1a7d6
-  languageName: node
-  linkType: hard
-
-"@types/unist@npm:*, @types/unist@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "@types/unist@npm:3.0.3"
-  checksum: 96e6453da9e075aaef1dc22482463898198acdc1eeb99b465e65e34303e2ec1e3b1ed4469a9118275ec284dc98019f63c3f5d49422f0e4ac707e5ab90fb3b71a
-  languageName: node
-  linkType: hard
-
 "@types/uuid@npm:^9.0.1":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
@@ -1738,15 +1574,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.10.0"
+"@typescript-eslint/eslint-plugin@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.14.0"
   dependencies:
     "@eslint-community/regexpp": ^4.10.0
-    "@typescript-eslint/scope-manager": 8.10.0
-    "@typescript-eslint/type-utils": 8.10.0
-    "@typescript-eslint/utils": 8.10.0
-    "@typescript-eslint/visitor-keys": 8.10.0
+    "@typescript-eslint/scope-manager": 8.14.0
+    "@typescript-eslint/type-utils": 8.14.0
+    "@typescript-eslint/utils": 8.14.0
+    "@typescript-eslint/visitor-keys": 8.14.0
     graphemer: ^1.4.0
     ignore: ^5.3.1
     natural-compare: ^1.4.0
@@ -1757,7 +1593,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2bb311eb9a882d530fc94f790f3e1f4745cd4e3523fd8d62ee0ed14d65c4230dc0c797c490c3421c1456fd71349e9bfa146c0b78f63860b75aae6e2a32a6c27c
+  checksum: 5ba1dc4eef2fcf8edfe878a5f254ff2dde882f996cfc66312ccd66c54da701a7f3b79c27e3935569b428f1b397c5b3475cd9202ce253bc30aa343a70bfea2c03
   languageName: node
   linkType: hard
 
@@ -1785,21 +1621,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/parser@npm:8.10.0"
+"@typescript-eslint/parser@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/parser@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 8.10.0
-    "@typescript-eslint/types": 8.10.0
-    "@typescript-eslint/typescript-estree": 8.10.0
-    "@typescript-eslint/visitor-keys": 8.10.0
+    "@typescript-eslint/scope-manager": 8.14.0
+    "@typescript-eslint/types": 8.14.0
+    "@typescript-eslint/typescript-estree": 8.14.0
+    "@typescript-eslint/visitor-keys": 8.14.0
     debug: ^4.3.4
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2e38f34d9d044e251450116cc081a8f84ba13183e9c3e1dda919ddc00eebe634a37d4dfd785998f259b64cdd770e863ecc6c5cf7c8f422baf3d2bc2a0f9241cf
+  checksum: 11a2c52efc5813e615c60d13a548e5c13d75a54ab359f64fa7a8d1739b3179ff98f716c6f7789efa293b24e7a1906db1a7331f8a32d8f6405115d50f557af7ea
   languageName: node
   linkType: hard
 
@@ -1830,13 +1666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.10.0"
+"@typescript-eslint/scope-manager@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/types": 8.10.0
-    "@typescript-eslint/visitor-keys": 8.10.0
-  checksum: 3df8df342e227b80514dcc9151774dea9a71bc649204f702d5b4a1b76a54b4814c5d5a970a6a9213462dd4df0d42342796fab35549e8663d4c0e5d84bd902bba
+    "@typescript-eslint/types": 8.14.0
+    "@typescript-eslint/visitor-keys": 8.14.0
+  checksum: 9c4011771e6795d00328ebfb70b1cdfc706139f0803244adf4bdf46bea5033f1508a0e19136f1d3743eb2c6b5b23d3af6de2b79db8317147c300f61a3335788e
   languageName: node
   linkType: hard
 
@@ -1857,18 +1693,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/type-utils@npm:8.10.0"
+"@typescript-eslint/type-utils@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/type-utils@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": 8.10.0
-    "@typescript-eslint/utils": 8.10.0
+    "@typescript-eslint/typescript-estree": 8.14.0
+    "@typescript-eslint/utils": 8.14.0
     debug: ^4.3.4
     ts-api-utils: ^1.3.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 8b0cec8cff1926a08c2bd675b24b2ccff36e59a8d9169eed38343f70c4e3bba18796fc39f30a9307ded3f345881aded80dbd6dc1d78b9ae76cff04fbe8708788
+  checksum: 5717b26ddf285be0f1caf7877592c58bff6dfe2ba184bb28cd9e8f1546f68557d5a5d8719cd402cfb5f228666a6c24f0713b06a102b05ebeb00fb82c7c4582ee
   languageName: node
   linkType: hard
 
@@ -1879,10 +1715,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/types@npm:8.10.0"
-  checksum: 3839fd43b0f21b432a9f6090a39d5b2254ee48c1eecf14f8f66bea0cbaba9f2f33a7fc78aea37dfe8841442332d0a8f99cc65cd2d01ca43db99550d30d6f7fe8
+"@typescript-eslint/types@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/types@npm:8.14.0"
+  checksum: 032f1adb483a7e306ba31042afbfc219ff8471458f33529e2a1124feb7b6bfad6c7feac5c4ff07320eda5d1019ac4aa634036716f16cf6e25d4fdf0f755764e1
   languageName: node
   linkType: hard
 
@@ -1904,12 +1740,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.10.0"
+"@typescript-eslint/typescript-estree@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/types": 8.10.0
-    "@typescript-eslint/visitor-keys": 8.10.0
+    "@typescript-eslint/types": 8.14.0
+    "@typescript-eslint/visitor-keys": 8.14.0
     debug: ^4.3.4
     fast-glob: ^3.3.2
     is-glob: ^4.0.3
@@ -1919,11 +1755,11 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 3fc774f51d0a891a5e09bc77f5544b6aa268abec9c01cd9ec831f92dde9c9d61a5c818ca2800c124fb5d61d40ce7ac34740b347c21ba3493e756c052084afd65
+  checksum: 9412bd801fb45dd3a778f030afd871e2c5010bbd7d4bf54cb2f6e2fecaabb7e2d94960e306737b8ad48a9a0a04297e43aee03741977ecceb3a713560f5927e5a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.62.0":
+"@typescript-eslint/utils@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/utils@npm:5.62.0"
   dependencies:
@@ -1941,17 +1777,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/utils@npm:8.10.0"
+"@typescript-eslint/utils@npm:8.14.0, @typescript-eslint/utils@npm:^8.8.1":
+  version: 8.14.0
+  resolution: "@typescript-eslint/utils@npm:8.14.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.4.0
-    "@typescript-eslint/scope-manager": 8.10.0
-    "@typescript-eslint/types": 8.10.0
-    "@typescript-eslint/typescript-estree": 8.10.0
+    "@typescript-eslint/scope-manager": 8.14.0
+    "@typescript-eslint/types": 8.14.0
+    "@typescript-eslint/typescript-estree": 8.14.0
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-  checksum: db67603baacba9cccbbc625801a44e5320bc558be846646ff9962818c64a9ab07edcfdcad98b15a3f8954d3e398e3a41f085c1ec458f7169a1ce7b3674032d59
+  checksum: 7c432f2e29f94e6d4a3303bf841f6e3fbbf708c697df4506c9037d0be6379090b0a6d1a077dda43a27850a6bd2bfd5cb523b15450e3025b301ce24ef41b19251
   languageName: node
   linkType: hard
 
@@ -1965,20 +1801,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.10.0":
-  version: 8.10.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.10.0"
+"@typescript-eslint/visitor-keys@npm:8.14.0":
+  version: 8.14.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/types": 8.10.0
+    "@typescript-eslint/types": 8.14.0
     eslint-visitor-keys: ^3.4.3
-  checksum: 0b3060a036dd3b6acacc32b1d81b3ada1ac5523cc2d16a369ecffd3ab5b389cd98802b248bf65ee8a266a166125a9e38acd7e917d4dd26044bdf2c805537b7e3
-  languageName: node
-  linkType: hard
-
-"@ungap/structured-clone@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
+  checksum: 5f1279bf7cd830ed96a2769b3f27d6102bce630fc4f72c03fee92d06c599ce4e35b9648d0643d7bc9f2613d6587104731c97126bb23805548717bf99854f1094
   languageName: node
   linkType: hard
 
@@ -2003,12 +1832,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitest/pretty-format@npm:2.1.3":
-  version: 2.1.3
-  resolution: "@vitest/pretty-format@npm:2.1.3"
+"@vitest/pretty-format@npm:2.1.4":
+  version: 2.1.4
+  resolution: "@vitest/pretty-format@npm:2.1.4"
   dependencies:
     tinyrainbow: ^1.2.0
-  checksum: ff4aa144a49c0ee579bfae940745b70a0ca3c504f52c23f1e8f5c0642824785232f844040d31b48eea71b5a80519809810359a75d29186ab40341174c50a4a0d
+  checksum: 4d6c799d9b9418ebfce77df518a5ea8717051bdb5eecce63d6b7009634d4843630c0bc424d0f405bd12b8f404e4bf09b6f208a331568de9b6b9395322221e41c
   languageName: node
   linkType: hard
 
@@ -2033,14 +1862,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitest/utils@npm:^2.0.5":
-  version: 2.1.3
-  resolution: "@vitest/utils@npm:2.1.3"
+"@vitest/utils@npm:^2.1.1":
+  version: 2.1.4
+  resolution: "@vitest/utils@npm:2.1.4"
   dependencies:
-    "@vitest/pretty-format": 2.1.3
-    loupe: ^3.1.1
+    "@vitest/pretty-format": 2.1.4
+    loupe: ^3.1.2
     tinyrainbow: ^1.2.0
-  checksum: 0c1e262600bc329fab43bb19d575326a6d38175c2bdc345bc5326b81cf34303f22a1b67a0197dc6a935c3019e2f21c4da52a49c609967bea9cb4790a44a347ce
+  checksum: f7d9a4e8c411b9e80e7df46a725933977c9a330b133cc17e39e6f069d31832a849c070ef18b96abe2f07847f1860f36c8dd081eff2dad62b2874592d68e7dc43
   languageName: node
   linkType: hard
 
@@ -2051,17 +1880,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"accepts@npm:~1.3.8":
-  version: 1.3.8
-  resolution: "accepts@npm:1.3.8"
-  dependencies:
-    mime-types: ~2.1.34
-    negotiator: 0.6.3
-  checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4
-  languageName: node
-  linkType: hard
-
-"acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
+"acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
@@ -2070,28 +1889,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "acorn-walk@npm:7.2.0"
-  checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^7.4.1":
-  version: 7.4.1
-  resolution: "acorn@npm:7.4.1"
+"acorn@npm:^8.12.1, acorn@npm:^8.14.0":
+  version: 8.14.0
+  resolution: "acorn@npm:8.14.0"
   bin:
     acorn: bin/acorn
-  checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.12.0, acorn@npm:^8.12.1":
-  version: 8.13.0
-  resolution: "acorn@npm:8.13.0"
-  bin:
-    acorn: bin/acorn
-  checksum: f1541f05eb5d6ff67990d1927290809b1ebb663ac96d9c7057c935cf29c5bcaba6d39f37bd007f4bb814f162f142b0f2b2dd4b14128b8fcfaf9f0508a6f05f1c
+  checksum: 8755074ba55fff94e84e81c72f1013c2d9c78e973c31231c8ae505a5f966859baf654bddd75046bffd73ce816b149298977fff5077a3033dedba0ae2aad152d4
   languageName: node
   linkType: hard
 
@@ -2195,13 +1998,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-flatten@npm:1.1.1":
-  version: 1.1.1
-  resolution: "array-flatten@npm:1.1.1"
-  checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b
-  languageName: node
-  linkType: hard
-
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
@@ -2242,6 +2038,7 @@ __metadata:
     "@storybook/addon-essentials": ^8.3.5
     "@storybook/addon-interactions": ^8.3.5
     "@storybook/addon-links": ^8.3.5
+    "@storybook/addon-storysource": ^8.3.6
     "@storybook/addon-themes": ^8.3.6
     "@storybook/blocks": ^8.3.5
     "@storybook/react": ^8.3.5
@@ -2253,7 +2050,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.0.0
     "@typescript-eslint/parser": ^5.0.0
     eslint: ^9.11.1
-    eslint-plugin-storybook: ^0.9.0
+    eslint-plugin-storybook: ^0.11.0
     globals: ^15.9.0
     react: ^18.0.2
     react-dom: ^18.0.2
@@ -2281,26 +2078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.3":
-  version: 1.20.3
-  resolution: "body-parser@npm:1.20.3"
-  dependencies:
-    bytes: 3.1.2
-    content-type: ~1.0.5
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    on-finished: 2.4.1
-    qs: 6.13.0
-    raw-body: 2.5.2
-    type-is: ~1.6.18
-    unpipe: 1.0.0
-  checksum: 1a35c59a6be8d852b00946330141c4f142c6af0f970faa87f10ad74f1ee7118078056706a05ae3093c54dabca9cd3770fa62a170a85801da1a4324f04381167d
-  languageName: node
-  linkType: hard
-
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -2350,13 +2127,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bytes@npm:3.1.2":
-  version: 3.1.2
-  resolution: "bytes@npm:3.1.2"
-  checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^18.0.0":
   version: 18.0.4
   resolution: "cacache@npm:18.0.4"
@@ -2520,13 +2290,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commondir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "commondir@npm:1.0.1"
-  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
-  languageName: node
-  linkType: hard
-
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
@@ -2534,22 +2297,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-disposition@npm:0.5.4":
-  version: 0.5.4
-  resolution: "content-disposition@npm:0.5.4"
-  dependencies:
-    safe-buffer: 5.2.1
-  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
-  languageName: node
-  linkType: hard
-
-"content-type@npm:~1.0.4, content-type@npm:~1.0.5":
-  version: 1.0.5
-  resolution: "content-type@npm:1.0.5"
-  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
-  languageName: node
-  linkType: hard
-
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
@@ -2557,28 +2304,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie-signature@npm:1.0.6":
-  version: 1.0.6
-  resolution: "cookie-signature@npm:1.0.6"
-  checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
-  languageName: node
-  linkType: hard
-
-"cookie@npm:0.7.1":
-  version: 0.7.1
-  resolution: "cookie@npm:0.7.1"
-  checksum: cec5e425549b3650eb5c3498a9ba3cde0b9cd419e3b36e4b92739d30b4d89e0b678b98c1ddc209ce7cf958cd3215671fd6ac47aec21f10c2a0cc68abd399d8a7
-  languageName: node
-  linkType: hard
-
 "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+  version: 7.0.5
+  resolution: "cross-spawn@npm:7.0.5"
   dependencies:
     path-key: ^3.1.0
     shebang-command: ^2.0.0
     which: ^2.0.1
-  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
+  checksum: 55c50004cb6bbea3649784caac6e7b8ddd03fa8c1e14dbd5a1f15896708378006eb7526a52a0f48770c768c9b8aed48a5888eb8e785ff59ff7749e74f66cd96b
   languageName: node
   linkType: hard
 
@@ -2596,15 +2329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9":
-  version: 2.6.9
-  resolution: "debug@npm:2.6.9"
-  dependencies:
-    ms: 2.0.0
-  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
-  languageName: node
-  linkType: hard
-
 "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
   version: 4.3.7
   resolution: "debug@npm:4.3.7"
@@ -2649,13 +2373,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"depd@npm:2.0.0":
-  version: 2.0.0
-  resolution: "depd@npm:2.0.0"
-  checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
-  languageName: node
-  linkType: hard
-
 "dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
@@ -2663,13 +2380,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"destroy@npm:1.2.0":
-  version: 1.2.0
-  resolution: "destroy@npm:1.2.0"
-  checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
-  languageName: node
-  linkType: hard
-
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -2709,13 +2419,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ee-first@npm:1.1.1":
-  version: 1.1.1
-  resolution: "ee-first@npm:1.1.1"
-  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.5.28":
   version: 1.5.41
   resolution: "electron-to-chromium@npm:1.5.41"
@@ -2737,20 +2440,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"encodeurl@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "encodeurl@npm:1.0.2"
-  checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
-  languageName: node
-  linkType: hard
-
-"encodeurl@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "encodeurl@npm:2.0.0"
-  checksum: abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe
-  languageName: node
-  linkType: hard
-
 "encoding@npm:^0.1.13":
   version: 0.1.13
   resolution: "encoding@npm:0.1.13"
@@ -2790,10 +2479,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.5.0":
-  version: 1.5.4
-  resolution: "es-module-lexer@npm:1.5.4"
-  checksum: a0cf04fb92d052647ac7d818d1913b98d3d3d0f5b9d88f0eafb993436e4c3e2c958599db68839d57f2dfa281fdf0f60e18d448eb78fc292c33c0f25635b6854f
+"es-toolkit@npm:^1.22.0":
+  version: 1.26.1
+  resolution: "es-toolkit@npm:1.26.1"
+  dependenciesMeta:
+    "@trivago/prettier-plugin-sort-imports@4.3.0":
+      unplugged: true
+    prettier-plugin-sort-re-exports@0.0.1:
+      unplugged: true
+  checksum: 3b70659f66c9fab95b62f6df13b1a57ff3320108a8feb2935baf3695b3d08d6c3b28694e7e6f4cefb3b84f817a5bc45e6ed147b63b1993315007d98c35c2c96f
   languageName: node
   linkType: hard
 
@@ -2808,34 +2502,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0":
-  version: 0.23.1
-  resolution: "esbuild@npm:0.23.1"
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0":
+  version: 0.24.0
+  resolution: "esbuild@npm:0.24.0"
   dependencies:
-    "@esbuild/aix-ppc64": 0.23.1
-    "@esbuild/android-arm": 0.23.1
-    "@esbuild/android-arm64": 0.23.1
-    "@esbuild/android-x64": 0.23.1
-    "@esbuild/darwin-arm64": 0.23.1
-    "@esbuild/darwin-x64": 0.23.1
-    "@esbuild/freebsd-arm64": 0.23.1
-    "@esbuild/freebsd-x64": 0.23.1
-    "@esbuild/linux-arm": 0.23.1
-    "@esbuild/linux-arm64": 0.23.1
-    "@esbuild/linux-ia32": 0.23.1
-    "@esbuild/linux-loong64": 0.23.1
-    "@esbuild/linux-mips64el": 0.23.1
-    "@esbuild/linux-ppc64": 0.23.1
-    "@esbuild/linux-riscv64": 0.23.1
-    "@esbuild/linux-s390x": 0.23.1
-    "@esbuild/linux-x64": 0.23.1
-    "@esbuild/netbsd-x64": 0.23.1
-    "@esbuild/openbsd-arm64": 0.23.1
-    "@esbuild/openbsd-x64": 0.23.1
-    "@esbuild/sunos-x64": 0.23.1
-    "@esbuild/win32-arm64": 0.23.1
-    "@esbuild/win32-ia32": 0.23.1
-    "@esbuild/win32-x64": 0.23.1
+    "@esbuild/aix-ppc64": 0.24.0
+    "@esbuild/android-arm": 0.24.0
+    "@esbuild/android-arm64": 0.24.0
+    "@esbuild/android-x64": 0.24.0
+    "@esbuild/darwin-arm64": 0.24.0
+    "@esbuild/darwin-x64": 0.24.0
+    "@esbuild/freebsd-arm64": 0.24.0
+    "@esbuild/freebsd-x64": 0.24.0
+    "@esbuild/linux-arm": 0.24.0
+    "@esbuild/linux-arm64": 0.24.0
+    "@esbuild/linux-ia32": 0.24.0
+    "@esbuild/linux-loong64": 0.24.0
+    "@esbuild/linux-mips64el": 0.24.0
+    "@esbuild/linux-ppc64": 0.24.0
+    "@esbuild/linux-riscv64": 0.24.0
+    "@esbuild/linux-s390x": 0.24.0
+    "@esbuild/linux-x64": 0.24.0
+    "@esbuild/netbsd-x64": 0.24.0
+    "@esbuild/openbsd-arm64": 0.24.0
+    "@esbuild/openbsd-x64": 0.24.0
+    "@esbuild/sunos-x64": 0.24.0
+    "@esbuild/win32-arm64": 0.24.0
+    "@esbuild/win32-ia32": 0.24.0
+    "@esbuild/win32-x64": 0.24.0
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -2887,7 +2581,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 0413c3b9257327fb598427688b7186ea335bf1693746fe5713cc93c95854d6388b8ed4ad643fddf5b5ace093f7dcd9038dd58e087bf2da1f04dfb4c5571660af
+  checksum: dd386d92a05c7eb03078480522cdd8b40c434777b5f08487c27971d30933ecaae3f08bd221958dd8f9c66214915cdc85f844283ca9bdbf8ee703d889ae526edd
   languageName: node
   linkType: hard
 
@@ -2978,13 +2672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-html@npm:~1.0.3":
-  version: 1.0.3
-  resolution: "escape-html@npm:1.0.3"
-  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
-  languageName: node
-  linkType: hard
-
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
@@ -2999,35 +2686,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "escodegen@npm:2.1.0"
+"eslint-plugin-storybook@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "eslint-plugin-storybook@npm:0.11.0"
   dependencies:
-    esprima: ^4.0.1
-    estraverse: ^5.2.0
-    esutils: ^2.0.2
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-storybook@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "eslint-plugin-storybook@npm:0.9.0"
-  dependencies:
-    "@storybook/csf": ^0.0.1
-    "@typescript-eslint/utils": ^5.62.0
-    requireindex: ^1.2.0
+    "@storybook/csf": ^0.1.11
+    "@typescript-eslint/utils": ^8.8.1
     ts-dedent: ^2.2.0
   peerDependencies:
     eslint: ">=6"
-  checksum: 91e12030db3a6228b692e76ddda6871d59a5f6ef6979e2ed794f734b09aaf8de8528eab7597d7c2d06fd4b8b9a30654ff27d097816a5ac1e22170c13af97731a
+  checksum: 52baa35ed4f49bc46bd323784ac2a48a615f0fd929b66dfec11bb2cbceded1a9978b68cbb1165aa36f078190651f93243f871ead368bb2f1ee131c7d00e265e9
   languageName: node
   linkType: hard
 
@@ -3041,13 +2709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "eslint-scope@npm:8.1.0"
+"eslint-scope@npm:^8.2.0":
+  version: 8.2.0
+  resolution: "eslint-scope@npm:8.2.0"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 3ce9392ec74f35f84eddad7755941cb5f7e3a1bc53cf902e95e541384ef78b604bec1489933f37c663e4686b36c31533d06cf0842be9a729a680c489efce7acb
+  checksum: 750eff4672ca2bf274ec0d1bbeae08aadd53c1907d5c6aff5564d8e047a5f49afa8ae6eee333cab637fd3ebcab2141659d8f2f040f6fdc982b0f61f8bf03136f
   languageName: node
   linkType: hard
 
@@ -3058,27 +2726,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "eslint-visitor-keys@npm:4.1.0"
-  checksum: b5d53725df14a6a225fd74d5e687f5f0547b0aaa3e1963ab6f4acb8dc80f99ad0bec11148e14b4a67de024dde7b4449e7e4c0b1524de605955dee7eefcdd7824
+"eslint-visitor-keys@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "eslint-visitor-keys@npm:4.2.0"
+  checksum: 779c604672b570bb4da84cef32f6abb085ac78379779c1122d7879eade8bb38ae715645324597cf23232d03cef06032c9844d25c73625bc282a5bfd30247e5b5
   languageName: node
   linkType: hard
 
 "eslint@npm:^9.11.1":
-  version: 9.13.0
-  resolution: "eslint@npm:9.13.0"
+  version: 9.14.0
+  resolution: "eslint@npm:9.14.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.11.0
+    "@eslint-community/regexpp": ^4.12.1
     "@eslint/config-array": ^0.18.0
     "@eslint/core": ^0.7.0
     "@eslint/eslintrc": ^3.1.0
-    "@eslint/js": 9.13.0
+    "@eslint/js": 9.14.0
     "@eslint/plugin-kit": ^0.2.0
-    "@humanfs/node": ^0.16.5
+    "@humanfs/node": ^0.16.6
     "@humanwhocodes/module-importer": ^1.0.1
-    "@humanwhocodes/retry": ^0.3.1
+    "@humanwhocodes/retry": ^0.4.0
     "@types/estree": ^1.0.6
     "@types/json-schema": ^7.0.15
     ajv: ^6.12.4
@@ -3086,9 +2754,9 @@ __metadata:
     cross-spawn: ^7.0.2
     debug: ^4.3.2
     escape-string-regexp: ^4.0.0
-    eslint-scope: ^8.1.0
-    eslint-visitor-keys: ^4.1.0
-    espree: ^10.2.0
+    eslint-scope: ^8.2.0
+    eslint-visitor-keys: ^4.2.0
+    espree: ^10.3.0
     esquery: ^1.5.0
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -3111,22 +2779,22 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 99e878d6883864b8361bfaf2a2304f1e133347ac19976c79e1430623cd311cb38253bbd122100788082eded947693cce5c7e67dfd2b5173e6f05edb92dcb2206
+  checksum: 1b54112da245f4175fbcf31ea5f71da38dda1bb8f5d645f3b2420035a4310949fda57af14ca7f7992e36374da8c06b94bf20ec8bda64a09409d818aefd0bf09c
   languageName: node
   linkType: hard
 
-"espree@npm:^10.0.1, espree@npm:^10.2.0":
-  version: 10.2.0
-  resolution: "espree@npm:10.2.0"
+"espree@npm:^10.0.1, espree@npm:^10.3.0":
+  version: 10.3.0
+  resolution: "espree@npm:10.3.0"
   dependencies:
-    acorn: ^8.12.0
+    acorn: ^8.14.0
     acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^4.1.0
-  checksum: 16ee75c2f6029622a70a675ad8989fffc6f7199265d07af516a11e4adc9eb2d03866fceff33f1a081c42621df79871e508f8fc8fe5855eac2de925b58196711b
+    eslint-visitor-keys: ^4.2.0
+  checksum: 63e8030ff5a98cea7f8b3e3a1487c998665e28d674af08b9b3100ed991670eb3cbb0e308c4548c79e03762753838fbe530c783f17309450d6b47a889fee72bef
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.1, esprima@npm:~4.0.0":
+"esprima@npm:~4.0.0":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
   bin:
@@ -3191,13 +2859,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"etag@npm:~1.8.1":
-  version: 1.8.1
-  resolution: "etag@npm:1.8.1"
-  checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
-  languageName: node
-  linkType: hard
-
 "exponential-backoff@npm:^3.1.1":
   version: 3.1.1
   resolution: "exponential-backoff@npm:3.1.1"
@@ -3205,45 +2866,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.19.2":
-  version: 4.21.1
-  resolution: "express@npm:4.21.1"
-  dependencies:
-    accepts: ~1.3.8
-    array-flatten: 1.1.1
-    body-parser: 1.20.3
-    content-disposition: 0.5.4
-    content-type: ~1.0.4
-    cookie: 0.7.1
-    cookie-signature: 1.0.6
-    debug: 2.6.9
-    depd: 2.0.0
-    encodeurl: ~2.0.0
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    finalhandler: 1.3.1
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    merge-descriptors: 1.0.3
-    methods: ~1.1.2
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    path-to-regexp: 0.1.10
-    proxy-addr: ~2.0.7
-    qs: 6.13.0
-    range-parser: ~1.2.1
-    safe-buffer: 5.2.1
-    send: 0.19.0
-    serve-static: 1.16.2
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    type-is: ~1.6.18
-    utils-merge: 1.0.1
-    vary: ~1.1.2
-  checksum: 5ac2b26d8aeddda5564fc0907227d29c100f90c0ead2ead9d474dc5108e8fb306c2de2083c4e3ba326e0906466f2b73417dbac16961f4075ff9f03785fd940fe
-  languageName: node
-  linkType: hard
-
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -3312,42 +2934,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"finalhandler@npm:1.3.1":
-  version: 1.3.1
-  resolution: "finalhandler@npm:1.3.1"
-  dependencies:
-    debug: 2.6.9
-    encodeurl: ~2.0.0
-    escape-html: ~1.0.3
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    statuses: 2.0.1
-    unpipe: ~1.0.0
-  checksum: a8c58cd97c9cd47679a870f6833a7b417043f5a288cd6af6d0f49b476c874a506100303a128b6d3b654c3d74fa4ff2ffed68a48a27e8630cda5c918f2977dcf4
-  languageName: node
-  linkType: hard
-
-"find-cache-dir@npm:^3.0.0":
-  version: 3.3.2
-  resolution: "find-cache-dir@npm:3.3.2"
-  dependencies:
-    commondir: ^1.0.1
-    make-dir: ^3.0.2
-    pkg-dir: ^4.1.0
-  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "find-up@npm:4.1.0"
-  dependencies:
-    locate-path: ^5.0.0
-    path-exists: ^4.0.0
-  checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^5.0.0":
   version: 5.0.0
   resolution: "find-up@npm:5.0.0"
@@ -3394,31 +2980,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"forwarded@npm:0.2.0":
-  version: 0.2.0
-  resolution: "forwarded@npm:0.2.0"
-  checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6
-  languageName: node
-  linkType: hard
-
-"fresh@npm:0.5.2":
-  version: 0.5.2
-  resolution: "fresh@npm:0.5.2"
-  checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^11.1.0":
-  version: 11.2.0
-  resolution: "fs-extra@npm:11.2.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8
-  languageName: node
-  linkType: hard
-
 "fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
@@ -3490,13 +3051,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"github-slugger@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "github-slugger@npm:2.0.0"
-  checksum: 250375cde2058f21454872c2c79f72c4637340c30c51ff158ca4ec71cbc478f33d54477d787a662f9207aeb095a2060f155bc01f15329ba8a5fb6698e0fc81f8
-  languageName: node
-  linkType: hard
-
 "glob-parent@npm:^5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
@@ -3571,9 +3125,9 @@ __metadata:
   linkType: hard
 
 "globals@npm:^15.9.0":
-  version: 15.11.0
-  resolution: "globals@npm:15.11.0"
-  checksum: ef32d5ef987f3d4b47fc2e389a0b235f6a46f605160c4e405722fd7b576106ca407cb867e66fd1e0fc43b631800e2e2e71847f37691026d813f96f40339da702
+  version: 15.12.0
+  resolution: "globals@npm:15.12.0"
+  checksum: 2a134cc876dd73192489561e3c85be348dc1408fef043ebef605cdc437f64cd2fc922268db02e3348683d05d06bed10fb1c3653b3d4399a204a7ecd59e742a07
   languageName: node
   linkType: hard
 
@@ -3600,7 +3154,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6":
+"graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.6":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
   checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -3669,40 +3223,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hast-util-heading-rank@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-heading-rank@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: e5ce4ec9e8017b24ab72702fa0dd401ec6eaf32574120d71c2aa4e8e0f43829dba2e291f49d305a47e8d65b82a9c5adad7985385dc5bc8370f8cec7c8f9313d3
-  languageName: node
-  linkType: hard
-
-"hast-util-is-element@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-is-element@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: 82569a420eda5877c52fdbbdbe26675f012c02d70813dfd19acffdee328e42e4bd0b7ae34454cfcbcb932b2bedbd7ddc119f943a0cfb234120f9456d6c0c4331
-  languageName: node
-  linkType: hard
-
-"hast-util-to-string@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "hast-util-to-string@npm:3.0.1"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: 556f3cb118fc09e3a6cd149ee4b4056a49028a3858a7d37617e4c6d2c9c5e2336d5fb87eb5f41211b1977a964c705aa70e419464c12debc1959ed03fdad5bed6
-  languageName: node
-  linkType: hard
-
-"html-tags@npm:^3.1.0":
-  version: 3.3.1
-  resolution: "html-tags@npm:3.3.1"
-  checksum: b4ef1d5a76b678e43cce46e3783d563607b1d550cab30b4f511211564574770aa8c658a400b100e588bc60b8234e59b35ff72c7851cc28f3b5403b13a2c6cbce
-  languageName: node
-  linkType: hard
-
 "http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
@@ -3710,19 +3230,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
-  dependencies:
-    depd: 2.0.0
-    inherits: 2.0.4
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    toidentifier: 1.0.1
-  checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920
-  languageName: node
-  linkType: hard
-
 "http-proxy-agent@npm:^7.0.0":
   version: 7.0.2
   resolution: "http-proxy-agent@npm:7.0.2"
@@ -3743,15 +3250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24":
-  version: 0.4.24
-  resolution: "iconv-lite@npm:0.4.24"
-  dependencies:
-    safer-buffer: ">= 2.1.2 < 3"
-  checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6
-  languageName: node
-  linkType: hard
-
 "iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
@@ -3802,7 +3300,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3":
+"inherits@npm:2, inherits@npm:^2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
@@ -3819,20 +3317,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ipaddr.js@npm:1.9.1":
-  version: 1.9.1
-  resolution: "ipaddr.js@npm:1.9.1"
-  checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77
-  languageName: node
-  linkType: hard
-
-"is-absolute-url@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "is-absolute-url@npm:4.0.1"
-  checksum: de172a718439982a54477fdae55f21be69ec0e6a4b205db5484975d2f4ee749851fd46c28f3790dfc51a274c2ed1d0f8457b6d1fff02ab829069fd9cc761e48c
-  languageName: node
-  linkType: hard
-
 "is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
@@ -3914,13 +3398,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:5.0.0":
-  version: 5.0.0
-  resolution: "is-plain-object@npm:5.0.0"
-  checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
-  languageName: node
-  linkType: hard
-
 "is-typed-array@npm:^1.1.3":
   version: 1.1.13
   resolution: "is-typed-array@npm:1.1.13"
@@ -4037,7 +3514,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^6.0.1, jsonfile@npm:^6.1.0":
+"jsonfile@npm:^6.1.0":
   version: 6.1.0
   resolution: "jsonfile@npm:6.1.0"
   dependencies:
@@ -4069,15 +3546,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"locate-path@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "locate-path@npm:5.0.0"
-  dependencies:
-    p-locate: ^4.1.0
-  checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
-  languageName: node
-  linkType: hard
-
 "locate-path@npm:^6.0.0":
   version: 6.0.0
   resolution: "locate-path@npm:6.0.0"
@@ -4094,14 +3562,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.15, lodash@npm:^4.17.21":
+"lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
+"loose-envify@npm:^1.1.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
   dependencies:
@@ -4112,7 +3580,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0, loupe@npm:^3.1.1":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.1, loupe@npm:^3.1.2":
   version: 3.1.2
   resolution: "loupe@npm:3.1.2"
   checksum: 4a75bbe8877a1ced3603e08b1095cd6f4c987c50fe63719fdc3009029560f91e07a915e7f6eff1322bb62bfb2a2beeef06b13ccb3c12f81bda9f3674434dcab9
@@ -4162,15 +3630,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-dir@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "make-dir@npm:3.1.0"
-  dependencies:
-    semver: ^6.0.0
-  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
-  languageName: node
-  linkType: hard
-
 "make-fetch-happen@npm:^13.0.0":
   version: 13.0.1
   resolution: "make-fetch-happen@npm:13.0.1"
@@ -4198,22 +3657,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"markdown-to-jsx@npm:^7.4.5":
-  version: 7.5.0
-  resolution: "markdown-to-jsx@npm:7.5.0"
-  peerDependencies:
-    react: ">= 0.14.0"
-  checksum: c9c6f1bfad5f2d9b1d3476eb0313ae3dffd0a9f14011c74efdd7c664fd32ee1842ef48abb16a496046f90361af49aa80a827e9d9c0bc04824a1986fdeb4d1852
-  languageName: node
-  linkType: hard
-
-"media-typer@npm:0.3.0":
-  version: 0.3.0
-  resolution: "media-typer@npm:0.3.0"
-  checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1
-  languageName: node
-  linkType: hard
-
 "memoizerific@npm:^1.11.3":
   version: 1.11.3
   resolution: "memoizerific@npm:1.11.3"
@@ -4223,13 +3666,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-descriptors@npm:1.0.3":
-  version: 1.0.3
-  resolution: "merge-descriptors@npm:1.0.3"
-  checksum: 52117adbe0313d5defa771c9993fe081e2d2df9b840597e966aadafde04ae8d0e3da46bac7ca4efc37d4d2b839436582659cd49c6a43eacb3fe3050896a105d1
-  languageName: node
-  linkType: hard
-
 "merge2@npm:^1.3.0, merge2@npm:^1.4.1":
   version: 1.4.1
   resolution: "merge2@npm:1.4.1"
@@ -4237,13 +3673,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"methods@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "methods@npm:1.1.2"
-  checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a
-  languageName: node
-  linkType: hard
-
 "micromatch@npm:^4.0.4":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
@@ -4254,31 +3683,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-db@npm:1.52.0":
-  version: 1.52.0
-  resolution: "mime-db@npm:1.52.0"
-  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
-  version: 2.1.35
-  resolution: "mime-types@npm:2.1.35"
-  dependencies:
-    mime-db: 1.52.0
-  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
-  languageName: node
-  linkType: hard
-
-"mime@npm:1.6.0":
-  version: 1.6.0
-  resolution: "mime@npm:1.6.0"
-  bin:
-    mime: cli.js
-  checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557
-  languageName: node
-  linkType: hard
-
 "min-indent@npm:^1.0.0, min-indent@npm:^1.0.1":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
@@ -4404,14 +3808,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ms@npm:2.0.0"
-  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.3, ms@npm:^2.1.3":
+"ms@npm:^2.1.3":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -4441,13 +3838,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"negotiator@npm:0.6.3":
-  version: 0.6.3
-  resolution: "negotiator@npm:0.6.3"
-  checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:^0.6.3":
   version: 0.6.4
   resolution: "negotiator@npm:0.6.4"
@@ -4493,29 +3883,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "object-assign@npm:4.1.1"
-  checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
-  languageName: node
-  linkType: hard
-
-"object-inspect@npm:^1.13.1":
-  version: 1.13.2
-  resolution: "object-inspect@npm:1.13.2"
-  checksum: 9f850b3c045db60e0e97746e809ee4090d6ce62195af17dd1e9438ac761394a7d8ec4f7906559aea5424eaf61e35d3e53feded2ccd5f62fcc7d9670d3c8eb353
-  languageName: node
-  linkType: hard
-
-"on-finished@npm:2.4.1":
-  version: 2.4.1
-  resolution: "on-finished@npm:2.4.1"
-  dependencies:
-    ee-first: 1.1.1
-  checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0
-  languageName: node
-  linkType: hard
-
 "once@npm:^1.3.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
@@ -4550,15 +3917,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "p-limit@npm:2.3.0"
-  dependencies:
-    p-try: ^2.0.0
-  checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
-  languageName: node
-  linkType: hard
-
 "p-limit@npm:^3.0.2":
   version: 3.1.0
   resolution: "p-limit@npm:3.1.0"
@@ -4568,15 +3926,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-locate@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "p-locate@npm:4.1.0"
-  dependencies:
-    p-limit: ^2.2.0
-  checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
-  languageName: node
-  linkType: hard
-
 "p-locate@npm:^5.0.0":
   version: 5.0.0
   resolution: "p-locate@npm:5.0.0"
@@ -4595,13 +3944,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-try@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "p-try@npm:2.2.0"
-  checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
-  languageName: node
-  linkType: hard
-
 "package-json-from-dist@npm:^1.0.0":
   version: 1.0.1
   resolution: "package-json-from-dist@npm:1.0.1"
@@ -4618,13 +3960,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parseurl@npm:~1.3.3":
-  version: 1.3.3
-  resolution: "parseurl@npm:1.3.3"
-  checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
-  languageName: node
-  linkType: hard
-
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
@@ -4663,13 +3998,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:0.1.10":
-  version: 0.1.10
-  resolution: "path-to-regexp@npm:0.1.10"
-  checksum: ab7a3b7a0b914476d44030340b0a65d69851af2a0f33427df1476100ccb87d409c39e2182837a96b98fb38c4ef2ba6b87bdad62bb70a2c153876b8061760583c
-  languageName: node
-  linkType: hard
-
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
@@ -4698,15 +4026,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^4.1.0":
-  version: 4.2.0
-  resolution: "pkg-dir@npm:4.2.0"
-  dependencies:
-    find-up: ^4.0.0
-  checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
-  languageName: node
-  linkType: hard
-
 "polished@npm:^4.2.2":
   version: 4.3.1
   resolution: "polished@npm:4.3.1"
@@ -4741,6 +4060,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^3.1.1":
+  version: 3.3.3
+  resolution: "prettier@npm:3.3.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: bc8604354805acfdde6106852d14b045bb20827ad76a5ffc2455b71a8257f94de93f17f14e463fe844808d2ccc87248364a5691488a3304f1031326e62d9276e
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^27.0.2":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
@@ -4776,27 +4104,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prop-types@npm:^15.7.2":
-  version: 15.8.1
-  resolution: "prop-types@npm:15.8.1"
-  dependencies:
-    loose-envify: ^1.4.0
-    object-assign: ^4.1.1
-    react-is: ^16.13.1
-  checksum: c056d3f1c057cb7ff8344c645450e14f088a915d078dcda795041765047fa080d38e5d626560ccaac94a4e16e3aa15f3557c1a9a8d1174530955e992c675e459
-  languageName: node
-  linkType: hard
-
-"proxy-addr@npm:~2.0.7":
-  version: 2.0.7
-  resolution: "proxy-addr@npm:2.0.7"
-  dependencies:
-    forwarded: 0.2.0
-    ipaddr.js: 1.9.1
-  checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74
-  languageName: node
-  linkType: hard
-
 "punycode@npm:^2.1.0":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
@@ -4804,15 +4111,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:6.13.0":
-  version: 6.13.0
-  resolution: "qs@npm:6.13.0"
-  dependencies:
-    side-channel: ^1.0.6
-  checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8
-  languageName: node
-  linkType: hard
-
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -4820,35 +4118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"range-parser@npm:~1.2.1":
-  version: 1.2.1
-  resolution: "range-parser@npm:1.2.1"
-  checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:2.5.2":
-  version: 2.5.2
-  resolution: "raw-body@npm:2.5.2"
-  dependencies:
-    bytes: 3.1.2
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676
-  languageName: node
-  linkType: hard
-
-"react-colorful@npm:^5.1.2":
-  version: 5.6.1
-  resolution: "react-colorful@npm:5.6.1"
-  peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: e432b7cb0df57e8f0bcdc3b012d2e93fcbcb6092c9e0f85654788d5ebfc4442536d8cc35b2418061ba3c4afb8b7788cc101c606d86a1732407921de7a9244c8d
-  languageName: node
-  linkType: hard
-
 "react-confetti@npm:^6.1.0":
   version: 6.1.0
   resolution: "react-confetti@npm:6.1.0"
@@ -4899,34 +4168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-element-to-jsx-string@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "react-element-to-jsx-string@npm:15.0.0"
-  dependencies:
-    "@base2/pretty-print-object": 1.0.1
-    is-plain-object: 5.0.0
-    react-is: 18.1.0
-  peerDependencies:
-    react: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
-    react-dom: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
-  checksum: c3907cc4c1d3e9ecc8ca7727058ebcba6ec89848d9e07bfd2c77ee8f28f1ad99bf55e38359dec8a1125de83d41ac09a2874f53c41415edc86ffa9840fa1b7856
-  languageName: node
-  linkType: hard
-
-"react-is@npm:18.1.0":
-  version: 18.1.0
-  resolution: "react-is@npm:18.1.0"
-  checksum: d206a0fe6790851bff168727bfb896de02c5591695afb0c441163e8630136a3e13ee1a7ddd59fdccddcc93968b4721ae112c10f790b194b03b35a3dc13a355ef
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^16.13.1":
-  version: 16.13.1
-  resolution: "react-is@npm:16.13.1"
-  checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
-  languageName: node
-  linkType: hard
-
 "react-is@npm:^17.0.1":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
@@ -4997,40 +4238,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rehype-external-links@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "rehype-external-links@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@ungap/structured-clone": ^1.0.0
-    hast-util-is-element: ^3.0.0
-    is-absolute-url: ^4.0.0
-    space-separated-tokens: ^2.0.0
-    unist-util-visit: ^5.0.0
-  checksum: f776f306a2698a67b03665280fcc00448a5bf59b997d83fbb70fc3d71acff2c3025c70ee1840f48ca7dff209217ebe9adad085dc7caf9e5907badf8b104898b6
-  languageName: node
-  linkType: hard
-
-"rehype-slug@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "rehype-slug@npm:6.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    github-slugger: ^2.0.0
-    hast-util-heading-rank: ^3.0.0
-    hast-util-to-string: ^3.0.0
-    unist-util-visit: ^5.0.0
-  checksum: 0e13ec558eb142d14a6daeab21bbef7c9230bfabec45987e15a24283650226eae3898ad162b8cb29ee39a8bce536bcc013eeab7dc6faa0295b0e91612a8c9f6e
-  languageName: node
-  linkType: hard
-
-"requireindex@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "requireindex@npm:1.2.0"
-  checksum: 50d8b10a1ff1fdf6aea7a1870bc7bd238b0fb1917d8d7ca17fd03afc38a65dcd7a8a4eddd031f89128b5f0065833d5c92c4fef67f2c04e8624057fe626c9cf94
-  languageName: node
-  linkType: hard
-
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
@@ -5150,14 +4357,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1":
-  version: 5.2.1
-  resolution: "safe-buffer@npm:5.2.1"
-  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
-  languageName: node
-  linkType: hard
-
-"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
+"safer-buffer@npm:>= 2.1.2 < 3.0.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
   checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
@@ -5173,7 +4373,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^6.0.0, semver@npm:^6.3.1":
+"semver@npm:^6.3.1":
   version: 6.3.1
   resolution: "semver@npm:6.3.1"
   bin:
@@ -5191,39 +4391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"send@npm:0.19.0":
-  version: 0.19.0
-  resolution: "send@npm:0.19.0"
-  dependencies:
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    mime: 1.6.0
-    ms: 2.1.3
-    on-finished: 2.4.1
-    range-parser: ~1.2.1
-    statuses: 2.0.1
-  checksum: 5ae11bd900c1c2575525e2aa622e856804e2f96a09281ec1e39610d089f53aa69e13fd8db84b52f001d0318cf4bb0b3b904ad532fc4c0014eb90d32db0cff55f
-  languageName: node
-  linkType: hard
-
-"serve-static@npm:1.16.2":
-  version: 1.16.2
-  resolution: "serve-static@npm:1.16.2"
-  dependencies:
-    encodeurl: ~2.0.0
-    escape-html: ~1.0.3
-    parseurl: ~1.3.3
-    send: 0.19.0
-  checksum: dffc52feb4cc5c68e66d0c7f3c1824d4e989f71050aefc9bd5f822a42c54c9b814f595fc5f2b717f4c7cc05396145f3e90422af31186a93f76cf15f707019759
-  languageName: node
-  linkType: hard
-
 "set-function-length@npm:^1.2.1":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
@@ -5238,13 +4405,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"setprototypeof@npm:1.2.0":
-  version: 1.2.0
-  resolution: "setprototypeof@npm:1.2.0"
-  checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89
-  languageName: node
-  linkType: hard
-
 "shebang-command@npm:^2.0.0":
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"
@@ -5261,18 +4421,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"side-channel@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "side-channel@npm:1.0.6"
-  dependencies:
-    call-bind: ^1.0.7
-    es-errors: ^1.3.0
-    get-intrinsic: ^1.2.4
-    object-inspect: ^1.13.1
-  checksum: bfc1afc1827d712271453e91b7cd3878ac0efd767495fd4e594c4c2afaa7963b7b510e249572bfd54b0527e66e4a12b61b80c061389e129755f34c493aad9b97
-  languageName: node
-  linkType: hard
-
 "signal-exit@npm:^4.0.1":
   version: 4.1.0
   resolution: "signal-exit@npm:4.1.0"
@@ -5329,13 +4477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"space-separated-tokens@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "space-separated-tokens@npm:2.0.2"
-  checksum: 202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
-  languageName: node
-  linkType: hard
-
 "sprintf-js@npm:^1.1.3":
   version: 1.1.3
   resolution: "sprintf-js@npm:1.1.3"
@@ -5352,23 +4493,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:2.0.1":
-  version: 2.0.1
-  resolution: "statuses@npm:2.0.1"
-  checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
-  languageName: node
-  linkType: hard
-
 "storybook@npm:^8.3.5":
-  version: 8.3.6
-  resolution: "storybook@npm:8.3.6"
+  version: 8.4.4
+  resolution: "storybook@npm:8.4.4"
   dependencies:
-    "@storybook/core": 8.3.6
+    "@storybook/core": 8.4.4
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
   bin:
     getstorybook: ./bin/index.cjs
     sb: ./bin/index.cjs
     storybook: ./bin/index.cjs
-  checksum: 826eaaa84f295aa900a35bed9403e1a1853364f90d50b69270b105d00c945cca9fdbba260b18712f6e43faa07f3dd7ed64e2d9d7257c5f1653820039aeabf4ff
+  checksum: 5e307e0e3af9f1f687388b9040a4a5d040fc48a7af346d19bd0eaf26e22bad49f5048e18a60d2e6122c613a1d40413114a39b908f670daf3f3a9cce1e4cc95cb
   languageName: node
   linkType: hard
 
@@ -5483,15 +4622,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"telejson@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "telejson@npm:7.2.0"
-  dependencies:
-    memoizerific: ^1.11.3
-  checksum: 55a3380c9ff3c5ad84581bb6bda28fc33c6b7c4a0c466894637da687639b8db0d21b0ff4c1bc1a7a92ae6b70662549d09e7b9e8b1ec334b2ef93078762ecdfb9
-  languageName: node
-  linkType: hard
-
 "text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
@@ -5536,13 +4666,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toidentifier@npm:1.0.1":
-  version: 1.0.1
-  resolution: "toidentifier@npm:1.0.1"
-  checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
-  languageName: node
-  linkType: hard
-
 "ts-api-utils@npm:^1.3.0":
   version: 1.3.0
   resolution: "ts-api-utils@npm:1.3.0"
@@ -5611,34 +4734,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^2.19.0, type-fest@npm:~2.19":
+"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"
-  dependencies:
-    media-typer: 0.3.0
-    mime-types: ~2.1.24
-  checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657
-  languageName: node
-  linkType: hard
-
 "typescript-eslint@npm:^8.7.0":
-  version: 8.10.0
-  resolution: "typescript-eslint@npm:8.10.0"
+  version: 8.14.0
+  resolution: "typescript-eslint@npm:8.14.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": 8.10.0
-    "@typescript-eslint/parser": 8.10.0
-    "@typescript-eslint/utils": 8.10.0
+    "@typescript-eslint/eslint-plugin": 8.14.0
+    "@typescript-eslint/parser": 8.14.0
+    "@typescript-eslint/utils": 8.14.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cf0ead50af444a887097f2ed6cf854c318082e5cebde92c218b7616086b844af0a8e80e8b9e946de7f582ed8ed96934c91d27a816130611217c1e9d34d59f20d
+  checksum: b9192c567126d0800b4e8a9b106360d14b0ecd562203e636e594c5629e8a57ced7a342b3a793a7862ab7f85700e737584c686d0021a10db5bb81dba61be81cd7
   languageName: node
   linkType: hard
 
@@ -5687,36 +4800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-is@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "unist-util-is@npm:6.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-  checksum: f630a925126594af9993b091cf807b86811371e465b5049a6283e08537d3e6ba0f7e248e1e7dab52cfe33f9002606acef093441137181b327f6fe504884b20e2
-  languageName: node
-  linkType: hard
-
-"unist-util-visit-parents@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "unist-util-visit-parents@npm:6.0.1"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-is: ^6.0.0
-  checksum: 08927647c579f63b91aafcbec9966dc4a7d0af1e5e26fc69f4e3e6a01215084835a2321b06f3cbe7bf7914a852830fc1439f0fc3d7153d8804ac3ef851ddfa20
-  languageName: node
-  linkType: hard
-
-"unist-util-visit@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-visit@npm:5.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-is: ^6.0.0
-    unist-util-visit-parents: ^6.0.0
-  checksum: 9ec42e618e7e5d0202f3c191cd30791b51641285732767ee2e6bcd035931032e3c1b29093f4d7fd0c79175bbc1f26f24f26ee49770d32be76f8730a652a857e6
-  languageName: node
-  linkType: hard
-
 "universalify@npm:^2.0.0":
   version: 2.0.1
   resolution: "universalify@npm:2.0.1"
@@ -5724,13 +4807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "unpipe@npm:1.0.0"
-  checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
-  languageName: node
-  linkType: hard
-
 "unplugin@npm:^1.3.1":
   version: 1.14.1
   resolution: "unplugin@npm:1.14.1"
@@ -5769,14 +4845,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util-deprecate@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "util-deprecate@npm:1.0.2"
-  checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
-  languageName: node
-  linkType: hard
-
-"util@npm:^0.12.4, util@npm:^0.12.5":
+"util@npm:^0.12.5":
   version: 0.12.5
   resolution: "util@npm:0.12.5"
   dependencies:
@@ -5789,13 +4858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"utils-merge@npm:1.0.1":
-  version: 1.0.1
-  resolution: "utils-merge@npm:1.0.1"
-  checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^9.0.0":
   version: 9.0.1
   resolution: "uuid@npm:9.0.1"
@@ -5805,16 +4867,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vary@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "vary@npm:1.1.2"
-  checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b
-  languageName: node
-  linkType: hard
-
 "vite@npm:^5.4.8":
-  version: 5.4.9
-  resolution: "vite@npm:5.4.9"
+  version: 5.4.11
+  resolution: "vite@npm:5.4.11"
   dependencies:
     esbuild: ^0.21.3
     fsevents: ~2.3.3
@@ -5851,7 +4906,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: d3229e0618ece284af0478ec09c474a7a70ac369920716afdb6ebed8e320fd17a17c60afddba0d436698fe4837474cccd057c3e7d8270281b57506b78c5fbb8c
+  checksum: 8c5b31d17487b69c40a30419dc0ade9f33360eb6893dbfa33a90980271bd74d35ae550b5cbb2a9e640f0df41ea36fd1bb4f222c98f6d02e607080f20832e69e8
   languageName: node
   linkType: hard
 
diff --git a/yarn.lock b/yarn.lock
index 5a60eb7375..1e28a7a65d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -203,26 +203,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apidevtools/json-schema-ref-parser@npm:^11.7.0":
-  version: 11.7.0
-  resolution: "@apidevtools/json-schema-ref-parser@npm:11.7.0"
+"@apidevtools/json-schema-ref-parser@npm:^11.0.0, @apidevtools/json-schema-ref-parser@npm:^11.7.0":
+  version: 11.7.3
+  resolution: "@apidevtools/json-schema-ref-parser@npm:11.7.3"
   dependencies:
     "@jsdevtools/ono": ^7.1.3
     "@types/json-schema": ^7.0.15
     js-yaml: ^4.1.0
-  checksum: ee1c9e7c1bbf0b8d935522f9407c382e20a54464414fa65326fa8f56239e5a6f2b911f48c65fe2888a94d3445dced46ba36c286da435d47cefc8699d4a5b0ae2
-  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"
-  dependencies:
-    "@jsdevtools/ono": ^7.1.3
-    "@types/json-schema": ^7.0.6
-    call-me-maybe: ^1.0.1
-    js-yaml: ^4.1.0
-  checksum: 5bd6885db0fd6633879bb4638b7a3aead6b061cb6422083c6be505ee6873be54e3376380df164c73edd8901d4145a9bfe9bc0b008a568fd8b0626b1df96fae8f
+  checksum: 3496edfb2c3d2f9a5a7a49795b4d560f1e4957015aef473775f4b5f2db55a4ddfb3778783401ddd24e7db2930a67a370fb8c68840d8bae0a2a581e0e57fc2f58
   languageName: node
   linkType: hard
 
@@ -285,103 +273,95 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asyncapi/avro-schema-parser@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@asyncapi/avro-schema-parser@npm:3.0.15"
+"@asyncapi/avro-schema-parser@npm:^3.0.24":
+  version: 3.0.24
+  resolution: "@asyncapi/avro-schema-parser@npm:3.0.24"
   dependencies:
-    "@asyncapi/parser": ^3.0.7
+    "@asyncapi/parser": ^3.1.0
     "@types/json-schema": ^7.0.11
     avsc: ^5.7.6
-  checksum: 474189dfa61dba6bdd1a7ef4c6f88bd91458bebba0ef0f2238df917f12c2636115b6b50ee1a3e21307689e20cc4364ab02e7d87ab1915d031a9969a93fdc486d
+  checksum: 87d59d157c75e1000b813e386999d9a02553d58fcc1340c2a241f46d0a3638a32281d5136b360bc5065c20ea2ab1ae94fcc1227481eb0dcef5d7ea3396bd3e55
   languageName: node
   linkType: hard
 
-"@asyncapi/openapi-schema-parser@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@asyncapi/openapi-schema-parser@npm:3.0.15"
+"@asyncapi/openapi-schema-parser@npm:^3.0.24":
+  version: 3.0.24
+  resolution: "@asyncapi/openapi-schema-parser@npm:3.0.24"
   dependencies:
-    "@asyncapi/parser": ^3.0.7
+    "@asyncapi/parser": ^3.1.0
     "@openapi-contrib/openapi-schema-to-json-schema": ~3.2.0
     ajv: ^8.11.0
     ajv-errors: ^3.0.0
     ajv-formats: ^2.1.1
-  checksum: 43800f303ddf3f0309befed2d085766726e49bc61208d7ce005ccae3235f3ca48c7e39b3133fc72778b4d2057a323d986552b894389d938e5349ad2e22e37626
+  checksum: 35a443c30a01bd26923027bbf3c639056466917333c0a7882a66cbb2ec361c5dae2575eaf9bdbe847c424b7a518ec8325167f4770202abd07aa4d3b0394887e9
   languageName: node
   linkType: hard
 
-"@asyncapi/parser@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@asyncapi/parser@npm:3.0.7"
+"@asyncapi/parser@npm:^3.1.0, @asyncapi/parser@npm:^3.3.0, @asyncapi/parser@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "@asyncapi/parser@npm:3.4.0"
   dependencies:
-    "@asyncapi/specs": ^6.5.0
+    "@asyncapi/specs": ^6.8.0
     "@openapi-contrib/openapi-schema-to-json-schema": ~3.2.0
-    "@stoplight/json": ^3.20.2
+    "@stoplight/json": 3.21.0
     "@stoplight/json-ref-readers": ^1.2.2
     "@stoplight/json-ref-resolver": ^3.1.5
-    "@stoplight/spectral-core": ^1.16.1
+    "@stoplight/spectral-core": ^1.18.3
     "@stoplight/spectral-functions": ^1.7.2
     "@stoplight/spectral-parsers": ^1.0.2
     "@stoplight/spectral-ref-resolver": ^1.0.3
     "@stoplight/types": ^13.12.0
     "@types/json-schema": ^7.0.11
     "@types/urijs": ^1.19.19
-    ajv: ^8.11.0
+    ajv: ^8.17.1
     ajv-errors: ^3.0.0
     ajv-formats: ^2.1.1
     avsc: ^5.7.5
     js-yaml: ^4.1.0
-    jsonpath-plus: ^7.2.0
+    jsonpath-plus: ^10.0.0
     node-fetch: 2.6.7
-  checksum: 8297f415c43c0e539cdeaaa5ef48c920f24e9af2efae8f7d14c8f1768238bce02075f7f649d29f953eeb9634e8d6692d08e831e3c2fab11bb6c8a98ccbd8f67a
+  checksum: 158eab3b910258ad3c66ebbf94a86bbab4c78d6b4fb0d62980a3bef0e33358f914790e8044c59ef34f6cd25e963d2e5d37e940fc340056c8e9fe14343c8f2ee8
   languageName: node
   linkType: hard
 
-"@asyncapi/protobuf-schema-parser@npm:^3.2.4":
-  version: 3.2.4
-  resolution: "@asyncapi/protobuf-schema-parser@npm:3.2.4"
+"@asyncapi/protobuf-schema-parser@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@asyncapi/protobuf-schema-parser@npm:3.3.0"
   dependencies:
-    "@asyncapi/parser": ^3.0.7
-    "@types/protocol-buffers-schema": ^3.4.1
-    protobufjs: ^7.2.6
-  checksum: 461caaadc3a74eb7856d2535a7f8f6ad768d9e9343e873f180ed9a8cf30cb80bb3f7d96d2ab87e6e4f408908a969740446fe78d86ad6dc25977b8b81993e0242
+    "@asyncapi/parser": ^3.4.0
+    "@types/protocol-buffers-schema": ^3.4.3
+    protobufjs: ^7.4.0
+  checksum: abe9f09f289c20eb93de450f8106380142ce3aed115060939f90f3826030be56d24759ff3d9c63a2476d22888bb56df5da37222d2eca3e9596f9e0ad6461e93f
   languageName: node
   linkType: hard
 
-"@asyncapi/react-component@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@asyncapi/react-component@npm:1.3.1"
+"@asyncapi/react-component@npm:^2.3.3":
+  version: 2.5.0
+  resolution: "@asyncapi/react-component@npm:2.5.0"
   dependencies:
-    "@asyncapi/avro-schema-parser": ^3.0.15
-    "@asyncapi/openapi-schema-parser": ^3.0.15
-    "@asyncapi/parser": ^3.0.7
-    "@asyncapi/protobuf-schema-parser": ^3.2.4
+    "@asyncapi/avro-schema-parser": ^3.0.24
+    "@asyncapi/openapi-schema-parser": ^3.0.24
+    "@asyncapi/parser": ^3.3.0
+    "@asyncapi/protobuf-schema-parser": ^3.3.0
     highlight.js: ^10.7.2
-    isomorphic-dompurify: ^0.13.0
+    isomorphic-dompurify: ^2.14.0
     marked: ^4.0.14
     openapi-sampler: ^1.2.1
-    use-resize-observer: ^8.0.0
+    react-error-boundary: ^4.1.2
+    use-resize-observer: ^9.1.0
   peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: d70992809223643e17bab39352d4fc31b188cd83f548e6ec16d9a638d448a96d1f52e4d9900c9e6a3070211ad6b9ddbb5e992e48445385dbf6cb4c5165d95dac
+    react: ">=18.0.0"
+    react-dom: ">=18.0.0"
+  checksum: d975f6182370f43aef9697e3e5b02d93b8ac8b8fcc43a0f8c4315681fdc3b6819078aa6ff963af1193fe7719c2cee78d55a57f188eb472b3e77494a90dbc75e5
   languageName: node
   linkType: hard
 
-"@asyncapi/specs@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@asyncapi/specs@npm:4.1.0"
+"@asyncapi/specs@npm:^6.8.0":
+  version: 6.8.0
+  resolution: "@asyncapi/specs@npm:6.8.0"
   dependencies:
     "@types/json-schema": ^7.0.11
-  checksum: 6e95f3c1ef7267480cdfc69f5a015f63b9101874289e31843a629346a3ea07490e3043b296a089bf3458e877c664d83d4b4738dcb53d37d7e13b75c7bc08c879
-  languageName: node
-  linkType: hard
-
-"@asyncapi/specs@npm:^6.5.0":
-  version: 6.5.0
-  resolution: "@asyncapi/specs@npm:6.5.0"
-  dependencies:
-    "@types/json-schema": ^7.0.11
-  checksum: 85c3719a9de8af1b0c5585e93be9967845a9c02fc3cc62dcce7f9ed5f31eb1bbab0b8488840da3a93da1e8e4dbb9a8e6a525b19fa6954f94c36b22971cab8788
+  checksum: 8a968a9fb842fa0facf4b727cca4e17792cca26b08f8df4f3c5e32a015a9e30c8a2651f76faaabf0933ec2796b9e6318fc7a8abb64a7a95930637ab3af2bebb4
   languageName: node
   linkType: hard
 
@@ -1845,8 +1825,8 @@ __metadata:
   linkType: hard
 
 "@azure/storage-blob@npm:^12.5.0":
-  version: 12.25.0
-  resolution: "@azure/storage-blob@npm:12.25.0"
+  version: 12.26.0
+  resolution: "@azure/storage-blob@npm:12.26.0"
   dependencies:
     "@azure/abort-controller": ^2.1.2
     "@azure/core-auth": ^1.4.0
@@ -1861,7 +1841,7 @@ __metadata:
     "@azure/logger": ^1.0.0
     events: ^3.0.0
     tslib: ^2.2.0
-  checksum: e592a27d9b8c76654c255544c4b53faea1468bf58f6acb9839115785de46fb6cbd3dce61bb11335af13b932bc651a53eb99140427c7cfcb3f8bd36ecedf38c17
+  checksum: c3f7572bc54cd9e74ac73fa9225cc9398a716e574ff9b637e5b27faf4ac2d6207dc64b39f5dcff1671c4cb6730fbd765ebf796abd3e18ef95f5071d613ce3a13
   languageName: node
   linkType: hard
 
@@ -1874,55 +1854,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.24.7, @babel/code-frame@npm:^7.8.3":
-  version: 7.24.7
-  resolution: "@babel/code-frame@npm:7.24.7"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0, @babel/code-frame@npm:^7.8.3":
+  version: 7.26.2
+  resolution: "@babel/code-frame@npm:7.26.2"
   dependencies:
-    "@babel/highlight": ^7.24.7
+    "@babel/helper-validator-identifier": ^7.25.9
+    js-tokens: ^4.0.0
     picocolors: ^1.0.0
-  checksum: 830e62cd38775fdf84d612544251ce773d544a8e63df667728cc9e0126eeef14c6ebda79be0f0bc307e8318316b7f58c27ce86702e0a1f5c321d842eb38ffda4
+  checksum: db13f5c42d54b76c1480916485e6900748bbcb0014a8aca87f50a091f70ff4e0d0a6db63cade75eb41fcc3d2b6ba0a7f89e343def4f96f00269b41b8ab8dd7b8
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.25.2":
-  version: 7.25.4
-  resolution: "@babel/compat-data@npm:7.25.4"
-  checksum: b12a91d27c3731a4b0bdc9312a50b1911f41f7f728aaf0d4b32486e2257fd2cb2d3ea1a295e98449600c48f2c7883a3196ca77cda1cef7d97a10c2e83d037974
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.25.9":
+  version: 7.26.2
+  resolution: "@babel/compat-data@npm:7.26.2"
+  checksum: d52fae9b0dc59b409d6005ae6b172e89329f46d68136130065ebe923a156fc633e0f1c8600b3e319b9e0f99fd948f64991a5419e2e9431d00d9d235d5f7a7618
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.19.6, @babel/core@npm:^7.24.7, @babel/core@npm:^7.25.2":
-  version: 7.25.2
-  resolution: "@babel/core@npm:7.25.2"
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.18.9, @babel/core@npm:^7.19.6, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.7, @babel/core@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/core@npm:7.26.0"
   dependencies:
     "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.24.7
-    "@babel/generator": ^7.25.0
-    "@babel/helper-compilation-targets": ^7.25.2
-    "@babel/helper-module-transforms": ^7.25.2
-    "@babel/helpers": ^7.25.0
-    "@babel/parser": ^7.25.0
-    "@babel/template": ^7.25.0
-    "@babel/traverse": ^7.25.2
-    "@babel/types": ^7.25.2
+    "@babel/code-frame": ^7.26.0
+    "@babel/generator": ^7.26.0
+    "@babel/helper-compilation-targets": ^7.25.9
+    "@babel/helper-module-transforms": ^7.26.0
+    "@babel/helpers": ^7.26.0
+    "@babel/parser": ^7.26.0
+    "@babel/template": ^7.25.9
+    "@babel/traverse": ^7.25.9
+    "@babel/types": ^7.26.0
     convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.3
     semver: ^6.3.1
-  checksum: 9a1ef604a7eb62195f70f9370cec45472a08114e3934e3eaaedee8fd754edf0730e62347c7b4b5e67d743ce57b5bb8cf3b92459482ca94d06e06246ef021390a
+  checksum: b296084cfd818bed8079526af93b5dfa0ba70282532d2132caf71d4060ab190ba26d3184832a45accd82c3c54016985a4109ab9118674347a7e5e9bc464894e6
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4, @babel/generator@npm:^7.7.2":
-  version: 7.25.5
-  resolution: "@babel/generator@npm:7.25.5"
+"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.7.2":
+  version: 7.26.2
+  resolution: "@babel/generator@npm:7.26.2"
   dependencies:
-    "@babel/types": ^7.25.4
+    "@babel/parser": ^7.26.2
+    "@babel/types": ^7.26.0
     "@jridgewell/gen-mapping": ^0.3.5
     "@jridgewell/trace-mapping": ^0.3.25
-    jsesc: ^2.5.1
-  checksum: d7713f02536a8144eca810e9b13ae854b05fec462348eaf52e7b50df2c0a312bc43bfff0e8e10d6dd982e8986d61175ac8e67d7358a8b4dad9db4d6733bf0c9c
+    jsesc: ^3.0.2
+  checksum: 6ff850b7d6082619f8c2f518d993cf7254cfbaa20b026282cbef5c9b2197686d076a432b18e36c4d1a42721c016df4f77a8f62c67600775d9683621d534b91b4
   languageName: node
   linkType: hard
 
@@ -1944,16 +1926,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.10, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.2":
-  version: 7.25.2
-  resolution: "@babel/helper-compilation-targets@npm:7.25.2"
+"@babel/helper-compilation-targets@npm:^7.22.10, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-compilation-targets@npm:7.25.9"
   dependencies:
-    "@babel/compat-data": ^7.25.2
-    "@babel/helper-validator-option": ^7.24.8
-    browserslist: ^4.23.1
+    "@babel/compat-data": ^7.25.9
+    "@babel/helper-validator-option": ^7.25.9
+    browserslist: ^4.24.0
     lru-cache: ^5.1.1
     semver: ^6.3.1
-  checksum: aed33c5496cb9db4b5e2d44e26bf8bc474074cc7f7bb5ebe1d4a20fdeb362cb3ba9e1596ca18c7484bcd6e5c3a155ab975e420d520c0ae60df81f9de04d0fd16
+  checksum: 3af536e2db358b38f968abdf7d512d425d1018fef2f485d6f131a57a7bcaed32c606b4e148bb230e1508fa42b5b2ac281855a68eb78270f54698c48a83201b9b
   languageName: node
   linkType: hard
 
@@ -2040,27 +2022,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.5, @babel/helper-module-imports@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-imports@npm:7.24.7"
+"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.5, @babel/helper-module-imports@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-module-imports@npm:7.25.9"
   dependencies:
-    "@babel/traverse": ^7.24.7
-    "@babel/types": ^7.24.7
-  checksum: 8ac15d96d262b8940bc469052a048e06430bba1296369be695fabdf6799f201dd0b00151762b56012a218464e706bc033f27c07f6cec20c6f8f5fd6543c67054
+    "@babel/traverse": ^7.25.9
+    "@babel/types": ^7.25.9
+  checksum: 1b411ce4ca825422ef7065dffae7d8acef52023e51ad096351e3e2c05837e9bf9fca2af9ca7f28dc26d596a588863d0fedd40711a88e350b736c619a80e704e6
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.25.2":
-  version: 7.25.2
-  resolution: "@babel/helper-module-transforms@npm:7.25.2"
+"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helper-module-transforms@npm:7.26.0"
   dependencies:
-    "@babel/helper-module-imports": ^7.24.7
-    "@babel/helper-simple-access": ^7.24.7
-    "@babel/helper-validator-identifier": ^7.24.7
-    "@babel/traverse": ^7.25.2
+    "@babel/helper-module-imports": ^7.25.9
+    "@babel/helper-validator-identifier": ^7.25.9
+    "@babel/traverse": ^7.25.9
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 282d4e3308df6746289e46e9c39a0870819630af5f84d632559171e4fae6045684d771a65f62df3d569e88ccf81dc2def78b8338a449ae3a94bb421aa14fc367
+  checksum: 942eee3adf2b387443c247a2c190c17c4fd45ba92a23087abab4c804f40541790d51ad5277e4b5b1ed8d5ba5b62de73857446b7742f835c18ebd350384e63917
   languageName: node
   linkType: hard
 
@@ -2073,10 +2054,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.8
-  resolution: "@babel/helper-plugin-utils@npm:7.24.8"
-  checksum: 73b1a83ba8bcee21dc94de2eb7323207391715e4369fd55844bb15cf13e3df6f3d13a40786d990e6370bf0f571d94fc31f70dec96c1d1002058258c35ca3767a
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.25.9, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.25.9
+  resolution: "@babel/helper-plugin-utils@npm:7.25.9"
+  checksum: e19ec8acf0b696756e6d84531f532c5fe508dce57aa68c75572a77798bd04587a844a9a6c8ea7d62d673e21fdc174d091c9097fb29aea1c1b49f9c6eaa80f022
   languageName: node
   linkType: hard
 
@@ -2135,24 +2116,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-string-parser@npm:7.24.8"
-  checksum: 39b03c5119216883878655b149148dc4d2e284791e969b19467a9411fccaa33f7a713add98f4db5ed519535f70ad273cdadfd2eb54d47ebbdeac5083351328ce
+"@babel/helper-string-parser@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-string-parser@npm:7.25.9"
+  checksum: 6435ee0849e101681c1849868278b5aee82686ba2c1e27280e5e8aca6233af6810d39f8e4e693d2f2a44a3728a6ccfd66f72d71826a94105b86b731697cdfa99
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.5, @babel/helper-validator-identifier@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
-  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
+"@babel/helper-validator-identifier@npm:^7.22.5, @babel/helper-validator-identifier@npm:^7.24.7, @babel/helper-validator-identifier@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-identifier@npm:7.25.9"
+  checksum: 5b85918cb1a92a7f3f508ea02699e8d2422fe17ea8e82acd445006c0ef7520fbf48e3dbcdaf7b0a1d571fc3a2715a29719e5226636cb6042e15fe6ed2a590944
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.22.5, @babel/helper-validator-option@npm:^7.24.7, @babel/helper-validator-option@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-validator-option@npm:7.24.8"
-  checksum: a52442dfa74be6719c0608fee3225bd0493c4057459f3014681ea1a4643cd38b68ff477fe867c4b356da7330d085f247f0724d300582fa4ab9a02efaf34d107c
+"@babel/helper-validator-option@npm:^7.22.5, @babel/helper-validator-option@npm:^7.24.7, @babel/helper-validator-option@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-option@npm:7.25.9"
+  checksum: 9491b2755948ebbdd68f87da907283698e663b5af2d2b1b02a2765761974b1120d5d8d49e9175b167f16f72748ffceec8c9cf62acfbee73f4904507b246e2b3d
   languageName: node
   linkType: hard
 
@@ -2167,17 +2148,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/helpers@npm:7.25.0"
+"@babel/helpers@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helpers@npm:7.26.0"
   dependencies:
-    "@babel/template": ^7.25.0
-    "@babel/types": ^7.25.0
-  checksum: 739e3704ff41a30f5eaac469b553f4d3ab02be6ced083f5925851532dfbd9efc5c347728e77b754ed0b262a4e5e384e60932a62c192d338db7e4b7f3adf9f4a7
+    "@babel/template": ^7.25.9
+    "@babel/types": ^7.26.0
+  checksum: d77fe8d45033d6007eadfa440355c1355eed57902d5a302f450827ad3d530343430a21210584d32eef2f216ae463d4591184c6fc60cf205bbf3a884561469200
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.0.0, @babel/highlight@npm:^7.24.7":
+"@babel/highlight@npm:^7.0.0":
   version: 7.24.7
   resolution: "@babel/highlight@npm:7.24.7"
   dependencies:
@@ -2189,14 +2170,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4":
-  version: 7.25.4
-  resolution: "@babel/parser@npm:7.25.4"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.0, @babel/parser@npm:^7.26.2":
+  version: 7.26.2
+  resolution: "@babel/parser@npm:7.26.2"
   dependencies:
-    "@babel/types": ^7.25.4
+    "@babel/types": ^7.26.0
   bin:
     parser: ./bin/babel-parser.js
-  checksum: fe4f083d4ad34f019dd7fad672cd007003004fb0a3df9b7315a5da9a5e8e56c1fed95acab6862e7d76cfccb2e8e364bcc307e9117718e6bb6dfb2e87ad065abf
+  checksum: c88b5ea0adf357ef909cdc2c31e284a154943edc59f63f6e8a4c20bf773a1b2f3d8c2205e59c09ca7cdad91e7466300114548876529277a80651b6436a48d5d9
   languageName: node
   linkType: hard
 
@@ -2453,14 +2434,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.24.7, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.25.4
-  resolution: "@babel/plugin-syntax-typescript@npm:7.25.4"
+"@babel/plugin-syntax-typescript@npm:^7.23.3, @babel/plugin-syntax-typescript@npm:^7.24.7, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.25.9
+  resolution: "@babel/plugin-syntax-typescript@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.8
+    "@babel/helper-plugin-utils": ^7.25.9
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9b89b8930cd5983f64251d75c9fcdc17a8dc73837d6de12220ff972888ecff4054a6467cf0c423cad242aa96c0f0564a39a0823073728cc02239b80d13f02230
+  checksum: 0e9821e8ba7d660c36c919654e4144a70546942ae184e85b8102f2322451eae102cbfadbcadd52ce077a2b44b400ee52394c616feab7b5b9f791b910e933fd33
   languageName: node
   linkType: hard
 
@@ -2975,25 +2956,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-self@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.24.7"
+"@babel/plugin-transform-react-jsx-self@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.25.9
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2d72c33664e614031b8a03fc2d4cfd185e99efb1d681cbde4b0b4ab379864b31d83ee923509892f6d94b2c5893c309f0217d33bcda3e470ed42297f958138381
+  checksum: 41c833cd7f91b1432710f91b1325706e57979b2e8da44e83d86312c78bbe96cd9ef778b4e79e4e17ab25fa32c72b909f2be7f28e876779ede28e27506c41f4ae
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-source@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.24.7"
+"@babel/plugin-transform-react-jsx-source@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.25.9
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c9afcb2259dd124a2de76f8a578589c18bd2f24dbcf78fe02b53c5cbc20c493c4618369604720e4e699b52be10ba0751b97140e1ef8bc8f0de0a935280e9d5b7
+  checksum: a3e0e5672e344e9d01fb20b504fe29a84918eaa70cec512c4d4b1b035f72803261257343d8e93673365b72c371f35cf34bb0d129720bf178a4c87812c8b9c662
   languageName: node
   linkType: hard
 
@@ -3334,78 +3315,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime-corejs3@npm:^7.20.7, @babel/runtime-corejs3@npm:^7.22.15, @babel/runtime-corejs3@npm:^7.24.5":
-  version: 7.24.7
-  resolution: "@babel/runtime-corejs3@npm:7.24.7"
+"@babel/runtime-corejs3@npm:^7.20.7, @babel/runtime-corejs3@npm:^7.22.15, @babel/runtime-corejs3@npm:^7.24.7":
+  version: 7.26.0
+  resolution: "@babel/runtime-corejs3@npm:7.26.0"
   dependencies:
     core-js-pure: ^3.30.2
     regenerator-runtime: ^0.14.0
-  checksum: fb5cae960a2d4cbcb2144059dfa9dbe5530d027fa210a5bc37c67c3014226c32390f221320066124872f3d6c4830af17a19da09c10ab114da9b6fa8ab4377cea
+  checksum: c6c5adac03e33aa4b5bb636a677aa2a6e400b91d91aac5674448d20af4100b80a8bedfb742338e4236e22c092d3edeb27210efdf48bd13ec353bd899f097ff41
   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.13.10, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.9, @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.24.4
-  resolution: "@babel/runtime@npm:7.24.4"
+"@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.13.10, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.25.6, @babel/runtime@npm:^7.26.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.26.0
+  resolution: "@babel/runtime@npm:7.26.0"
   dependencies:
     regenerator-runtime: ^0.14.0
-  checksum: 2f27d4c0ffac7ae7999ac0385e1106f2a06992a8bdcbf3da06adcac7413863cd08c198c2e4e970041bbea849e17f02e1df18875539b6afba76c781b6b59a07c3
+  checksum: c8e2c0504ab271b3467a261a8f119bf2603eb857a0d71e37791f4e3fae00f681365073cc79f141ddaa90c6077c60ba56448004ad5429d07ac73532be9f7cf28a
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.5, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0, @babel/template@npm:^7.3.3":
-  version: 7.25.0
-  resolution: "@babel/template@npm:7.25.0"
+"@babel/template@npm:^7.22.5, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.9, @babel/template@npm:^7.3.3":
+  version: 7.25.9
+  resolution: "@babel/template@npm:7.25.9"
   dependencies:
-    "@babel/code-frame": ^7.24.7
-    "@babel/parser": ^7.25.0
-    "@babel/types": ^7.25.0
-  checksum: 3f2db568718756d0daf2a16927b78f00c425046b654cd30b450006f2e84bdccaf0cbe6dc04994aa1f5f6a4398da2f11f3640a4d3ee31722e43539c4c919c817b
+    "@babel/code-frame": ^7.25.9
+    "@babel/parser": ^7.25.9
+    "@babel/types": ^7.25.9
+  checksum: 103641fea19c7f4e82dc913aa6b6ac157112a96d7c724d513288f538b84bae04fb87b1f1e495ac1736367b1bc30e10f058b30208fb25f66038e1f1eb4e426472
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.4, @babel/traverse@npm:^7.4.5":
-  version: 7.25.4
-  resolution: "@babel/traverse@npm:7.25.4"
+"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.4, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.4.5":
+  version: 7.25.9
+  resolution: "@babel/traverse@npm:7.25.9"
   dependencies:
-    "@babel/code-frame": ^7.24.7
-    "@babel/generator": ^7.25.4
-    "@babel/parser": ^7.25.4
-    "@babel/template": ^7.25.0
-    "@babel/types": ^7.25.4
+    "@babel/code-frame": ^7.25.9
+    "@babel/generator": ^7.25.9
+    "@babel/parser": ^7.25.9
+    "@babel/template": ^7.25.9
+    "@babel/types": ^7.25.9
     debug: ^4.3.1
     globals: ^11.1.0
-  checksum: 3b6d879b9d843b119501585269b3599f047011ae21eb7820d00aef62fc3a2bcdaf6f4cdf2679795a2d7c0b6b5d218974916e422f08dea08613dc42188ef21e4b
+  checksum: 901d325662ff1dd9bc51de00862e01055fa6bc374f5297d7e3731f2f0e268bbb1d2141f53fa82860aa308ee44afdcf186a948f16c83153927925804b95a9594d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.25.4
-  resolution: "@babel/types@npm:7.25.4"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.5, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.26.0
+  resolution: "@babel/types@npm:7.26.0"
   dependencies:
-    "@babel/helper-string-parser": ^7.24.8
-    "@babel/helper-validator-identifier": ^7.24.7
-    to-fast-properties: ^2.0.0
-  checksum: 497f8b583c54a92a59c3ec542144695064cd5c384fcca46ba1aa301d5e5dd6c1d011f312ca024cb0f9c956da07ae82fb4c348c31a30afa31a074c027720d2aa8
+    "@babel/helper-string-parser": ^7.25.9
+    "@babel/helper-validator-identifier": ^7.25.9
+  checksum: a3dd37dabac693018872da96edb8c1843a605c1bfacde6c3f504fba79b972426a6f24df70aa646356c0c1b19bdd2c722c623c684a996c002381071680602280d
   languageName: node
   linkType: hard
 
-"@backstage-community/plugin-explore-common@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "@backstage-community/plugin-explore-common@npm:0.0.6"
-  checksum: f476264bec3b5471619f19fe16e0af13bd86be933f4922461056dff01de9d6efdb17246856cee649046299c763a2b10ceb9652215558c2d7c077385407449b31
+"@backstage-community/plugin-explore-common@npm:^0.0.7":
+  version: 0.0.7
+  resolution: "@backstage-community/plugin-explore-common@npm:0.0.7"
+  checksum: 5248dc09ceab7d532be508a9672bb5c05c3df1f21504d0e3d75e3d6ed812bbc0af3b738b20b9024c240777c8d5c18241bc21ac607b6892ad2b699dc022644bb9
   languageName: node
   linkType: hard
 
 "@backstage-community/plugin-puppetdb@npm:^0.1.18":
-  version: 0.1.21
-  resolution: "@backstage-community/plugin-puppetdb@npm:0.1.21"
+  version: 0.1.22
+  resolution: "@backstage-community/plugin-puppetdb@npm:0.1.22"
   dependencies:
     "@backstage/catalog-model": ^1.7.0
-    "@backstage/core-components": ^0.15.0
-    "@backstage/core-plugin-api": ^1.9.4
+    "@backstage/core-components": ^0.15.1
+    "@backstage/core-plugin-api": ^1.10.0
     "@backstage/errors": ^1.2.4
-    "@backstage/plugin-catalog-react": ^1.13.1
+    "@backstage/plugin-catalog-react": ^1.14.0
     "@material-ui/core": ^4.12.2
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react-use: ^17.2.4
@@ -3413,16 +3393,16 @@ __metadata:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 35ba13300ef26f705ebd7844bfb8e6dc9bda4db5a4d92d09a9d1dbff52c73a5c4175081fd6b3ef4612cb6018250eedd4e7e1db63b9f1339f723866813dae1595
+  checksum: 256a5fb944099d0a2b0c09fc25250e9c9107a0a775d7fc9fb503758b089aa72e623b8eb3ef42761ac24fe1f71abbbbede61454ed131821e003ee7532546c7961
   languageName: node
   linkType: hard
 
 "@backstage-community/plugin-stackstorm@npm:^0.1.16":
-  version: 0.1.19
-  resolution: "@backstage-community/plugin-stackstorm@npm:0.1.19"
+  version: 0.1.20
+  resolution: "@backstage-community/plugin-stackstorm@npm:0.1.20"
   dependencies:
-    "@backstage/core-components": ^0.15.0
-    "@backstage/core-plugin-api": ^1.9.4
+    "@backstage/core-components": ^0.15.1
+    "@backstage/core-plugin-api": ^1.10.0
     "@backstage/errors": ^1.2.4
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -3432,7 +3412,7 @@ __metadata:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 861f59dbdc65e8ed9cb0bbcf08761ce7ae4cc5e43b548e95e99d3411930e77ff946cf6498212d8e3347b1d95feeb2df2777c02f606e9fe224ed22e261e1e2a1d
+  checksum: d746d02bab55cd0b9028eb7426b5082b36329ab1dfb6f01cfdacde0c02d23e9dad605ea02ccc646a03a25f931d0e73ff377be95ded0a4ef4caefb67aeeedac6f
   languageName: node
   linkType: hard
 
@@ -3470,7 +3450,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/backend-app-api@workspace:packages/backend-app-api"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -3492,8 +3471,6 @@ __metadata:
     compression: ^1.7.4
     cookie: ^0.7.0
     cors: ^2.8.5
-    express: ^4.17.1
-    express-promise-router: ^4.1.0
     helmet: ^6.0.0
     http-errors: ^2.0.0
     jose: ^5.0.0
@@ -3505,14 +3482,13 @@ __metadata:
     minimist: ^1.2.5
     morgan: ^1.10.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     node-forge: ^1.3.1
     path-to-regexp: ^8.0.0
     selfsigned: ^2.0.0
     stoppable: ^1.1.0
     supertest: ^7.0.0
     triple-beam: ^1.4.1
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     winston-transport: ^4.5.0
   languageName: unknown
@@ -3605,8 +3581,9 @@ __metadata:
     "@aws-sdk/credential-providers": ^3.350.0
     "@aws-sdk/types": ^3.347.0
     "@aws-sdk/util-stream-node": ^3.350.0
+    "@azure/identity": ^4.0.0
+    "@azure/storage-blob": ^12.5.0
     "@backstage/backend-app-api": "workspace:^"
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-dev-utils": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -3622,19 +3599,19 @@ __metadata:
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/types": "workspace:^"
+    "@google-cloud/cloud-sql-connector": ^1.4.0
     "@google-cloud/storage": ^7.0.0
-    "@keyv/memcache": ^1.3.5
-    "@keyv/redis": ^2.5.3
+    "@keyv/memcache": ^2.0.1
+    "@keyv/redis": ^4.0.1
     "@manypkg/get-packages": ^1.1.3
     "@octokit/rest": ^19.0.3
-    "@opentelemetry/api": ^1.3.0
+    "@opentelemetry/api": ^1.9.0
     "@types/archiver": ^6.0.0
     "@types/base64-stream": ^1.0.2
     "@types/concat-stream": ^2.0.0
     "@types/cors": ^2.8.6
     "@types/express": ^4.17.6
     "@types/http-errors": ^2.0.0
-    "@types/morgan": ^1.9.0
     "@types/node-forge": ^1.3.0
     "@types/pg-format": ^1.0.5
     "@types/stoppable": ^1.1.0
@@ -3656,36 +3633,41 @@ __metadata:
     http-errors: ^2.0.0
     isomorphic-git: ^1.23.0
     jose: ^5.0.0
-    keyv: ^4.5.2
+    keyv: ^5.2.1
     knex: ^3.0.0
     lodash: ^4.17.21
     logform: ^2.3.2
     luxon: ^3.0.0
     minimatch: ^9.0.0
     minimist: ^1.2.5
-    morgan: ^1.10.0
     msw: ^1.0.0
     mysql2: ^3.0.0
     node-fetch: ^2.7.0
     node-forge: ^1.3.1
+    node-mocks-http: ^1.0.0
     p-limit: ^3.1.0
+    p-throttle: ^4.1.1
     path-to-regexp: ^8.0.0
     pg: ^8.11.3
     pg-connection-string: ^2.3.0
     pg-format: ^1.0.4
     raw-body: ^2.4.1
     selfsigned: ^2.0.0
-    stoppable: ^1.1.0
     supertest: ^7.0.0
     tar: ^6.1.12
     triple-beam: ^1.4.1
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     wait-for-expect: ^3.0.2
     winston: ^3.2.1
     winston-transport: ^4.5.0
     yauzl: ^3.0.0
     yn: ^4.0.0
     zod: ^3.22.4
+  peerDependencies:
+    "@google-cloud/cloud-sql-connector": ^1.4.0
+  peerDependenciesMeta:
+    "@google-cloud/cloud-sql-connector":
+      optional: true
   languageName: unknown
   linkType: soft
 
@@ -3763,7 +3745,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/backend-plugin-api@^1.0.0, @backstage/backend-plugin-api@workspace:^, @backstage/backend-plugin-api@workspace:packages/backend-plugin-api":
+"@backstage/backend-plugin-api@npm:^1.0.0, @backstage/backend-plugin-api@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@backstage/backend-plugin-api@npm:1.0.2"
+  dependencies:
+    "@backstage/cli-common": ^0.1.15
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/plugin-auth-node": ^0.5.4
+    "@backstage/plugin-permission-common": ^0.8.2
+    "@backstage/types": ^1.2.0
+    "@types/express": ^4.17.6
+    "@types/luxon": ^3.0.0
+    express: ^4.17.1
+    knex: ^3.0.0
+    luxon: ^3.0.0
+  checksum: c74ff15e54ddf31608551875b8b3c41d606ed889908b47baf167e76cf1a8cdd13b1697b8d3e12396e8ae538c7ef879b96a2e13c1bb5011c0bf1ac23719e7795c
+  languageName: node
+  linkType: hard
+
+"@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"
   dependencies:
@@ -3777,7 +3778,6 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@types/express": ^4.17.6
     "@types/luxon": ^3.0.0
-    express: ^4.17.1
     knex: ^3.0.0
     luxon: ^3.0.0
   languageName: unknown
@@ -3796,8 +3796,8 @@ __metadata:
     "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@keyv/memcache": ^1.3.5
-    "@keyv/redis": ^2.5.3
+    "@keyv/memcache": ^2.0.1
+    "@keyv/redis": ^4.0.1
     "@types/express": ^4.17.6
     "@types/express-serve-static-core": ^4.17.5
     "@types/keyv": ^4.2.0
@@ -3807,7 +3807,7 @@ __metadata:
     cookie: ^0.7.0
     express: ^4.17.1
     fs-extra: ^11.0.0
-    keyv: ^4.5.2
+    keyv: ^5.2.1
     knex: ^3.0.0
     mysql2: ^3.0.0
     pg: ^8.11.3
@@ -3815,13 +3815,67 @@ __metadata:
     supertest: ^7.0.0
     testcontainers: ^10.0.0
     textextensions: ^5.16.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     yn: ^4.0.0
   peerDependencies:
     "@types/jest": "*"
   languageName: unknown
   linkType: soft
 
+"@backstage/canon@workspace:packages/canon":
+  version: 0.0.0-use.local
+  resolution: "@backstage/canon@workspace:packages/canon"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@base_ui/react": ^1.0.0-alpha.3
+    "@chromatic-com/storybook": ^3.2.2
+    "@remixicon/react": ^4.5.0
+    "@storybook/addon-essentials": ^8.4.6
+    "@storybook/addon-interactions": ^8.4.6
+    "@storybook/addon-styling-webpack": ^1.0.1
+    "@storybook/addon-themes": ^8.4.6
+    "@storybook/addon-webpack5-compiler-swc": ^1.0.5
+    "@storybook/blocks": ^8.4.6
+    "@storybook/react": ^8.4.6
+    "@storybook/react-webpack5": ^8.4.6
+    "@storybook/test": ^8.4.6
+    "@testing-library/jest-dom": ^6.0.0
+    "@types/react": ^18.0.0
+    "@types/react-dom": ^18.0.0
+    "@vanilla-extract/rollup-plugin": ^1.3.10
+    "@vanilla-extract/sprinkles": ^1.6.3
+    "@vanilla-extract/webpack-plugin": ^2.3.14
+    eslint-plugin-storybook: ^0.11.1
+    globals: ^15.11.0
+    mini-css-extract-plugin: ^2.9.2
+    react: ^18.0.2
+    react-dom: ^18.0.2
+    react-router-dom: ^6.3.0
+    storybook: ^8.4.6
+    webpack-merge: ^6.0.1
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  languageName: unknown
+  linkType: soft
+
+"@backstage/catalog-client@npm:^1.8.0":
+  version: 1.8.0
+  resolution: "@backstage/catalog-client@npm:1.8.0"
+  dependencies:
+    "@backstage/catalog-model": ^1.7.1
+    "@backstage/errors": ^1.2.5
+    cross-fetch: ^4.0.0
+    uri-template: ^2.0.0
+  checksum: 781ce437855eb59cf33687866b64d374471ed9376cdaec9aa4f5dc389ee2a5eb41e98707c902312cc4b99dfc885daa7e26d59228cf6eb5b539c9207aeda02f8c
+  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"
@@ -3835,7 +3889,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-model@^1.4.3, @backstage/catalog-model@^1.7.0, @backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
+"@backstage/catalog-model@npm:^1.4.3, @backstage/catalog-model@npm:^1.7.0, @backstage/catalog-model@npm:^1.7.1":
+  version: 1.7.1
+  resolution: "@backstage/catalog-model@npm:1.7.1"
+  dependencies:
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    ajv: ^8.10.0
+    lodash: ^4.17.21
+  checksum: 05e2b386aac897f8ac87c1e479101f8da90d96c517c837b99796a4118cce63932ffbb29fbb1f8ec156258370ff5bab65555bbe2fd7091be438f8c554f0a5bdff
+  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:
@@ -3850,12 +3916,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/cli-common@^0.1.14, @backstage/cli-common@workspace:^, @backstage/cli-common@workspace:packages/cli-common":
+"@backstage/cli-common@^0.1.14, @backstage/cli-common@^0.1.15, @backstage/cli-common@workspace:^, @backstage/cli-common@workspace:packages/cli-common":
   version: 0.0.0-use.local
   resolution: "@backstage/cli-common@workspace:packages/cli-common"
   dependencies:
     "@backstage/cli": "workspace:^"
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
   languageName: unknown
   linkType: soft
 
@@ -3867,6 +3933,7 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
     "@manypkg/get-packages": ^1.1.3
     "@yarnpkg/parsers": ^3.0.0
@@ -3880,7 +3947,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/cli@workspace:packages/cli"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
@@ -3906,7 +3972,7 @@ __metadata:
     "@backstage/theme": "workspace:^"
     "@backstage/types": "workspace:^"
     "@manypkg/get-packages": ^1.1.3
-    "@module-federation/enhanced": ^0.6.0
+    "@module-federation/enhanced": ^0.8.0
     "@octokit/graphql": ^5.0.0
     "@octokit/graphql-schema": ^13.7.0
     "@octokit/oauth-app": ^4.2.0
@@ -3938,7 +4004,7 @@ __metadata:
     "@types/http-proxy": ^1.17.4
     "@types/inquirer": ^8.1.3
     "@types/jest": ^29.5.11
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     "@types/npm-packlist": ^3.0.0
     "@types/recursive-readdir": ^2.2.0
     "@types/rollup-plugin-peer-deps-external": ^2.2.0
@@ -3961,9 +4027,9 @@ __metadata:
     commander: ^12.0.0
     cross-fetch: ^4.0.0
     cross-spawn: ^7.0.3
-    css-loader: ^6.5.1
+    css-loader: ^7.0.0
     ctrlc-windows: ^2.1.0
-    del: ^7.0.0
+    del: ^8.0.0
     esbuild: ^0.24.0
     esbuild-loader: ^4.0.0
     eslint: ^8.6.0
@@ -3985,7 +4051,7 @@ __metadata:
     global-agent: ^3.0.0
     globby: ^11.1.0
     handlebars: ^4.7.3
-    html-webpack-plugin: ^5.3.1
+    html-webpack-plugin: ^5.6.3
     inquirer: ^8.2.0
     jest: ^29.7.0
     jest-cli: ^29.7.0
@@ -3997,7 +4063,6 @@ __metadata:
     mini-css-extract-plugin: ^2.4.2
     minimatch: ^9.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     node-libs-browser: ^2.2.1
     nodemon: ^3.0.1
     npm-packlist: ^5.0.0
@@ -4012,7 +4077,7 @@ __metadata:
     react-refresh: ^0.14.0
     recursive-readdir: ^2.2.2
     replace-in-file: ^7.1.0
-    rollup: ^4.0.0
+    rollup: ^4.27.3
     rollup-plugin-dts: ^6.1.0
     rollup-plugin-esbuild: ^6.1.1
     rollup-plugin-postcss: ^4.0.0
@@ -4023,7 +4088,7 @@ __metadata:
     swc-loader: ^0.2.3
     tar: ^6.1.12
     terser-webpack-plugin: ^5.1.3
-    ts-morph: ^23.0.0
+    ts-morph: ^24.0.0
     util: ^0.12.3
     vite: ^5.0.0
     vite-plugin-html: ^3.2.2
@@ -4041,7 +4106,7 @@ __metadata:
     "@rspack/dev-server": ^1.0.9
     "@rspack/plugin-react-refresh": ^1.0.0
     "@vitejs/plugin-react": ^4.0.4
-    vite: ^4.4.9
+    vite: ^5.0.0
     vite-plugin-html: ^3.2.0
     vite-plugin-node-polyfills: ^0.22.0
   peerDependenciesMeta:
@@ -4073,7 +4138,7 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@types/jscodeshift": ^0.12.0
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     chalk: ^4.0.0
     commander: ^12.0.0
     jscodeshift: ^0.16.0
@@ -4083,7 +4148,31 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/config-loader@^1.9.1, @backstage/config-loader@workspace:^, @backstage/config-loader@workspace:packages/config-loader":
+"@backstage/config-loader@npm:^1.9.1":
+  version: 1.9.2
+  resolution: "@backstage/config-loader@npm:1.9.2"
+  dependencies:
+    "@backstage/cli-common": ^0.1.15
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    "@types/json-schema": ^7.0.6
+    ajv: ^8.10.0
+    chokidar: ^3.5.2
+    fs-extra: ^11.2.0
+    json-schema: ^0.4.0
+    json-schema-merge-allof: ^0.8.1
+    json-schema-traverse: ^1.0.0
+    lodash: ^4.17.21
+    minimist: ^1.2.5
+    node-fetch: ^2.7.0
+    typescript-json-schema: ^0.65.0
+    yaml: ^2.0.0
+  checksum: 92d0be7ccb05879d6a095adca144f3e9a330072282a9fddd1300f908d9292cc8531f248309df687c241b22825d63116e1b56f334cfac399e9b93dca22fe77e29
+  languageName: node
+  linkType: hard
+
+"@backstage/config-loader@workspace:^, @backstage/config-loader@workspace:packages/config-loader":
   version: 0.0.0-use.local
   resolution: "@backstage/config-loader@workspace:packages/config-loader"
   dependencies:
@@ -4104,14 +4193,24 @@ __metadata:
     lodash: ^4.17.21
     minimist: ^1.2.5
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     typescript-json-schema: ^0.65.0
     yaml: ^2.0.0
     zen-observable: ^0.10.0
   languageName: unknown
   linkType: soft
 
-"@backstage/config@^1.1.1, @backstage/config@^1.2.0, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
+"@backstage/config@npm:^1.1.1, @backstage/config@npm:^1.2.0, @backstage/config@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@backstage/config@npm:1.3.0"
+  dependencies:
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    ms: ^2.1.3
+  checksum: 8e117d677889a5170c62f4b867830cded1cddc2f3f52c86fef7df60a974e7f9e38f428d12e30b6dcc038971e736162d52469f6d98917a401f825e544443e0e4e
+  languageName: node
+  linkType: hard
+
+"@backstage/config@workspace:^, @backstage/config@workspace:packages/config":
   version: 0.0.0-use.local
   resolution: "@backstage/config@workspace:packages/config"
   dependencies:
@@ -4119,9 +4218,38 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
+    ms: ^2.1.3
   languageName: unknown
   linkType: soft
 
+"@backstage/core-app-api@npm:^1.15.2":
+  version: 1.15.2
+  resolution: "@backstage/core-app-api@npm:1.15.2"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    "@types/prop-types": ^15.7.3
+    history: ^5.0.0
+    i18next: ^22.4.15
+    lodash: ^4.17.21
+    prop-types: ^15.7.2
+    react-use: ^17.2.4
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 7539410665879107bfbe8ae697e9949ba3c697f9ebb63b61a59adb955bee3c35a581cc7d4b16a9c7830adf87081b5968f8ead3719019c3c08f80e2c17840ab0a
+  languageName: node
+  linkType: hard
+
 "@backstage/core-app-api@workspace:^, @backstage/core-app-api@workspace:packages/core-app-api":
   version: 0.0.0-use.local
   resolution: "@backstage/core-app-api@workspace:packages/core-app-api"
@@ -4166,6 +4294,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/core-compat-api@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "@backstage/core-compat-api@npm:0.3.3"
+  dependencies:
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/version-bridge": ^1.0.10
+    lodash: ^4.17.21
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 22b787b80d8e4bfd5ee2da7177fb1c2f64476ee507ab70686a6109ac39fad209896bc3aa09dadf6fb2ad22b0c899202b959d536f70227eebe0598bab1a0a6c50
+  languageName: node
+  linkType: hard
+
 "@backstage/core-compat-api@workspace:^, @backstage/core-compat-api@workspace:packages/core-compat-api":
   version: 0.0.0-use.local
   resolution: "@backstage/core-compat-api@workspace:packages/core-compat-api"
@@ -4182,7 +4330,7 @@ __metadata:
     "@backstage/test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
     "@backstage/version-bridge": "workspace:^"
-    "@oriflame/backstage-plugin-score-card": ^0.8.0
+    "@oriflame/backstage-plugin-score-card": ^0.9.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
     "@types/react": ^18.0.0
@@ -4202,7 +4350,163 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-components@^0.15.0, @backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
+"@backstage/core-components@npm:^0.13.10":
+  version: 0.13.10
+  resolution: "@backstage/core-components@npm:0.13.10"
+  dependencies:
+    "@backstage/config": ^1.1.1
+    "@backstage/core-plugin-api": ^1.8.2
+    "@backstage/errors": ^1.2.3
+    "@backstage/theme": ^0.5.0
+    "@backstage/version-bridge": ^1.0.7
+    "@date-io/core": ^1.3.13
+    "@material-table/core": ^3.1.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^23.0.0
+    "@types/react": ^16.13.1 || ^17.0.0
+    "@types/react-sparklines": ^1.7.0
+    "@types/react-text-truncate": ^0.14.0
+    ansi-regex: ^6.0.1
+    classnames: ^2.2.6
+    d3-selection: ^3.0.0
+    d3-shape: ^3.0.0
+    d3-zoom: ^3.0.0
+    dagre: ^0.8.5
+    linkify-react: 4.1.3
+    linkifyjs: 4.1.3
+    lodash: ^4.17.21
+    pluralize: ^8.0.0
+    qs: ^6.9.4
+    rc-progress: 3.5.1
+    react-helmet: 6.1.0
+    react-hook-form: ^7.12.2
+    react-idle-timer: 5.6.2
+    react-markdown: ^8.0.0
+    react-sparklines: ^1.7.0
+    react-syntax-highlighter: ^15.4.5
+    react-text-truncate: ^0.19.0
+    react-use: ^17.3.2
+    react-virtualized-auto-sizer: ^1.0.11
+    react-window: ^1.8.6
+    remark-gfm: ^3.0.1
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: ec2a0d0a27bc4d6b9d4da97f0b4df600148529ee51bf2c8e7d3adc45c3950adac662535d3beabc451db346f2c7e3c412ceaa756fc774012b43dff5e2695f2271
+  languageName: node
+  linkType: hard
+
+"@backstage/core-components@npm:^0.15.1":
+  version: 0.15.1
+  resolution: "@backstage/core-components@npm:0.15.1"
+  dependencies:
+    "@backstage/config": ^1.2.0
+    "@backstage/core-plugin-api": ^1.10.0
+    "@backstage/errors": ^1.2.4
+    "@backstage/theme": ^0.6.0
+    "@backstage/version-bridge": ^1.0.10
+    "@date-io/core": ^1.3.13
+    "@material-table/core": ^3.1.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^24.0.0
+    "@types/react-sparklines": ^1.7.0
+    ansi-regex: ^6.0.1
+    classnames: ^2.2.6
+    d3-selection: ^3.0.0
+    d3-shape: ^3.0.0
+    d3-zoom: ^3.0.0
+    dagre: ^0.8.5
+    linkify-react: 4.1.3
+    linkifyjs: 4.1.3
+    lodash: ^4.17.21
+    pluralize: ^8.0.0
+    qs: ^6.9.4
+    rc-progress: 3.5.1
+    react-helmet: 6.1.0
+    react-hook-form: ^7.12.2
+    react-idle-timer: 5.7.2
+    react-markdown: ^8.0.0
+    react-sparklines: ^1.7.0
+    react-syntax-highlighter: ^15.4.5
+    react-use: ^17.3.2
+    react-virtualized-auto-sizer: ^1.0.11
+    react-window: ^1.8.6
+    remark-gfm: ^3.0.1
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 1eee1340919893194b34e9ab4237147910caecf1158c511481bbb80630bdd66d7dc0e156f0c1448e6b301689e32f7b98c0bb2f8127f2ffe85e596d9871903fcd
+  languageName: node
+  linkType: hard
+
+"@backstage/core-components@npm:^0.16.1":
+  version: 0.16.1
+  resolution: "@backstage/core-components@npm:0.16.1"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/errors": ^1.2.5
+    "@backstage/theme": ^0.6.2
+    "@backstage/version-bridge": ^1.0.10
+    "@date-io/core": ^1.3.13
+    "@material-table/core": ^3.1.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^24.0.0
+    "@testing-library/react": ^16.0.0
+    "@types/react-sparklines": ^1.7.0
+    ansi-regex: ^6.0.1
+    classnames: ^2.2.6
+    d3-selection: ^3.0.0
+    d3-shape: ^3.0.0
+    d3-zoom: ^3.0.0
+    dagre: ^0.8.5
+    linkify-react: 4.1.3
+    linkifyjs: 4.1.3
+    lodash: ^4.17.21
+    pluralize: ^8.0.0
+    qs: ^6.9.4
+    rc-progress: 3.5.1
+    react-helmet: 6.1.0
+    react-hook-form: ^7.12.2
+    react-idle-timer: 5.7.2
+    react-markdown: ^8.0.0
+    react-sparklines: ^1.7.0
+    react-syntax-highlighter: ^15.4.5
+    react-use: ^17.3.2
+    react-virtualized-auto-sizer: ^1.0.11
+    react-window: ^1.8.6
+    remark-gfm: ^3.0.1
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 83b5acfa236dc8c6ec7128030b8ef68fbc851c4fd3ccc10bf4b4bb5a95c07606bac845c47dae08ce2a852c0ec2d335e6e8850c7621a57c970dbeb0466b8ee958
+  languageName: node
+  linkType: hard
+
+"@backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
   version: 0.0.0-use.local
   resolution: "@backstage/core-components@workspace:packages/core-components"
   dependencies:
@@ -4280,58 +4584,28 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-components@npm:^0.13.10":
-  version: 0.13.10
-  resolution: "@backstage/core-components@npm:0.13.10"
+"@backstage/core-plugin-api@npm:^1.10.0, @backstage/core-plugin-api@npm:^1.10.1, @backstage/core-plugin-api@npm:^1.8.2":
+  version: 1.10.1
+  resolution: "@backstage/core-plugin-api@npm:1.10.1"
   dependencies:
-    "@backstage/config": ^1.1.1
-    "@backstage/core-plugin-api": ^1.8.2
-    "@backstage/errors": ^1.2.3
-    "@backstage/theme": ^0.5.0
-    "@backstage/version-bridge": ^1.0.7
-    "@date-io/core": ^1.3.13
-    "@material-table/core": ^3.1.0
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.61
-    "@react-hookz/web": ^23.0.0
-    "@types/react": ^16.13.1 || ^17.0.0
-    "@types/react-sparklines": ^1.7.0
-    "@types/react-text-truncate": ^0.14.0
-    ansi-regex: ^6.0.1
-    classnames: ^2.2.6
-    d3-selection: ^3.0.0
-    d3-shape: ^3.0.0
-    d3-zoom: ^3.0.0
-    dagre: ^0.8.5
-    linkify-react: 4.1.3
-    linkifyjs: 4.1.3
-    lodash: ^4.17.21
-    pluralize: ^8.0.0
-    qs: ^6.9.4
-    rc-progress: 3.5.1
-    react-helmet: 6.1.0
-    react-hook-form: ^7.12.2
-    react-idle-timer: 5.6.2
-    react-markdown: ^8.0.0
-    react-sparklines: ^1.7.0
-    react-syntax-highlighter: ^15.4.5
-    react-text-truncate: ^0.19.0
-    react-use: ^17.3.2
-    react-virtualized-auto-sizer: ^1.0.11
-    react-window: ^1.8.6
-    remark-gfm: ^3.0.1
-    zen-observable: ^0.10.0
-    zod: ^3.22.4
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    history: ^5.0.0
   peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: ec2a0d0a27bc4d6b9d4da97f0b4df600148529ee51bf2c8e7d3adc45c3950adac662535d3beabc451db346f2c7e3c412ceaa756fc774012b43dff5e2695f2271
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: b9897e92cc595463c11b5719f3d6305debf00dccead6befe04548e7b08c9c03a54c610f64515f443e980c43a6f28e1302ab590d1351bc536d90826f934f336ea
   languageName: node
   linkType: hard
 
-"@backstage/core-plugin-api@^1.8.2, @backstage/core-plugin-api@^1.9.4, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
+"@backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/core-plugin-api@workspace:packages/core-plugin-api"
   dependencies:
@@ -4372,15 +4646,14 @@ __metadata:
     "@types/command-exists": ^1.2.0
     "@types/fs-extra": ^11.0.0
     "@types/inquirer": ^8.1.3
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     "@types/recursive-readdir": ^2.2.0
     chalk: ^4.0.0
     commander: ^12.0.0
     fs-extra: ^11.2.0
     handlebars: ^4.7.3
     inquirer: ^8.2.0
-    msw: ^1.0.0
-    node-fetch: ^2.7.0
+    msw: ^2.0.0
     nodemon: ^3.0.1
     ora: ^5.3.0
     recursive-readdir: ^2.2.2
@@ -4443,7 +4716,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/errors@^1.2.3, @backstage/errors@^1.2.4, @backstage/errors@workspace:^, @backstage/errors@workspace:packages/errors":
+"@backstage/errors@npm:^1.2.3, @backstage/errors@npm:^1.2.4, @backstage/errors@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "@backstage/errors@npm:1.2.5"
+  dependencies:
+    "@backstage/types": ^1.2.0
+    serialize-error: ^8.0.1
+  checksum: 8b4411cca1a9038b136ffa766d3ec284d0dac730ef27b1f565dc7f471249ce87a3d6599fe5c21c7643363ee13f0b0457d5c4fa29d20da64ca3a09fecec3ccd31
+  languageName: node
+  linkType: hard
+
+"@backstage/errors@workspace:^, @backstage/errors@workspace:packages/errors":
   version: 0.0.0-use.local
   resolution: "@backstage/errors@workspace:packages/errors"
   dependencies:
@@ -4465,6 +4748,32 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-app-api@npm:^0.10.2":
+  version: 0.10.2
+  resolution: "@backstage/frontend-app-api@npm:0.10.2"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-app-api": ^1.15.2
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/errors": ^1.2.5
+    "@backstage/frontend-defaults": ^0.1.3
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    lodash: ^4.17.21
+    zod: ^3.22.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 7e3485557c7c852a05e0d8567c8b944457c353bafbdd7b21c8cf22a5927c8a18a8a36ec092e9212bad4613f6f0ca7828e9c74ea2b2edc01159c2cffac9d4a0b3
+  languageName: node
+  linkType: hard
+
 "@backstage/frontend-app-api@workspace:^, @backstage/frontend-app-api@workspace:packages/frontend-app-api":
   version: 0.0.0-use.local
   resolution: "@backstage/frontend-app-api@workspace:packages/frontend-app-api"
@@ -4499,6 +4808,28 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-defaults@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@backstage/frontend-defaults@npm:0.1.3"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/frontend-app-api": ^0.10.2
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/plugin-app": ^0.1.3
+    "@react-hookz/web": ^24.0.0
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 46932dad14f776b979ec9482addb8fd1e771b59f690612be2332937fb6d0a9e6d944658f3a5b11d397b773c421ccf6caba0163d10105e2b78ec4a6ecc924d3f5
+  languageName: node
+  linkType: hard
+
 "@backstage/frontend-defaults@workspace:^, @backstage/frontend-defaults@workspace:packages/frontend-defaults":
   version: 0.0.0-use.local
   resolution: "@backstage/frontend-defaults@workspace:packages/frontend-defaults"
@@ -4529,6 +4860,30 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-plugin-api@npm:^0.9.2":
+  version: 0.9.2
+  resolution: "@backstage/frontend-plugin-api@npm:0.9.2"
+  dependencies:
+    "@backstage/core-components": ^0.16.1
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    "@material-ui/core": ^4.12.4
+    lodash: ^4.17.21
+    zod: ^3.22.4
+    zod-to-json-schema: ^3.21.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 7b24e25ea4178214bdb055faa6dbc62e6be04fe99e89a38a5b79fe9813187d7f6445f798b9c6485a99c8ebb38824677288f133ce73099a3468ddd7c3ec98df26
+  languageName: node
+  linkType: hard
+
 "@backstage/frontend-plugin-api@workspace:^, @backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api"
@@ -4563,6 +4918,31 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-test-utils@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "@backstage/frontend-test-utils@npm:0.2.3"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/frontend-app-api": ^0.10.2
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/plugin-app": ^0.1.3
+    "@backstage/test-utils": ^1.7.2
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    zod: ^3.22.4
+  peerDependencies:
+    "@testing-library/react": ^16.0.0
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 68f6a33b97437f6e3dd7e83e65d44197462a3c8164802bc25a73db5ab3a2726a356f777056cf2700e5702c5a1daa9daca8c0ab4026911159513a2c47c92caf0d
+  languageName: node
+  linkType: hard
+
 "@backstage/frontend-test-utils@workspace:^, @backstage/frontend-test-utils@workspace:packages/frontend-test-utils":
   version: 0.0.0-use.local
   resolution: "@backstage/frontend-test-utils@workspace:packages/frontend-test-utils"
@@ -4593,7 +4973,22 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration-aws-node@^0.1.12, @backstage/integration-aws-node@workspace:^, @backstage/integration-aws-node@workspace:packages/integration-aws-node":
+"@backstage/integration-aws-node@npm:^0.1.12":
+  version: 0.1.13
+  resolution: "@backstage/integration-aws-node@npm:0.1.13"
+  dependencies:
+    "@aws-sdk/client-sts": ^3.350.0
+    "@aws-sdk/credential-provider-node": ^3.350.0
+    "@aws-sdk/credential-providers": ^3.350.0
+    "@aws-sdk/types": ^3.347.0
+    "@aws-sdk/util-arn-parser": ^3.310.0
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+  checksum: 042617852482685c2452549ad1e16ca319f09e9dc366ad90d7307da6e6763c23ada7bce78e415da9ffef3da7a1287c2ce8c4eddabd1deeaf3f0e7249fdc6e3ee
+  languageName: node
+  linkType: hard
+
+"@backstage/integration-aws-node@workspace:^, @backstage/integration-aws-node@workspace:packages/integration-aws-node":
   version: 0.0.0-use.local
   resolution: "@backstage/integration-aws-node@workspace:packages/integration-aws-node"
   dependencies:
@@ -4612,6 +5007,27 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/integration-react@npm:^1.1.24, @backstage/integration-react@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@backstage/integration-react@npm:1.2.1"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/integration": ^1.15.2
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 493e146b2d217ec33ee6f9af39a8289aff230dba548b38d5ec8cff758cfa269184014a18778e54a6599458f408ddc1cab3f2435c229b4f038e9ad423e6086bdb
+  languageName: node
+  linkType: hard
+
 "@backstage/integration-react@workspace:^, @backstage/integration-react@workspace:packages/integration-react":
   version: 0.0.0-use.local
   resolution: "@backstage/integration-react@workspace:packages/integration-react"
@@ -4643,11 +5059,29 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration@^1.15.0, @backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
+"@backstage/integration@npm:^1.15.0, @backstage/integration@npm:^1.15.2, @backstage/integration@npm:^1.9.0":
+  version: 1.15.2
+  resolution: "@backstage/integration@npm:1.15.2"
+  dependencies:
+    "@azure/identity": ^4.0.0
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@octokit/auth-app": ^4.0.0
+    "@octokit/rest": ^19.0.3
+    cross-fetch: ^4.0.0
+    git-url-parse: ^15.0.0
+    lodash: ^4.17.21
+    luxon: ^3.0.0
+  checksum: 59b109e1b9e196e36fc55264258a304839057fc1d8f438740c74c1750ee76a5d39341aa4fddaf5d81d06fdc679076710dd63de2fab4e105012eb040d9e303038
+  languageName: node
+  linkType: hard
+
+"@backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
   version: 0.0.0-use.local
   resolution: "@backstage/integration@workspace:packages/integration"
   dependencies:
     "@azure/identity": ^4.0.0
+    "@azure/storage-blob": ^12.5.0
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/config-loader": "workspace:^"
@@ -4689,7 +5123,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-api-docs@workspace:plugins/api-docs"
   dependencies:
-    "@asyncapi/react-component": 1.3.1
+    "@asyncapi/react-component": ^2.3.3
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
@@ -4760,7 +5194,6 @@ __metadata:
     knex: ^3.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
-    node-fetch: ^2.7.0
     supertest: ^7.0.0
     yn: ^4.0.0
   languageName: unknown
@@ -4786,6 +5219,7 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/core-components": "workspace:^"
     "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/frontend-defaults": "workspace:^"
     "@backstage/frontend-plugin-api": "workspace:^"
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -4804,6 +5238,32 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-app@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@backstage/plugin-app@npm:0.1.3"
+  dependencies:
+    "@backstage/core-components": ^0.16.1
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/integration-react": ^1.2.1
+    "@backstage/plugin-permission-react": ^0.4.28
+    "@backstage/theme": ^0.6.2
+    "@material-ui/core": ^4.9.13
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": ^4.0.0-alpha.61
+    react-use: ^17.2.4
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 9920d4be8e533579de59f43396e1e4ec7bd55fadec58f3e9057401417ec9a126f3df9f4a6fe6c9bcf13e1edb8ded2b9ca41bf871fa3ad21a1b16b5b2a9775731
+  languageName: node
+  linkType: hard
+
 "@backstage/plugin-app@workspace:^, @backstage/plugin-app@workspace:plugins/app":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-app@workspace:plugins/app"
@@ -4880,7 +5340,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-auth-backend-module-aws-alb-provider@workspace:plugins/auth-backend-module-aws-alb-provider"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -4892,7 +5351,6 @@ __metadata:
     jose: ^5.0.0
     msw: ^2.0.8
     node-cache: ^5.1.2
-    node-fetch: ^2.7.0
   languageName: unknown
   linkType: soft
 
@@ -4942,7 +5400,6 @@ __metadata:
     "@backstage/plugin-auth-backend": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
     "@types/passport-oauth2": ^1.4.15
-    node-fetch: ^2.7.0
     passport: ^0.7.0
     passport-oauth2: ^1.6.1
     supertest: ^7.0.0
@@ -4965,9 +5422,8 @@ __metadata:
     express: ^4.18.2
     jose: ^5.0.0
     msw: ^2.0.0
-    node-fetch: ^2.7.0
     node-mocks-http: ^1.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5038,7 +5494,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-auth-backend-module-guest-provider@workspace:plugins/auth-backend-module-guest-provider"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
@@ -5066,7 +5521,6 @@ __metadata:
     express: ^4.18.2
     jose: ^5.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     passport-microsoft: ^1.0.0
     supertest: ^7.0.0
   languageName: unknown
@@ -5105,7 +5559,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-auth-backend-module-oidc-provider@workspace:plugins/auth-backend-module-oidc-provider"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -5267,7 +5720,6 @@ __metadata:
     morgan: ^1.10.0
     msw: ^1.0.0
     node-cache: ^5.1.2
-    node-fetch: ^2.7.0
     openid-client: ^5.2.1
     passport: ^0.7.0
     passport-auth0: ^1.4.3
@@ -5277,13 +5729,39 @@ __metadata:
     passport-oauth2: ^1.6.1
     passport-onelogin-oauth: ^0.0.1
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     yn: ^4.0.0
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-auth-node@^0.5.2, @backstage/plugin-auth-node@workspace:^, @backstage/plugin-auth-node@workspace:plugins/auth-node":
+"@backstage/plugin-auth-node@npm:^0.5.2, @backstage/plugin-auth-node@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "@backstage/plugin-auth-node@npm:0.5.4"
+  dependencies:
+    "@backstage/backend-common": ^0.25.0
+    "@backstage/backend-plugin-api": ^1.0.2
+    "@backstage/catalog-client": ^1.8.0
+    "@backstage/catalog-model": ^1.7.1
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    "@types/express": "*"
+    "@types/passport": ^1.0.3
+    express: ^4.17.1
+    jose: ^5.0.0
+    lodash: ^4.17.21
+    node-fetch: ^2.7.0
+    passport: ^0.7.0
+    winston: ^3.2.1
+    zod: ^3.22.4
+    zod-to-json-schema: ^3.21.4
+    zod-validation-error: ^3.4.0
+  checksum: 3ac80048a7b066e2f05be06412a0205467621cb43a485b3552eb96ec3d90951ec1fac0e066f81fdb30b95c7ddd1d35e920c79138d4c7286bdaf3033d8979ff99
+  languageName: node
+  linkType: hard
+
+"@backstage/plugin-auth-node@workspace:^, @backstage/plugin-auth-node@workspace:plugins/auth-node":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-auth-node@workspace:plugins/auth-node"
   dependencies:
@@ -5296,7 +5774,7 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@types/express": "*"
+    "@types/express": ^4.17.6
     "@types/passport": ^1.0.3
     cookie-parser: ^1.4.6
     express: ^4.17.1
@@ -5304,10 +5782,9 @@ __metadata:
     jose: ^5.0.0
     lodash: ^4.17.21
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     passport: ^0.7.0
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     zod: ^3.22.4
     zod-to-json-schema: ^3.21.4
@@ -5354,7 +5831,7 @@ __metadata:
     "@openapitools/openapi-generator-cli": ^2.4.26
     cross-fetch: ^4.0.0
     msw: ^1.0.0
-    ts-morph: ^22.0.0
+    ts-morph: ^24.0.0
   languageName: unknown
   linkType: soft
 
@@ -5385,7 +5862,7 @@ __metadata:
     aws-sdk-client-mock-jest: ^4.0.0
     luxon: ^3.0.0
     p-limit: ^3.0.2
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     yaml: ^2.0.0
   languageName: unknown
@@ -5395,6 +5872,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-backend-module-azure@workspace:plugins/catalog-backend-module-azure"
   dependencies:
+    "@azure/identity": ^4.0.0
+    "@azure/storage-blob": ^12.5.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -5404,8 +5883,7 @@ __metadata:
     "@backstage/plugin-catalog-node": "workspace:^"
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5424,7 +5902,7 @@ __metadata:
     lodash: ^4.17.21
     openapi-merge: ^1.3.2
     openapi3-ts: ^3.1.2
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5446,7 +5924,7 @@ __metadata:
     "@backstage/plugin-events-node": "workspace:^"
     luxon: ^3.0.0
     msw: ^1.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5462,11 +5940,10 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
-    "@types/node-fetch": ^2.5.12
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    p-throttle: ^4.1.1
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5500,8 +5977,7 @@ __metadata:
     fs-extra: ^11.2.0
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5543,9 +6019,8 @@ __metadata:
     lodash: ^4.17.21
     luxon: ^3.0.0
     minimatch: ^9.0.0
-    msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    msw: ^2.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5582,12 +6057,10 @@ __metadata:
     "@backstage/plugin-events-node": "workspace:^"
     "@gitbeaker/rest": ^40.0.3
     "@types/lodash": ^4.14.151
-    "@types/uuid": ^9.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5595,7 +6068,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-backend-module-incremental-ingestion@workspace:plugins/catalog-backend-module-incremental-ingestion"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -5607,13 +6079,15 @@ __metadata:
     "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@opentelemetry/api": ^1.9.0
     "@types/express": ^4.17.6
     "@types/luxon": ^3.0.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     knex: ^3.0.0
     luxon: ^3.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5633,7 +6107,7 @@ __metadata:
     "@types/lodash": ^4.14.151
     ldapjs: ^2.3.3
     lodash: ^4.17.21
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5664,14 +6138,12 @@ __metadata:
     "@backstage/plugin-catalog-node": "workspace:^"
     "@microsoft/microsoft-graph-types": ^2.6.0
     "@types/lodash": ^4.14.151
-    "@types/node-fetch": ^2.5.12
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     p-limit: ^3.0.2
     qs: ^6.9.4
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5679,7 +6151,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-backend-module-openapi@workspace:plugins/catalog-backend-module-openapi"
   dependencies:
-    "@apidevtools/json-schema-ref-parser": ^9.0.6
+    "@apidevtools/json-schema-ref-parser": ^11.0.0
     "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -5713,8 +6185,7 @@ __metadata:
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -5774,14 +6245,13 @@ __metadata:
     "@backstage/plugin-search-backend-module-catalog": "workspace:^"
     "@backstage/repo-tools": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@opentelemetry/api": ^1.3.0
+    "@opentelemetry/api": ^1.9.0
     "@types/core-js": ^2.5.4
     "@types/express": ^4.17.6
     "@types/git-url-parse": ^9.0.0
     "@types/glob": ^8.0.0
     "@types/lodash": ^4.14.151
     "@types/supertest": ^2.0.8
-    "@types/uuid": ^9.0.0
     better-sqlite3: ^11.0.0
     codeowners-utils: ^1.0.2
     core-js: ^3.6.5
@@ -5795,11 +6265,10 @@ __metadata:
     luxon: ^3.0.0
     minimatch: ^9.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     p-limit: ^3.0.2
     prom-client: ^15.0.0
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     wait-for-expect: ^3.0.2
     winston: ^3.13.0
     yaml: ^2.0.0
@@ -5808,7 +6277,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-common@^1.0.20, @backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
+"@backstage/plugin-catalog-common@npm:^1.0.20, @backstage/plugin-catalog-common@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@backstage/plugin-catalog-common@npm:1.1.1"
+  dependencies:
+    "@backstage/catalog-model": ^1.7.1
+    "@backstage/plugin-permission-common": ^0.8.2
+    "@backstage/plugin-search-common": ^1.2.15
+  checksum: de2205ef4ab6ce43dd46d20daed31b9fd5d395b0d78d0e579c7269a5be0741f65ccc690c2346b5945fdb1c5a11a384b9745cdaa495997a179bea9ed55fc5df86
+  languageName: node
+  linkType: hard
+
+"@backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-common@workspace:plugins/catalog-common"
   dependencies:
@@ -5928,10 +6408,52 @@ __metadata:
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/types": "workspace:^"
+    msw: ^1.0.0
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-react@^1.13.1, @backstage/plugin-catalog-react@^1.9.3, @backstage/plugin-catalog-react@workspace:^, @backstage/plugin-catalog-react@workspace:plugins/catalog-react":
+"@backstage/plugin-catalog-react@npm:^1.14.0, @backstage/plugin-catalog-react@npm:^1.9.3":
+  version: 1.14.2
+  resolution: "@backstage/plugin-catalog-react@npm:1.14.2"
+  dependencies:
+    "@backstage/catalog-client": ^1.8.0
+    "@backstage/catalog-model": ^1.7.1
+    "@backstage/core-compat-api": ^0.3.3
+    "@backstage/core-components": ^0.16.1
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/errors": ^1.2.5
+    "@backstage/frontend-plugin-api": ^0.9.2
+    "@backstage/frontend-test-utils": ^0.2.3
+    "@backstage/integration-react": ^1.2.1
+    "@backstage/plugin-catalog-common": ^1.1.1
+    "@backstage/plugin-permission-common": ^0.8.2
+    "@backstage/plugin-permission-react": ^0.4.28
+    "@backstage/types": ^1.2.0
+    "@backstage/version-bridge": ^1.0.10
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^24.0.0
+    classnames: ^2.2.6
+    lodash: ^4.17.21
+    material-ui-popup-state: ^1.9.3
+    qs: ^6.9.4
+    react-use: ^17.2.4
+    yaml: ^2.0.0
+    zen-observable: ^0.10.0
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 1de29cd4a90fbfa2ba574b6cd69045e15b01e52e2d3963304ab29fc24e00a19d46bd7d3c065ed51ab19bc0ce1bc66e1346d89a3adb034363897b149b3c3dde8e
+  languageName: node
+  linkType: hard
+
+"@backstage/plugin-catalog-react@workspace:^, @backstage/plugin-catalog-react@workspace:plugins/catalog-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-react@workspace:plugins/catalog-react"
   dependencies:
@@ -6121,7 +6643,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-devtools-backend@workspace:plugins/devtools-backend"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -6135,7 +6656,7 @@ __metadata:
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@manypkg/get-packages": ^1.1.3
-    "@types/express": "*"
+    "@types/express": ^4.17.6
     "@types/ping": ^0.4.1
     "@types/supertest": ^2.0.8
     "@types/yarnpkg__lockfile": ^1.1.4
@@ -6145,7 +6666,6 @@ __metadata:
     express-promise-router: ^4.1.0
     fs-extra: ^11.0.0
     lodash: ^4.17.21
-    node-fetch: ^2.7.0
     ping: ^0.4.1
     semver: ^7.5.3
     supertest: ^7.0.0
@@ -6304,7 +6824,9 @@ __metadata:
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/repo-tools": "workspace:^"
     "@backstage/types": "workspace:^"
+    "@types/content-type": ^1.1.8
     "@types/express": ^4.17.6
+    content-type: ^1.0.5
     express: ^4.17.1
     express-promise-router: ^4.1.0
     knex: ^3.0.0
@@ -6317,7 +6839,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-events-node@workspace:plugins/events-node"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -6338,7 +6859,7 @@ __metadata:
     "@backstage/core-plugin-api": "workspace:^"
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
-    "@rjsf/utils": 5.21.2
+    "@rjsf/utils": 5.23.1
     "@types/react": ^18.0.0
     "@types/react-grid-layout": ^1.3.2
     react: ^18.0.2
@@ -6376,10 +6897,10 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
-    "@rjsf/core": 5.21.2
-    "@rjsf/material-ui": 5.21.2
-    "@rjsf/utils": 5.21.2
-    "@rjsf/validator-ajv8": 5.21.2
+    "@rjsf/core": 5.23.1
+    "@rjsf/material-ui": 5.23.1
+    "@rjsf/utils": 5.23.1
+    "@rjsf/validator-ajv8": 5.23.1
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -6436,7 +6957,7 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@google-cloud/container": ^5.0.0
     "@jest-mock/express": ^2.0.1
-    "@kubernetes/client-node": 0.20.0
+    "@kubernetes/client-node": 1.0.0-rc7
     "@types/aws4": ^1.5.1
     "@types/express": ^4.17.6
     "@types/http-proxy-middleware": ^1.0.0
@@ -6480,7 +7001,7 @@ __metadata:
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
-    "@types/node": ^16.11.26
+    "@types/node": ^20.16.0
     "@types/react": ^18.0.0
     cronstrue: ^2.2.0
     js-yaml: ^4.0.0
@@ -6510,7 +7031,7 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@kubernetes/client-node": 0.20.0
+    "@kubernetes/client-node": 1.0.0-rc7
     kubernetes-models: ^4.3.1
     lodash: ^4.17.21
     luxon: ^3.0.0
@@ -6531,7 +7052,7 @@ __metadata:
     "@backstage/plugin-kubernetes-backend": "workspace:^"
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@kubernetes/client-node": ^0.20.0
+    "@kubernetes/client-node": 1.0.0-rc7
     msw: ^1.3.1
     node-fetch: ^2.7.0
     supertest: ^7.0.0
@@ -6554,7 +7075,7 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@kubernetes-models/apimachinery": ^2.0.0
     "@kubernetes-models/base": ^5.0.0
-    "@kubernetes/client-node": ^0.20.0
+    "@kubernetes/client-node": 1.0.0-rc7
     "@material-ui/core": ^4.9.13
     "@material-ui/icons": ^4.11.3
     "@material-ui/lab": ^4.0.0-alpha.61
@@ -6603,7 +7124,7 @@ __metadata:
     "@backstage/test-utils": "workspace:^"
     "@kubernetes-models/apimachinery": ^2.0.0
     "@kubernetes-models/base": ^5.0.0
-    "@kubernetes/client-node": 0.20.0
+    "@kubernetes/client-node": 1.0.0-rc7
     "@material-ui/core": ^4.12.2
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
@@ -6637,7 +7158,6 @@ __metadata:
   dependencies:
     "@aws-sdk/client-ses": ^3.550.0
     "@aws-sdk/types": ^3.347.0
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
@@ -6685,9 +7205,8 @@ __metadata:
     express-promise-router: ^4.1.0
     knex: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     yn: ^4.0.0
   languageName: unknown
@@ -6707,7 +7226,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-notifications-node@workspace:plugins/notifications-node"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/catalog-client": "workspace:^"
@@ -6718,8 +7236,7 @@ __metadata:
     "@backstage/test-utils": "workspace:^"
     knex: ^3.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -6874,7 +7391,7 @@ __metadata:
     "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
-    "@types/express": "*"
+    "@types/express": ^4.17.6
     "@types/lodash": ^4.14.151
     "@types/supertest": ^2.0.8
     dataloader: ^2.0.0
@@ -6882,13 +7399,27 @@ __metadata:
     express-promise-router: ^4.1.0
     lodash: ^4.17.21
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     supertest: ^7.0.0
     yn: ^4.0.0
     zod: ^3.22.4
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-permission-common@npm:^0.8.2":
+  version: 0.8.2
+  resolution: "@backstage/plugin-permission-common@npm:0.8.2"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/errors": ^1.2.5
+    "@backstage/types": ^1.2.0
+    cross-fetch: ^4.0.0
+    uuid: ^11.0.0
+    zod: ^3.22.4
+    zod-to-json-schema: ^3.20.4
+  checksum: f58f205d255c41e39ed331ccb64e807a1ec7728bb7f32c406e52c4d1e4b5e9e2195aa73a1fccbe427c191b0db263f8aa64310dbf5862b4e3834f68a4591de8c3
+  languageName: node
+  linkType: hard
+
 "@backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-common@workspace:plugins/permission-common"
@@ -6899,7 +7430,7 @@ __metadata:
     "@backstage/types": "workspace:^"
     cross-fetch: ^4.0.0
     msw: ^1.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     zod: ^3.22.4
     zod-to-json-schema: ^3.20.4
   languageName: unknown
@@ -6928,6 +7459,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-permission-react@npm:^0.4.28":
+  version: 0.4.28
+  resolution: "@backstage/plugin-permission-react@npm:0.4.28"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/plugin-permission-common": ^0.8.2
+    swr: ^2.0.0
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: ad070512472315556cc456c1edb7bcd70be20e352583f4eca7cc1c21d0b75c6d28eb28a47b07cee18594ff554bf4f78f48e034f56c0bbd6fbd1a28b5efe46763
+  languageName: node
+  linkType: hard
+
 "@backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-react@workspace:plugins/permission-react"
@@ -6971,15 +7522,13 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@types/express": ^4.17.6
     "@types/http-proxy-middleware": ^1.0.0
-    "@types/uuid": ^9.0.0
     "@types/yup": ^0.32.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     http-proxy-middleware: ^2.0.0
     morgan: ^1.10.0
     msw: ^2.0.0
-    node-fetch: ^2.7.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     yaml: ^2.0.0
     yn: ^4.0.0
@@ -7018,7 +7567,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     fs-extra: ^11.2.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.0.0
   languageName: unknown
   linkType: soft
@@ -7037,7 +7585,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     fs-extra: ^11.2.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.0.0
   languageName: unknown
   linkType: soft
@@ -7058,7 +7605,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     fs-extra: ^11.2.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.0.0
   languageName: unknown
   linkType: soft
@@ -7079,7 +7625,6 @@ __metadata:
     fs-extra: ^11.2.0
     git-url-parse: ^15.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     node-html-markdown: ^1.3.0
     yaml: ^2.0.0
   languageName: unknown
@@ -7139,7 +7684,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.0.0
   languageName: unknown
   linkType: soft
@@ -7157,7 +7701,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.0.0
   languageName: unknown
   linkType: soft
@@ -7202,9 +7745,7 @@ __metadata:
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
-    "@gitbeaker/core": ^35.8.0
-    "@gitbeaker/node": ^35.8.0
-    "@gitbeaker/rest": ^39.25.0
+    "@gitbeaker/rest": ^41.2.0
     luxon: ^3.0.0
     winston: ^3.2.1
     yaml: ^2.0.0
@@ -7216,7 +7757,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-notifications@workspace:plugins/scaffolder-backend-module-notifications"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-notifications-common": "workspace:^"
@@ -7244,7 +7784,7 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@types/command-exists": ^1.2.0
     "@types/fs-extra": ^11.0.0
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     command-exists: ^1.2.9
     fs-extra: ^11.0.0
     jest-when: ^3.1.0
@@ -7265,7 +7805,6 @@ __metadata:
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
     msw: ^2.0.0
-    node-fetch: ^2.7.0
     yaml: ^2.3.3
   languageName: unknown
   linkType: soft
@@ -7274,7 +7813,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-yeoman@workspace:plugins/scaffolder-backend-module-yeoman"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
@@ -7305,6 +7843,7 @@ __metadata:
     "@backstage/plugin-bitbucket-cloud-common": "workspace:^"
     "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
+    "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^"
@@ -7319,7 +7858,7 @@ __metadata:
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@opentelemetry/api": ^1.3.0
+    "@opentelemetry/api": ^1.9.0
     "@types/express": ^4.17.6
     "@types/fs-extra": ^11.0.0
     "@types/luxon": ^3.0.0
@@ -7333,7 +7872,7 @@ __metadata:
     fs-extra: ^11.2.0
     globby: ^11.0.0
     isbinaryfile: ^5.0.0
-    isolated-vm: ^4.5.0
+    isolated-vm: ^5.0.1
     jsonschema: ^1.2.6
     knex: ^3.0.0
     lodash: ^4.17.21
@@ -7347,7 +7886,7 @@ __metadata:
     supertest: ^7.0.0
     tar: ^6.1.12
     triple-beam: ^1.4.1
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     wait-for-expect: ^3.0.2
     winston: ^3.2.1
     winston-transport: ^4.7.0
@@ -7444,10 +7983,10 @@ __metadata:
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
     "@react-hookz/web": ^24.0.0
-    "@rjsf/core": 5.21.2
-    "@rjsf/material-ui": 5.21.2
-    "@rjsf/utils": 5.21.2
-    "@rjsf/validator-ajv8": 5.21.2
+    "@rjsf/core": 5.23.1
+    "@rjsf/material-ui": 5.23.1
+    "@rjsf/utils": 5.23.1
+    "@rjsf/validator-ajv8": 5.23.1
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -7458,7 +7997,7 @@ __metadata:
     "@types/react": ^18.0.0
     ajv-errors: ^3.0.0
     classnames: ^2.2.6
-    flatted: 3.3.1
+    flatted: 3.3.2
     humanize-duration: ^3.25.1
     json-schema: ^0.4.0
     json-schema-library: ^9.0.0
@@ -7518,10 +8057,10 @@ __metadata:
     "@material-ui/lab": 4.0.0-alpha.61
     "@microsoft/fetch-event-source": ^2.0.1
     "@react-hookz/web": ^24.0.0
-    "@rjsf/core": 5.21.2
-    "@rjsf/material-ui": 5.21.2
-    "@rjsf/utils": 5.21.2
-    "@rjsf/validator-ajv8": 5.21.2
+    "@rjsf/core": 5.23.1
+    "@rjsf/material-ui": 5.23.1
+    "@rjsf/utils": 5.23.1
+    "@rjsf/validator-ajv8": 5.23.1
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -7535,7 +8074,7 @@ __metadata:
     classnames: ^2.2.6
     git-url-parse: ^15.0.0
     humanize-duration: ^3.25.1
-    idb-keyval: 5.0.2
+    idb-keyval: 5.1.5
     json-schema: ^0.4.0
     json-schema-library: ^9.0.0
     jszip: ^3.10.1
@@ -7604,7 +8143,7 @@ __metadata:
     aws4: ^1.12.0
     elastic-builder: ^2.16.0
     lodash: ^4.17.21
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -7612,7 +8151,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-backend-module-explore@workspace:plugins/search-backend-module-explore"
   dependencies:
-    "@backstage-community/plugin-explore-common": ^0.0.6
+    "@backstage-community/plugin-explore-common": ^0.0.7
     "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -7621,7 +8160,6 @@ __metadata:
     "@backstage/plugin-search-backend-node": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
     msw: ^1.2.1
-    node-fetch: ^2.7.0
   languageName: unknown
   linkType: soft
 
@@ -7638,7 +8176,7 @@ __metadata:
     "@backstage/plugin-search-common": "workspace:^"
     knex: ^3.0.0
     lodash: ^4.17.21
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -7646,7 +8184,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-backend-module-stack-overflow-collator@workspace:plugins/search-backend-module-stack-overflow-collator"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -7654,7 +8191,6 @@ __metadata:
     "@backstage/plugin-search-backend-node": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
     msw: ^1.2.1
-    node-fetch: ^2.7.0
     qs: ^6.9.4
   languageName: unknown
   linkType: soft
@@ -7678,7 +8214,6 @@ __metadata:
     "@backstage/plugin-techdocs-node": "workspace:^"
     lodash: ^4.17.21
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     p-limit: ^3.1.0
   languageName: unknown
   linkType: soft
@@ -7701,7 +8236,7 @@ __metadata:
     lodash: ^4.17.21
     lunr: ^2.3.9
     ndjson: ^2.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   languageName: unknown
   linkType: soft
 
@@ -7735,6 +8270,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-search-common@npm:^1.2.15":
+  version: 1.2.15
+  resolution: "@backstage/plugin-search-common@npm:1.2.15"
+  dependencies:
+    "@backstage/plugin-permission-common": ^0.8.2
+    "@backstage/types": ^1.2.0
+  checksum: 9ea3aafef93074a59127a3e775f82fca1358d330524312c64baaca921baa85e5d80a4042ede050e492ef43c9b6ff9f6eb0a4ea81cb40e09f38834dfc1b57cd57
+  languageName: node
+  linkType: hard
+
 "@backstage/plugin-search-common@workspace:^, @backstage/plugin-search-common@workspace:plugins/search-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-common@workspace:plugins/search-common"
@@ -7775,6 +8320,7 @@ __metadata:
     react-dom: ^18.0.2
     react-router-dom: ^6.3.0
     react-use: ^17.3.2
+    uuid: ^11.0.2
   peerDependencies:
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
@@ -7845,16 +8391,15 @@ __metadata:
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-signals-node": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@types/express": "*"
+    "@types/express": ^4.17.6
     "@types/supertest": ^2.0.8
     "@types/ws": ^8.5.10
     express: ^4.17.1
     express-promise-router: ^4.1.0
     http-proxy-middleware: ^2.0.0
     msw: ^1.0.0
-    node-fetch: ^2.7.0
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     winston: ^3.2.1
     ws: ^8.18.0
     yn: ^4.0.0
@@ -7865,7 +8410,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-signals-node@workspace:plugins/signals-node"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
@@ -7874,7 +8418,7 @@ __metadata:
     "@backstage/types": "workspace:^"
     "@types/express": ^4.17.21
     express: ^4.17.1
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     ws: ^8.18.0
   languageName: unknown
   linkType: soft
@@ -7931,7 +8475,7 @@ __metadata:
     react-dom: ^18.0.2
     react-router-dom: ^6.3.0
     react-use: ^17.2.4
-    uuid: ^9.0.0
+    uuid: ^11.0.0
   peerDependencies:
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
@@ -8002,8 +8546,7 @@ __metadata:
     fs-extra: ^11.2.0
     knex: ^3.0.0
     lodash: ^4.17.21
-    msw: ^1.0.0
-    node-fetch: ^2.7.0
+    msw: ^2.0.0
     p-limit: ^3.1.0
     supertest: ^7.0.0
     winston: ^3.2.1
@@ -8169,7 +8712,6 @@ __metadata:
     "@testing-library/user-event": ^14.0.0
     "@types/dompurify": ^3.0.0
     "@types/react": ^18.0.0
-    canvas: ^2.10.2
     dompurify: ^3.0.0
     git-url-parse: ^15.0.0
     jss: ~10.10.0
@@ -8273,7 +8815,6 @@ __metadata:
   dependencies:
     "@backstage/cli": "workspace:^"
     "@backstage/test-utils": "workspace:^"
-    cross-fetch: ^4.0.0
     msw: ^1.0.0
   languageName: unknown
   linkType: soft
@@ -8305,7 +8846,7 @@ __metadata:
     "@stoplight/spectral-runtime": ^1.1.2
     "@stoplight/types": ^14.0.0
     "@types/is-glob": ^4.0.2
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     "@types/prettier": ^2.0.0
     "@useoptic/openapi-utilities": ^0.55.0
     chalk: ^4.0.0
@@ -8321,7 +8862,8 @@ __metadata:
     minimatch: ^9.0.0
     p-limit: ^3.0.2
     portfinder: ^1.0.32
-    ts-morph: ^23.0.0
+    tar: ^6.1.12
+    ts-morph: ^24.0.0
     yaml-diff-patch: ^2.0.0
   peerDependencies:
     "@microsoft/api-extractor-model": "*"
@@ -8338,6 +8880,38 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/test-utils@npm:^1.7.2":
+  version: 1.7.2
+  resolution: "@backstage/test-utils@npm:1.7.2"
+  dependencies:
+    "@backstage/config": ^1.3.0
+    "@backstage/core-app-api": ^1.15.2
+    "@backstage/core-plugin-api": ^1.10.1
+    "@backstage/plugin-permission-common": ^0.8.2
+    "@backstage/plugin-permission-react": ^0.4.28
+    "@backstage/theme": ^0.6.2
+    "@backstage/types": ^1.2.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    cross-fetch: ^4.0.0
+    i18next: ^22.4.15
+    zen-observable: ^0.10.0
+  peerDependencies:
+    "@testing-library/react": ^16.0.0
+    "@types/jest": "*"
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/jest":
+      optional: true
+    "@types/react":
+      optional: true
+  checksum: 2ef863129664a9c14f1e57c6c36bba873f7c2fcccf2a5dd5594f3773ba52aaed0695a7ae844bbf7f70483a3290421b48d78cb1d4634ac326006dfa30e1c9b306
+  languageName: node
+  linkType: hard
+
 "@backstage/test-utils@workspace:^, @backstage/test-utils@workspace:packages/test-utils":
   version: 0.0.0-use.local
   resolution: "@backstage/test-utils@workspace:packages/test-utils"
@@ -8393,6 +8967,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@backstage/theme@npm:^0.6.0, @backstage/theme@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@backstage/theme@npm:0.6.2"
+  dependencies:
+    "@emotion/react": ^11.10.5
+    "@emotion/styled": ^11.10.5
+    "@mui/material": ^5.12.2
+  peerDependencies:
+    "@material-ui/core": ^4.12.2
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 480bf041bea2919b1d0590c7ee45950d6f2eb00403e40e7a86a0b16c1994693d7c3d67e401ff771d2e920a849d8cb02207a0b1212f436aed973439f66e824803
+  languageName: node
+  linkType: hard
+
 "@backstage/theme@workspace:^, @backstage/theme@workspace:packages/theme":
   version: 0.0.0-use.local
   resolution: "@backstage/theme@workspace:packages/theme"
@@ -8420,7 +9014,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/types@^1.1.1, @backstage/types@workspace:^, @backstage/types@workspace:packages/types":
+"@backstage/types@^1.1.1, @backstage/types@^1.2.0, @backstage/types@workspace:^, @backstage/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@backstage/types@workspace:packages/types"
   dependencies:
@@ -8431,7 +9025,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/version-bridge@^1.0.7, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
+"@backstage/version-bridge@^1.0.10, @backstage/version-bridge@^1.0.7, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
   version: 0.0.0-use.local
   resolution: "@backstage/version-bridge@workspace:packages/version-bridge"
   dependencies:
@@ -8460,6 +9054,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@base_ui/react@npm:^1.0.0-alpha.3":
+  version: 1.0.0-alpha.3
+  resolution: "@base_ui/react@npm:1.0.0-alpha.3"
+  dependencies:
+    "@babel/runtime": ^7.25.6
+    "@floating-ui/react": ^0.26.24
+    "@floating-ui/react-dom": ^2.1.2
+    "@floating-ui/utils": ^0.2.8
+    "@mui/types": ^7.2.17
+    "@mui/utils": ^6.1.1
+    clsx: ^2.1.1
+    prop-types: ^15.8.1
+    use-sync-external-store: ^1.2.2
+  peerDependencies:
+    "@types/react": ^17.0.0 || ^18.0.0
+    react: ^17.0.0 || ^18.0.0
+    react-dom: ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: c725386d8a6cb351742751a115dc3f06d6bf910470912457bb184646dc3890e3a3a971a1364ca2219192524a9cfbb96adc57339c2d54b931342ce705ce5ac220
+  languageName: node
+  linkType: hard
+
 "@bcoe/v8-coverage@npm:^0.2.3":
   version: 0.2.3
   resolution: "@bcoe/v8-coverage@npm:0.2.3"
@@ -8467,19 +9085,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@braintree/sanitize-url@npm:=7.0.2":
-  version: 7.0.2
-  resolution: "@braintree/sanitize-url@npm:7.0.2"
-  checksum: d90baf41220e2c6a53005ab89d01abd2ab007ba341ee77af6f0cc7e30f0fd9c1e8b78b19f7e60ba8c0befe4ecb772dcedb464bd5d768236d7fd8c373d236c169
+"@braintree/sanitize-url@npm:=7.0.4":
+  version: 7.0.4
+  resolution: "@braintree/sanitize-url@npm:7.0.4"
+  checksum: e613da3aa3e2139c3a5cf0121c7d6520c109d9b94540b3967ffff76714f3b2b0e99f4f3f7387f16cf1c189fc0041c6f010ca6e786c73d4ef3221cca0ede38f74
   languageName: node
   linkType: hard
 
-"@bundled-es-modules/cookie@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@bundled-es-modules/cookie@npm:2.0.0"
+"@bundled-es-modules/cookie@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@bundled-es-modules/cookie@npm:2.0.1"
   dependencies:
-    cookie: ^0.5.0
-  checksum: 53114eabbedda20ba6c63f45dcea35c568616d22adf5d1882cef9761f65ae636bf47e0c66325572cc8e3a335e0257caf5f76ff1287990d9e9265be7bc9767a87
+    cookie: ^0.7.2
+  checksum: 4f210f9316a612f03a46c58f0e3de14b2598f36905433b5ac91e305a4185bd3cb0b141622fa54cff2fce18adbac0b5a8df67dca1874aabd81b7a631fc826e116
   languageName: node
   linkType: hard
 
@@ -8502,13 +9120,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/apply-release-plan@npm:^7.0.5":
-  version: 7.0.5
-  resolution: "@changesets/apply-release-plan@npm:7.0.5"
+"@changesets/apply-release-plan@npm:^7.0.6":
+  version: 7.0.6
+  resolution: "@changesets/apply-release-plan@npm:7.0.6"
   dependencies:
-    "@changesets/config": ^3.0.3
+    "@changesets/config": ^3.0.4
     "@changesets/get-version-range-type": ^0.4.0
-    "@changesets/git": ^3.0.1
+    "@changesets/git": ^3.0.2
     "@changesets/should-skip-package": ^0.1.1
     "@changesets/types": ^6.0.0
     "@manypkg/get-packages": ^1.1.3
@@ -8519,13 +9137,13 @@ __metadata:
     prettier: ^2.7.1
     resolve-from: ^5.0.0
     semver: ^7.5.3
-  checksum: f6a1b90d89fd08b46c11fad05d5fee510ff8a1888c163fd6221ccfb045eab013fa57c0c32c5697d6406852a39cf4df01b44f3ecca4746f30bd610bec54aa9abf
+  checksum: d84049b0874fe86db35a18b3959eee5ccb0e1be095a4d4718495e47e1123580c219bbaf4522190394ce3c40380c03b4e83d00e15070f0df77887b15c69fab14c
   languageName: node
   linkType: hard
 
-"@changesets/assemble-release-plan@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "@changesets/assemble-release-plan@npm:6.0.4"
+"@changesets/assemble-release-plan@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "@changesets/assemble-release-plan@npm:6.0.5"
   dependencies:
     "@changesets/errors": ^0.2.0
     "@changesets/get-dependents-graph": ^2.1.2
@@ -8533,7 +9151,7 @@ __metadata:
     "@changesets/types": ^6.0.0
     "@manypkg/get-packages": ^1.1.3
     semver: ^7.5.3
-  checksum: 948066a8ca8e12390599f641a0439b6a4d6c1c2a9958f58596aa50cf68d7d594b28acc1eb6bd0ad17df2025f0614006e44728a2614fad2a3d54c669568bf6d65
+  checksum: d13c28a8666509a1e20dd496d2ec640ab11f610fcd88f69bd6c6166ae285ce647862e6a6a786d537f8d5070720dbca883cc4d1b08f83ed08b8a89b26221ad6c2
   languageName: node
   linkType: hard
 
@@ -8547,20 +9165,20 @@ __metadata:
   linkType: hard
 
 "@changesets/cli@npm:^2.14.0":
-  version: 2.27.9
-  resolution: "@changesets/cli@npm:2.27.9"
+  version: 2.27.10
+  resolution: "@changesets/cli@npm:2.27.10"
   dependencies:
-    "@changesets/apply-release-plan": ^7.0.5
-    "@changesets/assemble-release-plan": ^6.0.4
+    "@changesets/apply-release-plan": ^7.0.6
+    "@changesets/assemble-release-plan": ^6.0.5
     "@changesets/changelog-git": ^0.2.0
-    "@changesets/config": ^3.0.3
+    "@changesets/config": ^3.0.4
     "@changesets/errors": ^0.2.0
     "@changesets/get-dependents-graph": ^2.1.2
-    "@changesets/get-release-plan": ^4.0.4
-    "@changesets/git": ^3.0.1
+    "@changesets/get-release-plan": ^4.0.5
+    "@changesets/git": ^3.0.2
     "@changesets/logger": ^0.1.1
     "@changesets/pre": ^2.0.1
-    "@changesets/read": ^0.6.1
+    "@changesets/read": ^0.6.2
     "@changesets/should-skip-package": ^0.1.1
     "@changesets/types": ^6.0.0
     "@changesets/write": ^0.3.2
@@ -8576,17 +9194,17 @@ __metadata:
     picocolors: ^1.1.0
     resolve-from: ^5.0.0
     semver: ^7.5.3
-    spawndamnit: ^2.0.0
+    spawndamnit: ^3.0.1
     term-size: ^2.1.0
   bin:
     changeset: bin.js
-  checksum: 4bd36c152f9f93716b001f3ed849717588d2a9eb97f058e86f95ba6a43d8e4311073174251150aabb96f0a1ab5f8ab5ee6a32f85fc9248363f92b3826227cb9d
+  checksum: 9927bd57299d8b26c49ed48b2380cd19eb7b8a4fafd6babd5ec0d92d3b68cc7a54305201ce63142723de48bc5a9e75f611dd747d5a7c6ac80a934a3c4a83399b
   languageName: node
   linkType: hard
 
-"@changesets/config@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@changesets/config@npm:3.0.3"
+"@changesets/config@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@changesets/config@npm:3.0.4"
   dependencies:
     "@changesets/errors": ^0.2.0
     "@changesets/get-dependents-graph": ^2.1.2
@@ -8594,8 +9212,8 @@ __metadata:
     "@changesets/types": ^6.0.0
     "@manypkg/get-packages": ^1.1.3
     fs-extra: ^7.0.1
-    micromatch: ^4.0.2
-  checksum: f216f497e09c0fcdd4c397fc3998d1651a171b89981d2bed2a6c23c0f55ffa4e240cadbd13902bf91c218686165689a5183674a5b4682d80d3d5b8b9c569f5f1
+    micromatch: ^4.0.8
+  checksum: 43763d930e7fc4f24f9bb7b974708cc72f13d1a3dca10ace21d63135b7ff47dbfa3461cc9842171ae0564e37b17da2cc2e6e3f69a3f180a28efce2389eceb7de
   languageName: node
   linkType: hard
 
@@ -8620,17 +9238,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/get-release-plan@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@changesets/get-release-plan@npm:4.0.4"
+"@changesets/get-release-plan@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@changesets/get-release-plan@npm:4.0.5"
   dependencies:
-    "@changesets/assemble-release-plan": ^6.0.4
-    "@changesets/config": ^3.0.3
+    "@changesets/assemble-release-plan": ^6.0.5
+    "@changesets/config": ^3.0.4
     "@changesets/pre": ^2.0.1
-    "@changesets/read": ^0.6.1
+    "@changesets/read": ^0.6.2
     "@changesets/types": ^6.0.0
     "@manypkg/get-packages": ^1.1.3
-  checksum: 7217347f5bfaa56f97d3964e28e23a109d60c42b7c879c0cab6934feb30bdbdebb6dd0e81b4ecb5ec414be442d566b6af90d9224f6a48a52b6c5269c337f54a6
+  checksum: 3e06ea36b814e9a36aaac3ab46102c01802d2cd262e9ec2705a63c461f43af44be48bd55bb6d86e6753b51aaac81d7c6e2a13bc2e8a86d60fe6bce481dbd2e27
   languageName: node
   linkType: hard
 
@@ -8641,16 +9259,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/git@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@changesets/git@npm:3.0.1"
+"@changesets/git@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@changesets/git@npm:3.0.2"
   dependencies:
     "@changesets/errors": ^0.2.0
     "@manypkg/get-packages": ^1.1.3
     is-subdir: ^1.1.1
-    micromatch: ^4.0.2
-    spawndamnit: ^2.0.0
-  checksum: 46d780fecd3dbdafde7c96dde7fe35a8461bc6edbff1de92d490971a99f021d60c5b4606a1d4fb778567146810090ede6610cf89407c14bde88edaa246801539
+    micromatch: ^4.0.8
+    spawndamnit: ^3.0.1
+  checksum: 56d15fd74881fccd7d46aa8e4d6b808e8d5a349103a5a54f2dd52d91a17056b271b04c28f7709fb162bab48ecaee2f51678fca01ed77be5a8392bf8efa6340c7
   languageName: node
   linkType: hard
 
@@ -8685,18 +9303,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/read@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "@changesets/read@npm:0.6.1"
+"@changesets/read@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@changesets/read@npm:0.6.2"
   dependencies:
-    "@changesets/git": ^3.0.1
+    "@changesets/git": ^3.0.2
     "@changesets/logger": ^0.1.1
     "@changesets/parse": ^0.4.0
     "@changesets/types": ^6.0.0
     fs-extra: ^7.0.1
     p-filter: ^2.1.0
     picocolors: ^1.1.0
-  checksum: d00a18a3d04af5c76e7b763096650ebe16589864ab04eaf9e99c88aa77542f64de547b585037fc204d2055f9dd47fae94c789e2f173d3507a4e29dbe6609dd5b
+  checksum: e47e9a6417c92d9d81f1fb51bf8ba03296daa812acd84a0b30e007f89918822bec6d06148db00ed2fd2eab1fb705b9fa54da931ee8841cd470b1d36e42784ea1
   languageName: node
   linkType: hard
 
@@ -8736,6 +9354,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chromatic-com/storybook@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "@chromatic-com/storybook@npm:3.2.2"
+  dependencies:
+    chromatic: ^11.15.0
+    filesize: ^10.0.12
+    jsonfile: ^6.1.0
+    react-confetti: ^6.1.0
+    strip-ansi: ^7.1.0
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 8f1d03b32e131d391d41913b346d3898e5f2661c54dbe057f05fb1bce2d9b94581942bc5f90efe599b819d1f05d92c50a9be1e0cba2962be797f9a9551b568da
+  languageName: node
+  linkType: hard
+
 "@codemirror/autocomplete@npm:^6.0.0":
   version: 6.3.0
   resolution: "@codemirror/autocomplete@npm:6.3.0"
@@ -8766,8 +9399,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/language@npm:^6.0.0":
-  version: 6.10.3
-  resolution: "@codemirror/language@npm:6.10.3"
+  version: 6.10.6
+  resolution: "@codemirror/language@npm:6.10.6"
   dependencies:
     "@codemirror/state": ^6.0.0
     "@codemirror/view": ^6.23.0
@@ -8775,16 +9408,16 @@ __metadata:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
     style-mod: ^4.0.0
-  checksum: 53fb72299500f63706f78c888d6b5fd81043ea11ea2fa4c72c13c6d4794bb6f4ec29450208c56b4f40e839984b3dc73505262803fa61416baf588da389a7c577
+  checksum: 0bd5e4da0c714b4d2aad2e2ad19bb803d9992e5f0d56da3fb2534e63b03b8a562bd8b9ac4439509c687b589e3eaa5a33339eda13d91e54a5d5a99e032d1be981
   languageName: node
   linkType: hard
 
 "@codemirror/legacy-modes@npm:^6.1.0":
-  version: 6.4.1
-  resolution: "@codemirror/legacy-modes@npm:6.4.1"
+  version: 6.4.2
+  resolution: "@codemirror/legacy-modes@npm:6.4.2"
   dependencies:
     "@codemirror/language": ^6.0.0
-  checksum: 3947842c5f06db49a152bf7dd03a626806c5f2e80abfa9840927396fef08ff8bc2dfb228e7231bd8d0b7bb1a84b7ef582df8361b2bef77419e0e04bf43cc6b7d
+  checksum: fe55df97efe980a573ff5572f480eae323d7652a4a61435c654a90142def7102218023590112de7cd826c495ecaadae68a89fb5e5d4323d207af267bcce1d0c1
   languageName: node
   linkType: hard
 
@@ -8830,13 +9463,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.23.0":
-  version: 6.34.1
-  resolution: "@codemirror/view@npm:6.34.1"
+  version: 6.35.2
+  resolution: "@codemirror/view@npm:6.35.2"
   dependencies:
     "@codemirror/state": ^6.4.0
     style-mod: ^4.1.0
     w3c-keyname: ^2.2.4
-  checksum: 5c7bf199f0b45a3cc192f08c2ac89e5ab972f313cb4f2c979edf6e05b27bccd60c6cb42d5dacb6813ef3a928d75476eb0a00ffdeffd7431c8e9f44bab4f6e12e
+  checksum: 18cc95a38fe451758fda93927873334584714ab9e2f1f8a823c5be00b90576f3f755ce01c399bf861c24449c0cb735b2bb0c6ea8ebda7030f93d7b8fe414e88b
   languageName: node
   linkType: hard
 
@@ -8920,35 +9553,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/babel-plugin@npm:^11.12.0":
-  version: 11.12.0
-  resolution: "@emotion/babel-plugin@npm:11.12.0"
+"@emotion/babel-plugin@npm:^11.13.5":
+  version: 11.13.5
+  resolution: "@emotion/babel-plugin@npm:11.13.5"
   dependencies:
     "@babel/helper-module-imports": ^7.16.7
     "@babel/runtime": ^7.18.3
     "@emotion/hash": ^0.9.2
     "@emotion/memoize": ^0.9.0
-    "@emotion/serialize": ^1.2.0
+    "@emotion/serialize": ^1.3.3
     babel-plugin-macros: ^3.1.0
     convert-source-map: ^1.5.0
     escape-string-regexp: ^4.0.0
     find-root: ^1.1.0
     source-map: ^0.5.7
     stylis: 4.2.0
-  checksum: b5d4b3dfe97e6763794a42b5c3a027a560caa1aa6dcaf05c18e5969691368dd08245c077bad7397dcc720b53d29caeaaec1888121e68cfd9ab02ff52f6fef662
+  checksum: c41df7e6c19520e76d1939f884be878bf88b5ba00bd3de9d05c5b6c5baa5051686ab124d7317a0645de1b017b574d8139ae1d6390ec267fbe8e85a5252afb542
   languageName: node
   linkType: hard
 
-"@emotion/cache@npm:^11.11.0, @emotion/cache@npm:^11.13.0":
-  version: 11.13.1
-  resolution: "@emotion/cache@npm:11.13.1"
+"@emotion/cache@npm:^11.11.0, @emotion/cache@npm:^11.13.5":
+  version: 11.13.5
+  resolution: "@emotion/cache@npm:11.13.5"
   dependencies:
     "@emotion/memoize": ^0.9.0
     "@emotion/sheet": ^1.4.0
-    "@emotion/utils": ^1.4.0
+    "@emotion/utils": ^1.4.2
     "@emotion/weak-memoize": ^0.4.0
     stylis: 4.2.0
-  checksum: 94b161786a03a08a1e30257478fad9a9be1ac8585ddca0c6410d7411fd474fc8b0d6d1167d7d15bdb012d1fd8a1220ac2bbc79501ad9b292b83c17da0874d7de
+  checksum: d4429bcac07730dd65707b8203f855be3d1958183e05d265eeefbeab19822e70c87250fad9abaeaea575d844256d1b8fee348211ef905f7715234df0ee088188
   languageName: node
   linkType: hard
 
@@ -8959,7 +9592,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/hash@npm:^0.9.1, @emotion/hash@npm:^0.9.2":
+"@emotion/hash@npm:^0.9.0, @emotion/hash@npm:^0.9.1, @emotion/hash@npm:^0.9.2":
   version: 0.9.2
   resolution: "@emotion/hash@npm:0.9.2"
   checksum: 379bde2830ccb0328c2617ec009642321c0e009a46aa383dfbe75b679c6aea977ca698c832d225a893901f29d7b3eef0e38cf341f560f6b2b56f1ff23c172387
@@ -8999,15 +9632,15 @@ __metadata:
   linkType: hard
 
 "@emotion/react@npm:^11.10.5":
-  version: 11.13.3
-  resolution: "@emotion/react@npm:11.13.3"
+  version: 11.13.5
+  resolution: "@emotion/react@npm:11.13.5"
   dependencies:
     "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.12.0
-    "@emotion/cache": ^11.13.0
-    "@emotion/serialize": ^1.3.1
+    "@emotion/babel-plugin": ^11.13.5
+    "@emotion/cache": ^11.13.5
+    "@emotion/serialize": ^1.3.3
     "@emotion/use-insertion-effect-with-fallbacks": ^1.1.0
-    "@emotion/utils": ^1.4.0
+    "@emotion/utils": ^1.4.2
     "@emotion/weak-memoize": ^0.4.0
     hoist-non-react-statics: ^3.3.1
   peerDependencies:
@@ -9015,20 +9648,20 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 0b58374bf28de914b49881f0060acfb908989869ebab63a2287773fc5e91a39f15552632b03d376c3e9835c5b4f23a5ebac8b0963b29af164d46c0a77ac928f0
+  checksum: 25c6572bdb1472d622a41817881628eb311deafe507bbb1be95c6a4c2c23a19bdd011c368d5794c5a17a1fdf2b5db327480a4c0b85d9322078d531289c163225
   languageName: node
   linkType: hard
 
-"@emotion/serialize@npm:^1.2.0, @emotion/serialize@npm:^1.3.0, @emotion/serialize@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@emotion/serialize@npm:1.3.1"
+"@emotion/serialize@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@emotion/serialize@npm:1.3.3"
   dependencies:
     "@emotion/hash": ^0.9.2
     "@emotion/memoize": ^0.9.0
     "@emotion/unitless": ^0.10.0
-    "@emotion/utils": ^1.4.0
+    "@emotion/utils": ^1.4.2
     csstype: ^3.0.2
-  checksum: 9a488b1ef8b1609a0a80a957c2e9387703c148bb6444e0b097957cfca5c501191e870d11bae32d73ffeb5fd653961b8dbbd1c2c7e371b062029c0ed31d34162e
+  checksum: 510331233767ae4e09e925287ca2c7269b320fa1d737ea86db5b3c861a734483ea832394c0c1fe5b21468fe335624a75e72818831d303ba38125f54f44ba02e7
   languageName: node
   linkType: hard
 
@@ -9040,22 +9673,22 @@ __metadata:
   linkType: hard
 
 "@emotion/styled@npm:^11.10.5":
-  version: 11.13.0
-  resolution: "@emotion/styled@npm:11.13.0"
+  version: 11.13.5
+  resolution: "@emotion/styled@npm:11.13.5"
   dependencies:
     "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.12.0
+    "@emotion/babel-plugin": ^11.13.5
     "@emotion/is-prop-valid": ^1.3.0
-    "@emotion/serialize": ^1.3.0
+    "@emotion/serialize": ^1.3.3
     "@emotion/use-insertion-effect-with-fallbacks": ^1.1.0
-    "@emotion/utils": ^1.4.0
+    "@emotion/utils": ^1.4.2
   peerDependencies:
     "@emotion/react": ^11.0.0-rc.0
     react: ">=16.8.0"
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: f5b951059418f57bc8ea32b238afb25965ece3314f2ffd1b14ce049ba3c066a424990dfbfabbf57bb88e044eaa80bf19f620ac988adda3d2fc483177be6da05e
+  checksum: 316b3e9f98fc9d3faa54a990ad7f3805611c76a4ebffac9a6c28b6e7e9dd6e9343e9b80c79617af7f64524081a606f3789a89373abf67362fa138028f91b62af
   languageName: node
   linkType: hard
 
@@ -9089,10 +9722,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/utils@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@emotion/utils@npm:1.4.0"
-  checksum: 212af0b0d6bcaa63c76e1a36e35bee4d3579359316c03bf970faabb5427a4c0aab3e2346a721bac54f0c8e027958e759c5682be78f308755a1d9753e83963621
+"@emotion/utils@npm:^1.4.2":
+  version: 1.4.2
+  resolution: "@emotion/utils@npm:1.4.2"
+  checksum: 04cf76849c6401205c058b82689fd0ec5bf501aed6974880fe9681a1d61543efb97e848f4c38664ac4a9068c7ad2d1cb84f73bde6cf95f1208aa3c28e0190321
   languageName: node
   linkType: hard
 
@@ -9110,6 +9743,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/aix-ppc64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/aix-ppc64@npm:0.23.1"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/aix-ppc64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/aix-ppc64@npm:0.24.0"
@@ -9124,6 +9764,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/android-arm64@npm:0.23.1"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/android-arm64@npm:0.24.0"
@@ -9138,6 +9785,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/android-arm@npm:0.23.1"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/android-arm@npm:0.24.0"
@@ -9152,6 +9806,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/android-x64@npm:0.23.1"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/android-x64@npm:0.24.0"
@@ -9166,6 +9827,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/darwin-arm64@npm:0.23.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/darwin-arm64@npm:0.24.0"
@@ -9180,6 +9848,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/darwin-x64@npm:0.23.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/darwin-x64@npm:0.24.0"
@@ -9194,6 +9869,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/freebsd-arm64@npm:0.23.1"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/freebsd-arm64@npm:0.24.0"
@@ -9208,6 +9890,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/freebsd-x64@npm:0.23.1"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/freebsd-x64@npm:0.24.0"
@@ -9222,6 +9911,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-arm64@npm:0.23.1"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-arm64@npm:0.24.0"
@@ -9236,6 +9932,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-arm@npm:0.23.1"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-arm@npm:0.24.0"
@@ -9250,6 +9953,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ia32@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-ia32@npm:0.23.1"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ia32@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-ia32@npm:0.24.0"
@@ -9264,6 +9974,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-loong64@npm:0.23.1"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-loong64@npm:0.24.0"
@@ -9278,6 +9995,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-mips64el@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-mips64el@npm:0.23.1"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-mips64el@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-mips64el@npm:0.24.0"
@@ -9292,6 +10016,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ppc64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-ppc64@npm:0.23.1"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ppc64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-ppc64@npm:0.24.0"
@@ -9306,6 +10037,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-riscv64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-riscv64@npm:0.23.1"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-riscv64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-riscv64@npm:0.24.0"
@@ -9320,6 +10058,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-s390x@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-s390x@npm:0.23.1"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-s390x@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-s390x@npm:0.24.0"
@@ -9334,6 +10079,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/linux-x64@npm:0.23.1"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/linux-x64@npm:0.24.0"
@@ -9348,6 +10100,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/netbsd-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/netbsd-x64@npm:0.23.1"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/netbsd-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/netbsd-x64@npm:0.24.0"
@@ -9355,6 +10114,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/openbsd-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/openbsd-arm64@npm:0.23.1"
+  conditions: os=openbsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/openbsd-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/openbsd-arm64@npm:0.24.0"
@@ -9369,6 +10135,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/openbsd-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/openbsd-x64@npm:0.23.1"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/openbsd-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/openbsd-x64@npm:0.24.0"
@@ -9383,6 +10156,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/sunos-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/sunos-x64@npm:0.23.1"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/sunos-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/sunos-x64@npm:0.24.0"
@@ -9397,6 +10177,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-arm64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/win32-arm64@npm:0.23.1"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-arm64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/win32-arm64@npm:0.24.0"
@@ -9411,6 +10198,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-ia32@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/win32-ia32@npm:0.23.1"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-ia32@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/win32-ia32@npm:0.24.0"
@@ -9425,6 +10219,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-x64@npm:0.23.1":
+  version: 0.23.1
+  resolution: "@esbuild/win32-x64@npm:0.23.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-x64@npm:0.24.0":
   version: 0.24.0
   resolution: "@esbuild/win32-x64@npm:0.24.0"
@@ -9488,41 +10289,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.0.0":
-  version: 1.6.0
-  resolution: "@floating-ui/core@npm:1.6.0"
+"@floating-ui/core@npm:^1.6.0":
+  version: 1.6.8
+  resolution: "@floating-ui/core@npm:1.6.8"
   dependencies:
-    "@floating-ui/utils": ^0.2.1
-  checksum: 2e25c53b0c124c5c9577972f8ae21d081f2f7895e6695836a53074463e8c65b47722744d6d2b5a993164936da006a268bcfe87fe68fd24dc235b1cb86bed3127
+    "@floating-ui/utils": ^0.2.8
+  checksum: 82faa6ea9d57e466779324e51308d6d49c098fb9d184a08d9bb7f4fad83f08cc070fc491f8d56f0cad44a16215fb43f9f829524288413e6c33afcb17303698de
   languageName: node
   linkType: hard
 
-"@floating-ui/dom@npm:^1.6.1":
-  version: 1.6.3
-  resolution: "@floating-ui/dom@npm:1.6.3"
+"@floating-ui/dom@npm:^1.0.0":
+  version: 1.6.12
+  resolution: "@floating-ui/dom@npm:1.6.12"
   dependencies:
-    "@floating-ui/core": ^1.0.0
-    "@floating-ui/utils": ^0.2.0
-  checksum: 81cbb18ece3afc37992f436e469e7fabab2e433248e46fff4302d12493a175b0c64310f8a971e6e1eda7218df28ace6b70237b0f3c22fe12a21bba05b5579555
+    "@floating-ui/core": ^1.6.0
+    "@floating-ui/utils": ^0.2.8
+  checksum: 956514ed100c0c853e73ace9e3c877b7e535444d7c31326f687a7690d49cb1e59ef457e9c93b76141aea0d280e83ed5a983bb852718b62eea581f755454660f6
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom@npm:^2.0.0":
-  version: 2.0.8
-  resolution: "@floating-ui/react-dom@npm:2.0.8"
+"@floating-ui/react-dom@npm:^2.0.0, @floating-ui/react-dom@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@floating-ui/react-dom@npm:2.1.2"
   dependencies:
-    "@floating-ui/dom": ^1.6.1
+    "@floating-ui/dom": ^1.0.0
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 5da7f13a69281e38859a3203a608fe9de1d850b332b355c10c0c2427c7b7209a0374c10f6295b6577c1a70237af8b678340bd4cc0a4b1c66436a94755d81e526
+  checksum: 25bb031686e23062ed4222a8946e76b3f9021d40a48437bd747233c4964a766204b8a55f34fa8b259839af96e60db7c6e3714d81f1de06914294f90e86ffbc48
   languageName: node
   linkType: hard
 
-"@floating-ui/utils@npm:^0.2.0, @floating-ui/utils@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "@floating-ui/utils@npm:0.2.1"
-  checksum: 9ed4380653c7c217cd6f66ae51f20fdce433730dbc77f95b5abfb5a808f5fdb029c6ae249b4e0490a816f2453aa6e586d9a873cd157fdba4690f65628efc6e06
+"@floating-ui/react@npm:^0.26.24":
+  version: 0.26.28
+  resolution: "@floating-ui/react@npm:0.26.28"
+  dependencies:
+    "@floating-ui/react-dom": ^2.1.2
+    "@floating-ui/utils": ^0.2.8
+    tabbable: ^6.0.0
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 1bfcccdb1f388ceb0075dc3e46934f4f04ef10bff2f971e1bf79067391c8729b366025caca0a42f5ca80854820a621a9edecbacdc046c33eb428f508fd6ce1f3
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.2.8":
+  version: 0.2.8
+  resolution: "@floating-ui/utils@npm:0.2.8"
+  checksum: deb98bba017c4e073c7ad5740d4dec33a4d3e0942d412e677ac0504f3dade15a68fc6fd164d43c93c0bb0bcc5dc5015c1f4080dfb1a6161140fe660624f7c875
   languageName: node
   linkType: hard
 
@@ -9533,7 +10348,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/core@npm:^35.8.0, @gitbeaker/core@npm:^35.8.1":
+"@gitbeaker/core@npm:^35.8.1":
   version: 35.8.1
   resolution: "@gitbeaker/core@npm:35.8.1"
   dependencies:
@@ -9547,29 +10362,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/core@npm:^39.34.3":
-  version: 39.34.3
-  resolution: "@gitbeaker/core@npm:39.34.3"
+"@gitbeaker/core@npm:^40.6.0":
+  version: 40.6.0
+  resolution: "@gitbeaker/core@npm:40.6.0"
   dependencies:
-    "@gitbeaker/requester-utils": ^39.34.3
-    qs: ^6.11.2
-    xcase: ^2.0.1
-  checksum: 2b0ccd6137ee717b6f51c51c8f7063b84beeebfdb044574f2257f282864411c4f0932f2619893385f2a86bb4fa342b75be972fd1868640ab4e260f2280cc52b3
-  languageName: node
-  linkType: hard
-
-"@gitbeaker/core@npm:^40.5.1":
-  version: 40.5.1
-  resolution: "@gitbeaker/core@npm:40.5.1"
-  dependencies:
-    "@gitbeaker/requester-utils": ^40.5.1
+    "@gitbeaker/requester-utils": ^40.6.0
     qs: ^6.12.2
     xcase: ^2.0.1
-  checksum: 2e2344ac81b153ef64e93da7a94cc40ead9619e2aefcadb1bcae0b92c2c741e6c08faf36e3b150f15bc80ea35f73bfdc94fbe2792ae462ee8881354f4d7481fd
+  checksum: 3d75175f8adcf04294b5cfb8f040ad372d218473ec35d02b3b59c0538eb16228fc915a92a8582ecff5cad0a8dddcddb5a90b12cfe2ce5aaf9c3b6fccffe7259b
   languageName: node
   linkType: hard
 
-"@gitbeaker/node@npm:^35.1.0, @gitbeaker/node@npm:^35.8.0":
+"@gitbeaker/core@npm:^41.3.0":
+  version: 41.3.0
+  resolution: "@gitbeaker/core@npm:41.3.0"
+  dependencies:
+    "@gitbeaker/requester-utils": ^41.3.0
+    qs: ^6.12.2
+    xcase: ^2.0.1
+  checksum: 7b42c2af717002a54a1a6fdaa4056f2dbf6b52c6c33de68d1ad035b301609322f5b980d0da48918518dde105f4d88b39976cf4510a3d19a34e11b991c111e8fc
+  languageName: node
+  linkType: hard
+
+"@gitbeaker/node@npm:^35.1.0":
   version: 35.8.1
   resolution: "@gitbeaker/node@npm:35.8.1"
   dependencies:
@@ -9593,69 +10408,81 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/requester-utils@npm:^39.34.3":
-  version: 39.34.3
-  resolution: "@gitbeaker/requester-utils@npm:39.34.3"
-  dependencies:
-    picomatch-browser: ^2.2.6
-    qs: ^6.11.2
-    rate-limiter-flexible: ^4.0.0
-    xcase: ^2.0.1
-  checksum: 55881864f42e243d9cd73840ea44c9eee13be7974fa13fde241f19bc47915712532d5f7339a598cdd258c32193a37375719984d2630620ab8d962d6d7724cbeb
-  languageName: node
-  linkType: hard
-
-"@gitbeaker/requester-utils@npm:^40.5.1":
-  version: 40.5.1
-  resolution: "@gitbeaker/requester-utils@npm:40.5.1"
+"@gitbeaker/requester-utils@npm:^40.6.0":
+  version: 40.6.0
+  resolution: "@gitbeaker/requester-utils@npm:40.6.0"
   dependencies:
     picomatch-browser: ^2.2.6
     qs: ^6.12.2
     rate-limiter-flexible: ^4.0.1
     xcase: ^2.0.1
-  checksum: d39e9cc526f4969a6724dd2a0ae9c27f353e4e03b0b8ec569955d7a7b09c4520137b4768f0ec51a5f53f6156505ffa02164815702f77c1d460dd0f68d369af53
+  checksum: 8744487bdba27f2995e483473cb4c3d6926228fa2f0c842bec300e165a09508a5e5ad047d478aeebe226a8f264c92a1dcb0a21f6af316b8fe4ebb679d7283e49
   languageName: node
   linkType: hard
 
-"@gitbeaker/rest@npm:^39.25.0":
-  version: 39.34.3
-  resolution: "@gitbeaker/rest@npm:39.34.3"
+"@gitbeaker/requester-utils@npm:^41.3.0":
+  version: 41.3.0
+  resolution: "@gitbeaker/requester-utils@npm:41.3.0"
   dependencies:
-    "@gitbeaker/core": ^39.34.3
-    "@gitbeaker/requester-utils": ^39.34.3
-  checksum: e2a484891b12c71d4218168ab3884af14d036fb16a710ea023556a3d57dd220b13feaebd1f4aa3f61d0180c9f17b66f283650cd543416bb402d3bed8b6eaa465
+    picomatch-browser: ^2.2.6
+    qs: ^6.12.2
+    rate-limiter-flexible: ^4.0.1
+    xcase: ^2.0.1
+  checksum: 28dc17e995450988e62f9e76557bf0a2fe0a41db2ffc3e088ed5c71009daaa1f26563ad67b61738c6ca5bfde9d25f067a189f4bc0a7e097d5ffa49991d24cd38
   languageName: node
   linkType: hard
 
 "@gitbeaker/rest@npm:^40.0.3":
-  version: 40.5.1
-  resolution: "@gitbeaker/rest@npm:40.5.1"
+  version: 40.6.0
+  resolution: "@gitbeaker/rest@npm:40.6.0"
   dependencies:
-    "@gitbeaker/core": ^40.5.1
-    "@gitbeaker/requester-utils": ^40.5.1
-  checksum: 902ab38daad16dfd1638fce91a1c39baf6409e9bb17c1e13bd904801e85fa796a4cf015ebf4fe3d9cf0b0028a8b26493502a9f331cf990fa73398a752ee41d7e
+    "@gitbeaker/core": ^40.6.0
+    "@gitbeaker/requester-utils": ^40.6.0
+  checksum: e2ae3f460378c0fe226ac13dcc75bcddf44c8bd594c212020d2a088016a2d1735552639cb9a8fe43f85dad0305a918aef485313c5bed8ad62e351affee21da80
+  languageName: node
+  linkType: hard
+
+"@gitbeaker/rest@npm:^41.2.0":
+  version: 41.3.0
+  resolution: "@gitbeaker/rest@npm:41.3.0"
+  dependencies:
+    "@gitbeaker/core": ^41.3.0
+    "@gitbeaker/requester-utils": ^41.3.0
+  checksum: 96aa8d5e7ff3ca0e27f874df8b435fb12d20e6975d2291de26c90b7c2e201c286ffd241884b609b2200ddc4e28a331563b1b2d6767a1dd0160fc341f88761016
+  languageName: node
+  linkType: hard
+
+"@google-cloud/cloud-sql-connector@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@google-cloud/cloud-sql-connector@npm:1.4.0"
+  dependencies:
+    "@googleapis/sqladmin": ^24.0.0
+    gaxios: ^6.1.1
+    google-auth-library: ^9.2.0
+    p-throttle: ^5.1.0
+  checksum: c4ac2cc8cc24cc5966f146fe5686493fdb0bb4fc43a27ec086bd116f5ce475ca88f5e5e5fb79d17e6c31fb1a752d2f7e94433db17eea787696556c45415a31a1
   languageName: node
   linkType: hard
 
 "@google-cloud/container@npm:^5.0.0":
-  version: 5.18.0
-  resolution: "@google-cloud/container@npm:5.18.0"
+  version: 5.19.0
+  resolution: "@google-cloud/container@npm:5.19.0"
   dependencies:
     google-gax: ^4.0.3
-  checksum: 2394886535bb7b15bd23db1a7341f240841895ef23499866d0a7f5da65cac6fe73c5ef6e21c02740292f944898c4145dbab4cc9fb02852b0619d1671935f02ad
+  checksum: 90a31ce375115c9860dfbf2359ffc9052fccf73848e14909820d02a293d0d84705df41e7a24a0913bf093f0aa5b844e8d8d6b1a0f57a2590592e3c75579b4a37
   languageName: node
   linkType: hard
 
 "@google-cloud/firestore@npm:^7.0.0":
-  version: 7.10.0
-  resolution: "@google-cloud/firestore@npm:7.10.0"
+  version: 7.11.0
+  resolution: "@google-cloud/firestore@npm:7.11.0"
   dependencies:
     "@opentelemetry/api": ^1.3.0
     fast-deep-equal: ^3.1.1
     functional-red-black-tree: ^1.0.1
     google-gax: ^4.3.3
     protobufjs: ^7.2.6
-  checksum: c534e49c6b52b7b46366eba009e3f56e8ee10ca0501896a7794470cab32513c6a314f364ff5a3fe5a44b832ba39d1afc86d38b42be3826a615c0a59108185c7d
+  checksum: b926123db5e3f37704c0aa51baee1726b72910a37c7fe99bbfe048afb1fba7fa40d7e5f7c017c7284ebd9273c0237da5c00fac81772ba0de1bed97dc9b71e709
   languageName: node
   linkType: hard
 
@@ -9684,8 +10511,8 @@ __metadata:
   linkType: hard
 
 "@google-cloud/storage@npm:^7.0.0":
-  version: 7.13.0
-  resolution: "@google-cloud/storage@npm:7.13.0"
+  version: 7.14.0
+  resolution: "@google-cloud/storage@npm:7.14.0"
   dependencies:
     "@google-cloud/paginator": ^5.0.0
     "@google-cloud/projectify": ^4.0.0
@@ -9702,7 +10529,16 @@ __metadata:
     retry-request: ^7.0.0
     teeny-request: ^9.0.0
     uuid: ^8.0.0
-  checksum: b5e61b3123f2924aae17f3b1e9aa97092e999f2097c00d90d85329212219cd6b6a63a65fd84d228791b534e4747e96d430007c4a507b37f3e1d6e42a98d4e7e2
+  checksum: c239b0961bb4dfb36fe67fc35b933bf65259bb4ebcdffeb48cdee5e2d838626daef47ba78417d33eb47fda5c2536d89ad1feb33cd59ecc887d47ab992fc80a1b
+  languageName: node
+  linkType: hard
+
+"@googleapis/sqladmin@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "@googleapis/sqladmin@npm:24.0.0"
+  dependencies:
+    googleapis-common: ^7.0.0
+  checksum: b1c93d18b800ecd5af79dc6728e6b030f6918a1c5e2094d2dd7b460e3b2033cb9ce4f4ffe5b6155ecc2f699b8e4bdf0a94999786671b8fa05e1d8f3ce90cf466
   languageName: node
   linkType: hard
 
@@ -10183,42 +11019,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@inquirer/confirm@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@inquirer/confirm@npm:3.0.0"
+"@inquirer/confirm@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "@inquirer/confirm@npm:5.0.1"
   dependencies:
-    "@inquirer/core": ^7.0.0
-    "@inquirer/type": ^1.2.0
-  checksum: ed16dc0e5b22115474853ca57dbe3dacdcd15bcb37cc50020e8e76ff8d0875d62d8b63b93b3092c653faeb6c83a139eac997ff05638b0f1f78ae919f29ee29d4
+    "@inquirer/core": ^10.0.1
+    "@inquirer/type": ^3.0.0
+  peerDependencies:
+    "@types/node": ">=18"
+  checksum: da640d36ce32350e9982bbaa5a19efac4a879bc1192f93e0ec284031e6dd82e9cf26c6e0caf777c051e200581aa4bcf0a6ece4118fd05352c5d5e2f1d7160c72
   languageName: node
   linkType: hard
 
-"@inquirer/core@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@inquirer/core@npm:7.0.0"
+"@inquirer/core@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@inquirer/core@npm:10.0.1"
   dependencies:
-    "@inquirer/type": ^1.2.0
-    "@types/mute-stream": ^0.0.4
-    "@types/node": ^20.11.16
-    "@types/wrap-ansi": ^3.0.0
+    "@inquirer/figures": ^1.0.7
+    "@inquirer/type": ^3.0.0
     ansi-escapes: ^4.3.2
-    chalk: ^4.1.2
-    cli-spinners: ^2.9.2
     cli-width: ^4.1.0
-    figures: ^3.2.0
-    mute-stream: ^1.0.0
-    run-async: ^3.0.0
+    mute-stream: ^2.0.0
     signal-exit: ^4.1.0
     strip-ansi: ^6.0.1
     wrap-ansi: ^6.2.0
-  checksum: 9496406e24fa68f877b4715ad0c1b8465e558bf0e669dac6a2bb55e97c4d044edd99a864cb7bf1e7db8409f8057b33edd1fe154009f85aea8a7f739837d748c9
+    yoctocolors-cjs: ^2.1.2
+  checksum: 64341dbb5fec9065df2b1f6b13a7ab980dd07f8617e6b1542eae1c4ce2bded1113be9e1f204256399333ce3f1440f6709b8cd4797b2f404279f02d1b756f774c
   languageName: node
   linkType: hard
 
-"@inquirer/type@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@inquirer/type@npm:1.2.0"
-  checksum: 50be288696a55cf860cee8aef7e10751b3d28694f1f6f5fc9c085bb3c45aa77f43961d40626d48f16a993f16f12a83b4282b16845a173fb1791ddb79bb1f93e8
+"@inquirer/figures@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "@inquirer/figures@npm:1.0.7"
+  checksum: 82edc998d0ace2f147eb332177f451c02e6a4a6e829d47817f5a4b3341c12cd0850b92ee3187d483328cce5824b870ed75e868850b6ac819447b9d56501f01cb
+  languageName: node
+  linkType: hard
+
+"@inquirer/type@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@inquirer/type@npm:3.0.0"
+  peerDependencies:
+    "@types/node": ">=18"
+  checksum: fd4c265f0ed03e8da7ae2972c4e6b81932f535d9dd1e039e9e52b027cb8b72ae3c3309a3383ba513a8d3ae626de7dd3634387775cbdcbd100155ecbcaa65a657
   languageName: node
   linkType: hard
 
@@ -10262,11 +11104,10 @@ __metadata:
     "@backstage/plugin-auth-node": "workspace:^"
     "@types/express": ^4.17.6
     "@types/supertest": ^2.0.8
-    "@types/uuid": ^9.0.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     supertest: ^7.0.0
-    uuid: ^9.0.0
+    uuid: ^11.0.0
     yn: ^4.0.0
   languageName: unknown
   linkType: soft
@@ -10313,6 +11154,7 @@ __metadata:
   resolution: "@internal/scaffolder@workspace:packages/scaffolder-internal"
   dependencies:
     "@backstage/cli": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
     "@backstage/plugin-scaffolder-react": "workspace:^"
     zod: ^3.22.4
   languageName: unknown
@@ -10339,6 +11181,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/fs-minipass@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "@isaacs/fs-minipass@npm:4.0.1"
+  dependencies:
+    minipass: ^7.0.4
+  checksum: 5d36d289960e886484362d9eb6a51d1ea28baed5f5d0140bbe62b99bac52eaf06cc01c2bc0d3575977962f84f6b2c4387b043ee632216643d4787b0999465bf2
+  languageName: node
+  linkType: hard
+
 "@isaacs/string-locale-compare@npm:^1.1.0":
   version: 1.1.0
   resolution: "@isaacs/string-locale-compare@npm:1.1.0"
@@ -10648,10 +11499,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15, @jridgewell/sourcemap-codec@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
+  checksum: 05df4f2538b3b0f998ea4c1cd34574d0feba216fa5d4ccaef0187d12abf82eafe6021cec8b49f9bb4d90f2ba4582ccc581e72986a5fcf4176ae0cfeb04cf52ec
   languageName: node
   linkType: hard
 
@@ -10689,12 +11540,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jsep-plugin/regex@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "@jsep-plugin/regex@npm:1.0.3"
+"@jsep-plugin/assignment@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@jsep-plugin/assignment@npm:1.3.0"
   peerDependencies:
     jsep: ^0.4.0||^1.0.0
-  checksum: a57718ae5c86bd10ff5de51843a771b96a10a9c6b5c5f4e02aa5318257c3d5fdec96f8b389fcbe129c7a6ad6b0746d9a0fd934c949b80882230fbc14b548c922
+  checksum: 5549497d403a6c00969d61202a6d3dafc5a349929d190a524363dcfacb3436dbda3d9f88b2ec1330247a594ad3c5f1c17b0997769d0b206802281bad6cf9a410
+  languageName: node
+  linkType: hard
+
+"@jsep-plugin/regex@npm:^1.0.1, @jsep-plugin/regex@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@jsep-plugin/regex@npm:1.0.4"
+  peerDependencies:
+    jsep: ^0.4.0||^1.0.0
+  checksum: 78ef01554535ac6c108851a2a6d86377bce10de01a263ad7b31f9b37c8aa9fc6c49f24b753e5da7d771c5921c913e43c1c33e0bc0fa5d02562d906c83a237836
   languageName: node
   linkType: hard
 
@@ -10724,6 +11584,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@keyv/memcache@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@keyv/memcache@npm:2.0.1"
+  dependencies:
+    "@keyv/serialize": "*"
+    buffer: ^6.0.3
+    memjs: ^1.3.2
+  checksum: 357b320fb3998e7bff9e3a5702da3cc0d4337586f1a04392dfb490cef7af2c039c3ecda922b18029cc9de6e9310a91cde1602b0851fb86acb93b629200458cc2
+  languageName: node
+  linkType: hard
+
 "@keyv/redis@npm:^2.5.3":
   version: 2.8.5
   resolution: "@keyv/redis@npm:2.8.5"
@@ -10733,25 +11604,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes-models/apimachinery@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@kubernetes-models/apimachinery@npm:2.0.0"
+"@keyv/redis@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "@keyv/redis@npm:4.0.2"
   dependencies:
-    "@kubernetes-models/base": ^5.0.0
-    "@kubernetes-models/validate": ^4.0.0
-    "@swc/helpers": ^0.5.8
-  checksum: 0e9ed8f05166221e2ccfe21a45a3aa480ab31c8e8b97b2dbb22d1d3c60477fb0b093def5d78727ba1037df4f14a9c7f38a7da0432c769fdc606097b4b6018dd6
+    keyv: "*"
+    redis: ^4.7.0
+  checksum: 356dcf125072b35be45649fcf5af5e5400b0227b25013d2f7494176a920654a1de63cb95e2a4a661b7db4c1cef8b7553d6e33603ace03d5fbe0a7e22955c9f2b
   languageName: node
   linkType: hard
 
-"@kubernetes-models/base@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@kubernetes-models/base@npm:5.0.0"
+"@keyv/serialize@npm:*":
+  version: 1.0.1
+  resolution: "@keyv/serialize@npm:1.0.1"
+  dependencies:
+    buffer: ^6.0.3
+  checksum: ff3dd9a6246b17fca3d1b0aba312dea931059fdecc36027f4d8133e59dbb3554a0a516b1f3dfc7fb2b3ca7a3d6fa307804f299566ab214febd3fb9d0502eebed
+  languageName: node
+  linkType: hard
+
+"@kubernetes-models/apimachinery@npm:^2.0.0, @kubernetes-models/apimachinery@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@kubernetes-models/apimachinery@npm:2.0.2"
+  dependencies:
+    "@kubernetes-models/base": ^5.0.1
+    "@kubernetes-models/validate": ^4.0.0
+    "@swc/helpers": ^0.5.8
+  checksum: f99c50fc3c8446e6b525b74970c7dafe217fe3ffb944078c70b6c21ca0138040b44d094b57fb9218b1e52a5e4c802f1ea93d57c776b08eee59874be286f5545d
+  languageName: node
+  linkType: hard
+
+"@kubernetes-models/base@npm:^5.0.0, @kubernetes-models/base@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@kubernetes-models/base@npm:5.0.1"
   dependencies:
     "@kubernetes-models/validate": ^4.0.0
     is-plain-object: ^5.0.0
     tslib: ^2.4.0
-  checksum: 3ac064e6c18d88f356b8e91d320e08ee31a12a3ecd47d6d86e23566203125640b88223bc9003d02d420b6a9a86f2990f65e4a26c32ed075ef0753d8599549c0b
+  checksum: 9d0506b9b4b4ac366feb97f574e84f59d957377bb5c4c929332c3db8bd58bb70bcb1045d007d89369a73521591f7d0d5f651c43fca0779ed65d157258b6fd59a
   languageName: node
   linkType: hard
 
@@ -10773,7 +11663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes/client-node@npm:0.20.0, @kubernetes/client-node@npm:^0.20.0":
+"@kubernetes/client-node@npm:0.20.0":
   version: 0.20.0
   resolution: "@kubernetes/client-node@npm:0.20.0"
   dependencies:
@@ -10799,6 +11689,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@kubernetes/client-node@npm:1.0.0-rc7":
+  version: 1.0.0-rc7
+  resolution: "@kubernetes/client-node@npm:1.0.0-rc7"
+  dependencies:
+    "@types/js-yaml": ^4.0.1
+    "@types/node": ^22.0.0
+    "@types/node-fetch": ^2.6.9
+    "@types/stream-buffers": ^3.0.3
+    "@types/tar": ^6.1.1
+    "@types/ws": ^8.5.4
+    form-data: ^4.0.0
+    isomorphic-ws: ^5.0.0
+    js-yaml: ^4.1.0
+    jsonpath-plus: ^10.0.0
+    node-fetch: ^2.6.9
+    openid-client: ^5.6.5
+    rfc4648: ^1.3.0
+    stream-buffers: ^3.0.2
+    tar: ^7.0.0
+    tmp-promise: ^3.0.2
+    tslib: ^2.5.0
+    url-parse: ^1.4.3
+    ws: ^8.18.0
+  checksum: 82dca69f28e24c635badf866c1f548078d9ce2db5d4911c1831d257b9db3748fe306e35bdb3c04b54d9d6e5565625c0f3a43fc4bd75945b83475654b74ce5c31
+  languageName: node
+  linkType: hard
+
 "@leichtgewicht/ip-codec@npm:^2.0.1":
   version: 2.0.3
   resolution: "@leichtgewicht/ip-codec@npm:2.0.3"
@@ -10873,25 +11790,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mapbox/node-pre-gyp@npm:^1.0.0":
-  version: 1.0.11
-  resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
-  dependencies:
-    detect-libc: ^2.0.0
-    https-proxy-agent: ^5.0.0
-    make-dir: ^3.1.0
-    node-fetch: ^2.6.7
-    nopt: ^5.0.0
-    npmlog: ^5.0.1
-    rimraf: ^3.0.2
-    semver: ^7.3.5
-    tar: ^6.1.11
-  bin:
-    node-pre-gyp: bin/node-pre-gyp
-  checksum: b848f6abc531a11961d780db813cc510ca5a5b6bf3184d72134089c6875a91c44d571ba6c1879470020803f7803609e7b2e6e429651c026fe202facd11d444b8
-  languageName: node
-  linkType: hard
-
 "@material-table/core@npm:^3.1.0":
   version: 3.2.5
   resolution: "@material-table/core@npm:3.2.5"
@@ -11110,6 +12008,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mdx-js/react@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "@mdx-js/react@npm:3.1.0"
+  dependencies:
+    "@types/mdx": ^2.0.0
+  peerDependencies:
+    "@types/react": ">=16"
+    react: ">=16"
+  checksum: c5a9c495f43f498ece24a768762a1743abe2be33d050d7eab731beb754e631700547f039198c6262c998d9a443906bd78811c3fa38bc2fb37659848161dac331
+  languageName: node
+  linkType: hard
+
 "@microsoft/api-documenter@npm:^7.25.7":
   version: 7.25.14
   resolution: "@microsoft/api-documenter@npm:7.25.14"
@@ -11194,38 +12104,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/bridge-react-webpack-plugin@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/bridge-react-webpack-plugin@npm:0.6.11"
+"@module-federation/bridge-react-webpack-plugin@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/bridge-react-webpack-plugin@npm:0.8.1"
   dependencies:
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/sdk": 0.8.1
     "@types/semver": 7.5.8
     semver: 7.6.3
-  checksum: 8797a7c52ec7baf8269c979a1d3f45dfa3e817a99a4c14602f53c2e891affbda1fb1a796480bb5b15e6b2df133f775d62e33df178dfec9d94bf0b1b28830cb09
+  checksum: d8c68cd1ddd387e9ef6fba688aec68ef0fe59ec5138f3fc897d033227c0ddd04c4307b52c352a42e85c4b9ad5bc759cd811280960166f752f217df7aeb27a55b
   languageName: node
   linkType: hard
 
-"@module-federation/data-prefetch@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/data-prefetch@npm:0.6.11"
+"@module-federation/data-prefetch@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/data-prefetch@npm:0.8.1"
   dependencies:
-    "@module-federation/runtime": 0.6.11
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/runtime": 0.8.1
+    "@module-federation/sdk": 0.8.1
     fs-extra: 9.1.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: ca0f62c6e5103639e42ad0bcbaabc3aa4295eda90356888482bfa58bb961172939ce4b9689c7ef2ebdbebd4c886b3b11750af3da5189ad8646501ff251b08a8b
+  checksum: 25a67256c1900d3989c2f393aca50a0f38faeb9aa1023327ce0716585fb4e19593efb147f20eac883d4eeae619400a95ec41e64f8b10a780b2e3a6e22495440c
   languageName: node
   linkType: hard
 
-"@module-federation/dts-plugin@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/dts-plugin@npm:0.6.11"
+"@module-federation/dts-plugin@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/dts-plugin@npm:0.8.1"
   dependencies:
-    "@module-federation/managers": 0.6.11
-    "@module-federation/sdk": 0.6.11
-    "@module-federation/third-party-dts-extractor": 0.6.11
+    "@module-federation/error-codes": 0.8.1
+    "@module-federation/managers": 0.8.1
+    "@module-federation/sdk": 0.8.1
+    "@module-federation/third-party-dts-extractor": 0.8.1
     adm-zip: ^0.5.10
     ansi-colors: ^4.1.3
     axios: ^1.7.4
@@ -11244,22 +12155,22 @@ __metadata:
   peerDependenciesMeta:
     vue-tsc:
       optional: true
-  checksum: 6d2aba51294f0e9ec84c4c4c05d6f589359157332ef2c4af580ea39079198d87ad9fdc3c4e666335a64d1580c4a7a01b439de2844f471404e2900562387ff7b0
+  checksum: 7f3f6b000f2427b3ba06c14a3cf7332bec1a4f843d46d11fd267d041f0916ebe4458187284d640524187bae3c871714df29c817d136a45f0a59ae915cc8d77f2
   languageName: node
   linkType: hard
 
-"@module-federation/enhanced@npm:^0.6.0":
-  version: 0.6.11
-  resolution: "@module-federation/enhanced@npm:0.6.11"
+"@module-federation/enhanced@npm:^0.8.0":
+  version: 0.8.1
+  resolution: "@module-federation/enhanced@npm:0.8.1"
   dependencies:
-    "@module-federation/bridge-react-webpack-plugin": 0.6.11
-    "@module-federation/data-prefetch": 0.6.11
-    "@module-federation/dts-plugin": 0.6.11
-    "@module-federation/managers": 0.6.11
-    "@module-federation/manifest": 0.6.11
-    "@module-federation/rspack": 0.6.11
-    "@module-federation/runtime-tools": 0.6.11
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/bridge-react-webpack-plugin": 0.8.1
+    "@module-federation/data-prefetch": 0.8.1
+    "@module-federation/dts-plugin": 0.8.1
+    "@module-federation/managers": 0.8.1
+    "@module-federation/manifest": 0.8.1
+    "@module-federation/rspack": 0.8.1
+    "@module-federation/runtime-tools": 0.8.1
+    "@module-federation/sdk": 0.8.1
     btoa: ^1.2.1
     upath: 2.0.1
   peerDependencies:
@@ -11273,45 +12184,53 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: f36ea6a4b70436ba365e92704f5acfcf2aec5faa2cf2dd18767f0243c0b2b901c19e2daed8a118f18668839691f42633577ba52231a1e58c12c1ccc42d842673
+  checksum: a4902eff5e6379c70638efd1cd80daa156dee8e3eded0bdf431535dd89abc1fbf14c0bd858905595ea9963639f2b72a404f4c8ddc2c8b45d7bc760fc3b2a361b
   languageName: node
   linkType: hard
 
-"@module-federation/managers@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/managers@npm:0.6.11"
+"@module-federation/error-codes@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/error-codes@npm:0.8.1"
+  checksum: 36d899d2d3e00904c8aa74f1611edfceb88937ee56cc5cf2302f30e010752c68c0486cf5251ee83c1f3c2471bcea1e1ea0e8047173e92e4f10bad83125b1721d
+  languageName: node
+  linkType: hard
+
+"@module-federation/managers@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/managers@npm:0.8.1"
   dependencies:
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/sdk": 0.8.1
     find-pkg: 2.0.0
     fs-extra: 9.1.0
-  checksum: fdab486ca08060203c23acb078fce0402229d379e5b0666883ab0fdf204ebcd6e597a4204b023839db048809d40ddb0eaca43885bd3594bda39345c65af1522d
+  checksum: 9f608960e5353934d85c99d68e41a156d79ca592ec52bb81ce869084cb7428d821165b17600ffd440b4640205d11fdd463165df35d6b9163250b64815c20e48b
   languageName: node
   linkType: hard
 
-"@module-federation/manifest@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/manifest@npm:0.6.11"
+"@module-federation/manifest@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/manifest@npm:0.8.1"
   dependencies:
-    "@module-federation/dts-plugin": 0.6.11
-    "@module-federation/managers": 0.6.11
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/dts-plugin": 0.8.1
+    "@module-federation/managers": 0.8.1
+    "@module-federation/sdk": 0.8.1
     chalk: 3.0.0
     find-pkg: 2.0.0
-  checksum: b9f28ccfd527b676fa71d18d846ee49129a28156591c301d95f1820b6b5b2bb41b1fcb2a5d9e4d1f637c61b39e665818d7bec3444ea64058bf46e416c9b7cf09
+  checksum: 570eeb5fb36ecaac45ff150475cf09b69cf7fd2f7544527510732be65238957ef8f71faeebbeaf4d5fdfc2df2b3c88617982dcdbc93110a6766424306b8744cc
   languageName: node
   linkType: hard
 
-"@module-federation/rspack@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/rspack@npm:0.6.11"
+"@module-federation/rspack@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/rspack@npm:0.8.1"
   dependencies:
-    "@module-federation/bridge-react-webpack-plugin": 0.6.11
-    "@module-federation/dts-plugin": 0.6.11
-    "@module-federation/managers": 0.6.11
-    "@module-federation/manifest": 0.6.11
-    "@module-federation/runtime-tools": 0.6.11
-    "@module-federation/sdk": 0.6.11
+    "@module-federation/bridge-react-webpack-plugin": 0.8.1
+    "@module-federation/dts-plugin": 0.8.1
+    "@module-federation/managers": 0.8.1
+    "@module-federation/manifest": 0.8.1
+    "@module-federation/runtime-tools": 0.8.1
+    "@module-federation/sdk": 0.8.1
   peerDependencies:
+    "@rspack/core": ">=0.7"
     typescript: ^4.9.0 || ^5.0.0
     vue-tsc: ">=1.0.24"
   peerDependenciesMeta:
@@ -11319,7 +12238,7 @@ __metadata:
       optional: true
     vue-tsc:
       optional: true
-  checksum: 9e134f18fb0c5cf9fb411dd02709a2e936a630e7f39ac74f1fd07a7b8dfa231d9c001b15c52e9a8fbb8cd5688c2b58fa8594bd294ab561b47e283827a48b8656
+  checksum: a03ef54111d16fcf388acac7e1a8b4c6f2cb0af7a907d6e8d14aca2e321864997fa343902170f455e456aea978e6330a9050f070ff0a3503047c0bbed4ef08bb
   languageName: node
   linkType: hard
 
@@ -11333,13 +12252,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/runtime-tools@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/runtime-tools@npm:0.6.11"
+"@module-federation/runtime-tools@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/runtime-tools@npm:0.8.1"
   dependencies:
-    "@module-federation/runtime": 0.6.11
-    "@module-federation/webpack-bundler-runtime": 0.6.11
-  checksum: 15ab0bee1c4e02b0e07ee059410f2a166f0afc6b13b66293a9681e4fa9d185fa0aa232a762ebd3aa54f1c5f53ad0b367fdd09a5f6116f1b0fd6eadf4ca02a0a2
+    "@module-federation/runtime": 0.8.1
+    "@module-federation/webpack-bundler-runtime": 0.8.1
+  checksum: b10eca911e0a8611a7337f653c0efbd308805b561c22b27a3695092f674a95b349bbf7048659f53bddc558de82b3ffd3bda1757934edfcc298c60a779bfea319
   languageName: node
   linkType: hard
 
@@ -11352,12 +12271,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/runtime@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/runtime@npm:0.6.11"
+"@module-federation/runtime@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/runtime@npm:0.8.1"
   dependencies:
-    "@module-federation/sdk": 0.6.11
-  checksum: 3ddc92de3ad242177ba916f5f410b29f31017820b7c103defe8f964e8145ba8fb274b727ef8b92273c1ac4d53e1dd2cee61879c7710ea78180d8ff67387c0cf9
+    "@module-federation/error-codes": 0.8.1
+    "@module-federation/sdk": 0.8.1
+  checksum: 31b4b23237ea105f85d316036819df1cab8d79e845e70b7a0365640f5cfb02850876c3b9fe1eb680aea8ae56454e58e6dfaa49a58c473d82c929307d6000c1f6
   languageName: node
   linkType: hard
 
@@ -11368,21 +12288,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/sdk@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/sdk@npm:0.6.11"
-  checksum: d77811c08fcfce7e0922112593f1990a35eafe9e1fbfc0bdd99cb044fed29a66e33669b6f31ffafcdf7f4430b25f541dc79ca94d0e52b1f4bb0d7a7ec13ce765
+"@module-federation/sdk@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/sdk@npm:0.8.1"
+  dependencies:
+    isomorphic-rslog: 0.0.6
+  checksum: 41858b512cba814ea4a483a03043c3fda7c50796be5ef9b360b73fc1a2903f1edc58194663efbbcb36cb8035d088db8fe94369f08735761c88fa342bf4d569d8
   languageName: node
   linkType: hard
 
-"@module-federation/third-party-dts-extractor@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/third-party-dts-extractor@npm:0.6.11"
+"@module-federation/third-party-dts-extractor@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/third-party-dts-extractor@npm:0.8.1"
   dependencies:
     find-pkg: 2.0.0
     fs-extra: 9.1.0
     resolve: 1.22.8
-  checksum: deb3a80ff83b983b483813e40362140b486ac6a10286117270f75d66bb7c27aa4f9ec4763faeda5e351785eac1a6f1c5f82df98a737708099e9a2a5075746575
+  checksum: fcf0eb87296f8a393db77adb74423af174bc5f0018201471af129d831e4c1c6cf9ab9ea4ae66b91785964a4b421fcfc2dc2079aeb687ad2c6ce891022c8d3adf
   languageName: node
   linkType: hard
 
@@ -11396,13 +12318,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/webpack-bundler-runtime@npm:0.6.11":
-  version: 0.6.11
-  resolution: "@module-federation/webpack-bundler-runtime@npm:0.6.11"
+"@module-federation/webpack-bundler-runtime@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@module-federation/webpack-bundler-runtime@npm:0.8.1"
   dependencies:
-    "@module-federation/runtime": 0.6.11
-    "@module-federation/sdk": 0.6.11
-  checksum: 3b4eea61b04f966d4ac74f6d59b43d75121692b2c2b7228a890646c68b356c03f7da1560cce159a1fbb5212d5ad5a6b8431b1eafeb19b4d37f38c03df2a6fb79
+    "@module-federation/runtime": 0.8.1
+    "@module-federation/sdk": 0.8.1
+  checksum: 512ce759214bb82abaf51a2bcdb1eb6db524a819890822689f3be31d189b169827894195f6a5ad53e5afaacb1f08772123f37bce0b7b1dcc72545344e2c4fa31
   languageName: node
   linkType: hard
 
@@ -11510,9 +12432,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mswjs/interceptors@npm:^0.35.8":
-  version: 0.35.9
-  resolution: "@mswjs/interceptors@npm:0.35.9"
+"@mswjs/interceptors@npm:^0.37.0":
+  version: 0.37.1
+  resolution: "@mswjs/interceptors@npm:0.37.1"
   dependencies:
     "@open-draft/deferred-promise": ^2.2.0
     "@open-draft/logger": ^0.3.0
@@ -11520,26 +12442,26 @@ __metadata:
     is-node-process: ^1.2.0
     outvariant: ^1.4.3
     strict-event-emitter: ^0.5.1
-  checksum: 35b9382b94b7e3af962dc901db80bde99385645fb0b1f4cbaf64d58ff7181adb962430437db5b7d6db9db2e82399a3d1f319378d3c98e72c7ada8245180f0979
+  checksum: 89f3717ff50595eb4075c540ce9c143290cdd24474ac7957097c4e6f53ad7536f1868cddce5b44d4344981fe837b31f127113cde1f15512929c8dba79767858d
   languageName: node
   linkType: hard
 
-"@mui/core-downloads-tracker@npm:^5.16.7":
-  version: 5.16.7
-  resolution: "@mui/core-downloads-tracker@npm:5.16.7"
-  checksum: b65c48ba2bf6bba6435ba9f2d6c33db0c8a85b3ff7599136a9682b72205bec76470ab5ed5e6e625d5bd012ed9bcbc641ed677548be80d217c9fb5d0435567062
+"@mui/core-downloads-tracker@npm:^5.16.9":
+  version: 5.16.9
+  resolution: "@mui/core-downloads-tracker@npm:5.16.9"
+  checksum: 25e7cf746627e12671e2bae4ea8f81967fbb7e05188c268052104d05f249eea1baa3f3d97f66d1242112afa944a7b025a331527392797d620acbcc1dde23a3df
   languageName: node
   linkType: hard
 
 "@mui/material@npm:^5.12.2":
-  version: 5.16.7
-  resolution: "@mui/material@npm:5.16.7"
+  version: 5.16.9
+  resolution: "@mui/material@npm:5.16.9"
   dependencies:
     "@babel/runtime": ^7.23.9
-    "@mui/core-downloads-tracker": ^5.16.7
-    "@mui/system": ^5.16.7
+    "@mui/core-downloads-tracker": ^5.16.9
+    "@mui/system": ^5.16.8
     "@mui/types": ^7.2.15
-    "@mui/utils": ^5.16.6
+    "@mui/utils": ^5.16.8
     "@popperjs/core": ^2.11.8
     "@types/react-transition-group": ^4.4.10
     clsx: ^2.1.0
@@ -11550,9 +12472,9 @@ __metadata:
   peerDependencies:
     "@emotion/react": ^11.5.0
     "@emotion/styled": ^11.3.0
-    "@types/react": ^17.0.0 || ^18.0.0
-    react: ^17.0.0 || ^18.0.0
-    react-dom: ^17.0.0 || ^18.0.0
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@emotion/react":
       optional: true
@@ -11560,30 +12482,30 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 5057b48c3ce554247de9a8f675bda9bbda079bc83a696c500525f3ebbd63315a44f1c2a7c83c2025dbd02d2722892e397a0af10c1219d45f6534e41d91a43cc0
+  checksum: e3692ba08add0a4b959d7e5f754cf5bf934d30798a9256d1eb5bbf37021f81cf6cc0b86a3cb065815af7f2112c6a359e463a6641618d07559f93516e1374669e
   languageName: node
   linkType: hard
 
-"@mui/private-theming@npm:^5.16.6":
-  version: 5.16.6
-  resolution: "@mui/private-theming@npm:5.16.6"
+"@mui/private-theming@npm:^5.16.8":
+  version: 5.16.8
+  resolution: "@mui/private-theming@npm:5.16.8"
   dependencies:
     "@babel/runtime": ^7.23.9
-    "@mui/utils": ^5.16.6
+    "@mui/utils": ^5.16.8
     prop-types: ^15.8.1
   peerDependencies:
-    "@types/react": ^17.0.0 || ^18.0.0
-    react: ^17.0.0 || ^18.0.0
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 314ba598ab17cd425a36e4cab677ed26fe0939b23e53120da77cfbc3be6dada5428fa8e2a55cb697417599a4e3abfee6d4711de0a7318b9fb2c3a822b2d5b5a8
+  checksum: 576cf19188c236482a8a698978d3061c7e8d76ba9d891d323ce96d92d6b80d88e1aa2a67fe4698d76b8a43221ef0f8ed21be74971fc684ce1279dc73fd34316b
   languageName: node
   linkType: hard
 
-"@mui/styled-engine@npm:^5.16.6":
-  version: 5.16.6
-  resolution: "@mui/styled-engine@npm:5.16.6"
+"@mui/styled-engine@npm:^5.16.8":
+  version: 5.16.8
+  resolution: "@mui/styled-engine@npm:5.16.8"
   dependencies:
     "@babel/runtime": ^7.23.9
     "@emotion/cache": ^11.11.0
@@ -11592,25 +12514,25 @@ __metadata:
   peerDependencies:
     "@emotion/react": ^11.4.1
     "@emotion/styled": ^11.3.0
-    react: ^17.0.0 || ^18.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@emotion/react":
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 604f83b91801945336db211a8273061132668d01e9f456c30bb811a3b49cc5786b8b7dd8e0b5b89de15f6209abc900d9e679d3ae7a4651a6df45e323b6ed95c5
+  checksum: 8eab246e985bbe2707af4620a3193166bacefb029df65ac846cfc0ac5d7996fcb72c50327241f60913538f58a2ad9aa6de3ef12b72eb7750c71f8d3c284a420b
   languageName: node
   linkType: hard
 
 "@mui/styles@npm:^5.14.18":
-  version: 5.16.7
-  resolution: "@mui/styles@npm:5.16.7"
+  version: 5.16.9
+  resolution: "@mui/styles@npm:5.16.9"
   dependencies:
     "@babel/runtime": ^7.23.9
     "@emotion/hash": ^0.9.1
-    "@mui/private-theming": ^5.16.6
+    "@mui/private-theming": ^5.16.8
     "@mui/types": ^7.2.15
-    "@mui/utils": ^5.16.6
+    "@mui/utils": ^5.16.8
     clsx: ^2.1.0
     csstype: ^3.1.3
     hoist-non-react-statics: ^3.3.2
@@ -11624,32 +12546,32 @@ __metadata:
     jss-plugin-vendor-prefixer: ^10.10.0
     prop-types: ^15.8.1
   peerDependencies:
-    "@types/react": ^17.0.0 || ^18.0.0
-    react: ^17.0.0
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1109eb150cf40782a6f24bebf6d22d55ea8c36bbf43893664c303e679b7d235a6578b2f2e1d9ee64132aa24496a15fd32f80278cb641208c3a372bd53679e1c0
+  checksum: 8167e70518b7328a4f9d0ae51f46fc9ea5b023cf934e3007b307a0e871ac818771a7634d4a57b4486d456b067fd9aba967eb119f1e803d7c2cf241a3c167cdc9
   languageName: node
   linkType: hard
 
-"@mui/system@npm:^5.16.7":
-  version: 5.16.7
-  resolution: "@mui/system@npm:5.16.7"
+"@mui/system@npm:^5.16.8":
+  version: 5.16.8
+  resolution: "@mui/system@npm:5.16.8"
   dependencies:
     "@babel/runtime": ^7.23.9
-    "@mui/private-theming": ^5.16.6
-    "@mui/styled-engine": ^5.16.6
+    "@mui/private-theming": ^5.16.8
+    "@mui/styled-engine": ^5.16.8
     "@mui/types": ^7.2.15
-    "@mui/utils": ^5.16.6
+    "@mui/utils": ^5.16.8
     clsx: ^2.1.0
     csstype: ^3.1.3
     prop-types: ^15.8.1
   peerDependencies:
     "@emotion/react": ^11.5.0
     "@emotion/styled": ^11.3.0
-    "@types/react": ^17.0.0 || ^18.0.0
-    react: ^17.0.0 || ^18.0.0
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@emotion/react":
       optional: true
@@ -11657,25 +12579,25 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 86cc11d062645b6742328178ca3a9e2aa2c6d064a559e4fb8c6c6bb8251794959b9dad385f9508fdcab2ae2764503c80f7c3d4f6eb1e0e8aa649f28d4f59133b
+  checksum: 8082b176009fa907cdb0391db59db6cd3589659ad92497caec998c01e1683978ab2eda4ece4d12e523d233b062aa5946d4a438d9a22bf172f0568be1db773e9c
   languageName: node
   linkType: hard
 
-"@mui/types@npm:^7.2.15":
-  version: 7.2.16
-  resolution: "@mui/types@npm:7.2.16"
+"@mui/types@npm:^7.2.15, @mui/types@npm:^7.2.17, @mui/types@npm:^7.2.19":
+  version: 7.2.19
+  resolution: "@mui/types@npm:7.2.19"
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 7bb86487be8e55a4e138a6a5878ab272caee71546a7a2368223274afae65229f673334e59b8e3f7717ea7ea8d44af5f068b2eb4c212cddb98fefecfa873b868a
+  checksum: c3b5723e6f0861d47df834c57878f19347aefecdaf948cf9a25a64b73fbc75791430693d0f540b2bdc01bdfc605dc32bf4ba738113ec415aa9eaf002ce38f064
   languageName: node
   linkType: hard
 
-"@mui/utils@npm:^5.14.15, @mui/utils@npm:^5.16.6":
-  version: 5.16.6
-  resolution: "@mui/utils@npm:5.16.6"
+"@mui/utils@npm:^5.14.15, @mui/utils@npm:^5.16.8":
+  version: 5.16.8
+  resolution: "@mui/utils@npm:5.16.8"
   dependencies:
     "@babel/runtime": ^7.23.9
     "@mui/types": ^7.2.15
@@ -11684,12 +12606,32 @@ __metadata:
     prop-types: ^15.8.1
     react-is: ^18.3.1
   peerDependencies:
-    "@types/react": ^17.0.0 || ^18.0.0
-    react: ^17.0.0 || ^18.0.0
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 6f8068f07f60a842fcb2e2540eecbd9c5f04df695bcc427184720e8ae138ae689fefd3c20147ab7c76e809ede6e10f5e08d1c34cd3a8b09bd22d2020a666a96f
+  checksum: ed714c6aa583bdf17af9f523c9b9ba3789a47677aa6408bc2afd842fa9eaa6d111361c1309435d481ea03b8c695e22ead98c43dc13239c63a3da481c95e5ad72
+  languageName: node
+  linkType: hard
+
+"@mui/utils@npm:^6.1.1":
+  version: 6.1.9
+  resolution: "@mui/utils@npm:6.1.9"
+  dependencies:
+    "@babel/runtime": ^7.26.0
+    "@mui/types": ^7.2.19
+    "@types/prop-types": ^15.7.13
+    clsx: ^2.1.1
+    prop-types: ^15.8.1
+    react-is: ^18.3.1
+  peerDependencies:
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: a2c61c0537b312ab0faeb3f13e7f3b0736e11f29e7907ccd77b0643afc0dca3a0dceb3817371666f35ca8df723ddeac9b2bbb6b759206bde99e03514cfd4ebb9
   languageName: node
   linkType: hard
 
@@ -11700,20 +12642,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/axios@npm:3.0.3":
-  version: 3.0.3
-  resolution: "@nestjs/axios@npm:3.0.3"
+"@nestjs/axios@npm:3.1.1":
+  version: 3.1.1
+  resolution: "@nestjs/axios@npm:3.1.1"
   peerDependencies:
     "@nestjs/common": ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
     axios: ^1.3.1
     rxjs: ^6.0.0 || ^7.0.0
-  checksum: 4e4cd4a26dc53687cedcf360cf686839608ba80d7c9c7e449546299545ddad69fb2dd199f868f3de5d00bc3ab795fecda79971de1599c24f647f2c6c95a21bb9
+  checksum: a224cf85156b6a93ba7e4c15488160f5e904d7522ef63d7eef05a59fe109099117c5d565a8ace11393b01215417375ad1d79160256c7f280c94369f54603006d
   languageName: node
   linkType: hard
 
-"@nestjs/common@npm:10.4.3":
-  version: 10.4.3
-  resolution: "@nestjs/common@npm:10.4.3"
+"@nestjs/common@npm:10.4.6":
+  version: 10.4.6
+  resolution: "@nestjs/common@npm:10.4.6"
   dependencies:
     iterare: 1.2.1
     tslib: 2.7.0
@@ -11728,13 +12670,13 @@ __metadata:
       optional: true
     class-validator:
       optional: true
-  checksum: 980d545251c9310fb0680c07fe8a4de65033970e6db0d2bb9b9a82d54842c5e487ca94d1c147dbbdc959b745dabfa9a30a12915523cdb714c450130bc11f14b7
+  checksum: 82478ce932867104af9a31b755af369bfb20931eb368874a22abfc553775e2c0fc3e55d07c8c948ab664a15f3ff6193bafb691658054b0b668a40a7e947033a2
   languageName: node
   linkType: hard
 
-"@nestjs/core@npm:10.4.3":
-  version: 10.4.3
-  resolution: "@nestjs/core@npm:10.4.3"
+"@nestjs/core@npm:10.4.6":
+  version: 10.4.6
+  resolution: "@nestjs/core@npm:10.4.6"
   dependencies:
     "@nuxtjs/opencollective": 0.3.2
     fast-safe-stringify: 2.1.1
@@ -11756,7 +12698,7 @@ __metadata:
       optional: true
     "@nestjs/websockets":
       optional: true
-  checksum: 55e2b96f9851d58e42c35d2057bca7b700ced22724e5b17745a88bf2e1f8d61d9d7a84f31b19106982c0cd3d913de165031451ff3b05da1f7c04b83988c499e5
+  checksum: d7d6e8129c344c3b7d5b41a98846de64614587842dd84b3050438da738530bdbea211efa0a08c65c274d2616ffb560096ab019254710b355ff57d92432ccb0ab
   languageName: node
   linkType: hard
 
@@ -12781,12 +13723,12 @@ __metadata:
   linkType: hard
 
 "@openapitools/openapi-generator-cli@npm:^2.4.26, @openapitools/openapi-generator-cli@npm:^2.7.0":
-  version: 2.14.0
-  resolution: "@openapitools/openapi-generator-cli@npm:2.14.0"
+  version: 2.15.3
+  resolution: "@openapitools/openapi-generator-cli@npm:2.15.3"
   dependencies:
-    "@nestjs/axios": 3.0.3
-    "@nestjs/common": 10.4.3
-    "@nestjs/core": 10.4.3
+    "@nestjs/axios": 3.1.1
+    "@nestjs/common": 10.4.6
+    "@nestjs/core": 10.4.6
     "@nuxtjs/opencollective": 0.3.2
     axios: 1.7.7
     chalk: 4.1.2
@@ -12796,755 +13738,877 @@ __metadata:
     console.table: 0.10.0
     fs-extra: 10.1.0
     glob: 9.3.5
-    https-proxy-agent: 7.0.5
     inquirer: 8.2.6
     lodash: 4.17.21
+    proxy-agent: 6.4.0
     reflect-metadata: 0.1.13
     rxjs: 7.8.1
-    tslib: 2.7.0
+    tslib: 2.8.1
   bin:
     openapi-generator-cli: main.js
-  checksum: 13cb5b17849611d3bc760b9ef65f8b5537fd68e5cf7c8867495b63dbcfa31289230fcfbf00e38589856a72e94d5943584370240b21d835e12adfe42cfcc5008a
+  checksum: 7aaf394615cccea80ef37184e556134c61dee97ba777aecb3d14ac143f3a7390327511915e85b2e9108e8dbf56444678e8302e06009757581a3a0733531dd654
   languageName: node
   linkType: hard
 
 "@opensearch-project/opensearch@npm:^2.2.1":
-  version: 2.12.0
-  resolution: "@opensearch-project/opensearch@npm:2.12.0"
+  version: 2.13.0
+  resolution: "@opensearch-project/opensearch@npm:2.13.0"
   dependencies:
     aws4: ^1.11.0
     debug: ^4.3.1
     hpagent: ^1.2.0
-    json11: ^1.1.2
+    json11: ^2.0.0
     ms: ^2.1.3
     secure-json-parse: ^2.4.0
-  checksum: 5bf64305a401a1fe2e3a9d06c2582ba5173f809cbe04ccec7e70247070ccd973c9e6a9f09a00507d0a937cc830354642e1b6e5adcac383a53bbec05b240f857b
+  checksum: 7e30479073f3031923772dcc7b5e8d9db40499067f852274e6af0f98073e140d7d41144c2ec7f4554b6d77ddc297ad3c89dbf70c5fab5e3d0383e9916386ca48
   languageName: node
   linkType: hard
 
-"@opentelemetry/api-logs@npm:0.53.0, @opentelemetry/api-logs@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/api-logs@npm:0.53.0"
+"@opentelemetry/api-logs@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/api-logs@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 3383ff75f94a77402370a655f8edf049f9864ad60140f70821a1b775ce43bdb9ca6fade533a1faf46dbca19f3189bcbf1f8805062f5a68bfe2a00281b1712d1f
+    "@opentelemetry/api": ^1.3.0
+  checksum: 6af14100932147d2296c7de1a16e14be528e0cb85cde79884967a777c0f0e2610aa130b04e48e5deec0a442c5a3966863a9da82ac40631755014f45cec5c8973
   languageName: node
   linkType: hard
 
-"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.4.0":
+"@opentelemetry/api-logs@npm:0.56.0, @opentelemetry/api-logs@npm:^0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/api-logs@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: a6bbad94e638316ef3a6e4835124e6a53c3675f0e9a29bb1a37e7905d38ecb72cba20b4289d0e740d6a7a4b16136ee1b393e55d8c14ade9808b44cfb2533eeea
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.4.0, @opentelemetry/api@npm:^1.9.0":
   version: 1.9.0
   resolution: "@opentelemetry/api@npm:1.9.0"
   checksum: 9e88e59d53ced668f3daaecfd721071c5b85a67dd386f1c6f051d1be54375d850016c881f656ffbe9a03bedae85f7e89c2f2b635313f9c9b195ad033cdc31020
   languageName: node
   linkType: hard
 
-"@opentelemetry/auto-instrumentations-node@npm:^0.51.0":
-  version: 0.51.0
-  resolution: "@opentelemetry/auto-instrumentations-node@npm:0.51.0"
+"@opentelemetry/auto-instrumentations-node@npm:^0.54.0":
+  version: 0.54.0
+  resolution: "@opentelemetry/auto-instrumentations-node@npm:0.54.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/instrumentation-amqplib": ^0.42.0
-    "@opentelemetry/instrumentation-aws-lambda": ^0.45.0
-    "@opentelemetry/instrumentation-aws-sdk": ^0.44.0
-    "@opentelemetry/instrumentation-bunyan": ^0.41.0
-    "@opentelemetry/instrumentation-cassandra-driver": ^0.41.0
-    "@opentelemetry/instrumentation-connect": ^0.39.0
-    "@opentelemetry/instrumentation-cucumber": ^0.9.0
-    "@opentelemetry/instrumentation-dataloader": ^0.12.0
-    "@opentelemetry/instrumentation-dns": ^0.39.0
-    "@opentelemetry/instrumentation-express": ^0.43.0
-    "@opentelemetry/instrumentation-fastify": ^0.40.0
-    "@opentelemetry/instrumentation-fs": ^0.15.0
-    "@opentelemetry/instrumentation-generic-pool": ^0.39.0
-    "@opentelemetry/instrumentation-graphql": ^0.43.0
-    "@opentelemetry/instrumentation-grpc": ^0.53.0
-    "@opentelemetry/instrumentation-hapi": ^0.41.0
-    "@opentelemetry/instrumentation-http": ^0.53.0
-    "@opentelemetry/instrumentation-ioredis": ^0.43.0
-    "@opentelemetry/instrumentation-kafkajs": ^0.3.0
-    "@opentelemetry/instrumentation-knex": ^0.40.0
-    "@opentelemetry/instrumentation-koa": ^0.43.0
-    "@opentelemetry/instrumentation-lru-memoizer": ^0.40.0
-    "@opentelemetry/instrumentation-memcached": ^0.39.0
-    "@opentelemetry/instrumentation-mongodb": ^0.47.0
-    "@opentelemetry/instrumentation-mongoose": ^0.42.0
-    "@opentelemetry/instrumentation-mysql": ^0.41.0
-    "@opentelemetry/instrumentation-mysql2": ^0.41.0
-    "@opentelemetry/instrumentation-nestjs-core": ^0.40.0
-    "@opentelemetry/instrumentation-net": ^0.39.0
-    "@opentelemetry/instrumentation-pg": ^0.46.0
-    "@opentelemetry/instrumentation-pino": ^0.42.0
-    "@opentelemetry/instrumentation-redis": ^0.42.0
-    "@opentelemetry/instrumentation-redis-4": ^0.42.1
-    "@opentelemetry/instrumentation-restify": ^0.41.0
-    "@opentelemetry/instrumentation-router": ^0.40.0
-    "@opentelemetry/instrumentation-socket.io": ^0.42.0
-    "@opentelemetry/instrumentation-tedious": ^0.14.0
-    "@opentelemetry/instrumentation-undici": ^0.6.0
-    "@opentelemetry/instrumentation-winston": ^0.40.0
-    "@opentelemetry/resource-detector-alibaba-cloud": ^0.29.3
-    "@opentelemetry/resource-detector-aws": ^1.6.2
-    "@opentelemetry/resource-detector-azure": ^0.2.11
-    "@opentelemetry/resource-detector-container": ^0.4.4
-    "@opentelemetry/resource-detector-gcp": ^0.29.12
+    "@opentelemetry/instrumentation": ^0.56.0
+    "@opentelemetry/instrumentation-amqplib": ^0.45.0
+    "@opentelemetry/instrumentation-aws-lambda": ^0.49.0
+    "@opentelemetry/instrumentation-aws-sdk": ^0.48.0
+    "@opentelemetry/instrumentation-bunyan": ^0.44.0
+    "@opentelemetry/instrumentation-cassandra-driver": ^0.44.0
+    "@opentelemetry/instrumentation-connect": ^0.42.0
+    "@opentelemetry/instrumentation-cucumber": ^0.12.0
+    "@opentelemetry/instrumentation-dataloader": ^0.15.0
+    "@opentelemetry/instrumentation-dns": ^0.42.0
+    "@opentelemetry/instrumentation-express": ^0.46.0
+    "@opentelemetry/instrumentation-fastify": ^0.43.0
+    "@opentelemetry/instrumentation-fs": ^0.18.0
+    "@opentelemetry/instrumentation-generic-pool": ^0.42.0
+    "@opentelemetry/instrumentation-graphql": ^0.46.0
+    "@opentelemetry/instrumentation-grpc": ^0.56.0
+    "@opentelemetry/instrumentation-hapi": ^0.44.0
+    "@opentelemetry/instrumentation-http": ^0.56.0
+    "@opentelemetry/instrumentation-ioredis": ^0.46.0
+    "@opentelemetry/instrumentation-kafkajs": ^0.6.0
+    "@opentelemetry/instrumentation-knex": ^0.43.0
+    "@opentelemetry/instrumentation-koa": ^0.46.0
+    "@opentelemetry/instrumentation-lru-memoizer": ^0.43.0
+    "@opentelemetry/instrumentation-memcached": ^0.42.0
+    "@opentelemetry/instrumentation-mongodb": ^0.50.0
+    "@opentelemetry/instrumentation-mongoose": ^0.45.0
+    "@opentelemetry/instrumentation-mysql": ^0.44.0
+    "@opentelemetry/instrumentation-mysql2": ^0.44.0
+    "@opentelemetry/instrumentation-nestjs-core": ^0.43.0
+    "@opentelemetry/instrumentation-net": ^0.42.0
+    "@opentelemetry/instrumentation-pg": ^0.49.0
+    "@opentelemetry/instrumentation-pino": ^0.45.0
+    "@opentelemetry/instrumentation-redis": ^0.45.0
+    "@opentelemetry/instrumentation-redis-4": ^0.45.0
+    "@opentelemetry/instrumentation-restify": ^0.44.0
+    "@opentelemetry/instrumentation-router": ^0.43.0
+    "@opentelemetry/instrumentation-socket.io": ^0.45.0
+    "@opentelemetry/instrumentation-tedious": ^0.17.0
+    "@opentelemetry/instrumentation-undici": ^0.9.0
+    "@opentelemetry/instrumentation-winston": ^0.43.0
+    "@opentelemetry/resource-detector-alibaba-cloud": ^0.29.6
+    "@opentelemetry/resource-detector-aws": ^1.9.0
+    "@opentelemetry/resource-detector-azure": ^0.4.0
+    "@opentelemetry/resource-detector-container": ^0.5.2
+    "@opentelemetry/resource-detector-gcp": ^0.31.0
     "@opentelemetry/resources": ^1.24.0
-    "@opentelemetry/sdk-node": ^0.53.0
+    "@opentelemetry/sdk-node": ^0.56.0
   peerDependencies:
     "@opentelemetry/api": ^1.4.1
-  checksum: 8918f51e7000f8abdbc6df439d4eb056c490437328c82848bf3a3a3a3bb652a6a295f7cf1324cdf97ba4357f3fc301652511cc40613bfe45bb5280b0407aa21e
+  checksum: a8f5fe11d4b5090de584b9780dd8358834db8e4ea9dfa12b21c3fe021471b198354f3416a1cf7c6621cae95199d1d1553b7ae7d5f69044d44f767942a90492dc
   languageName: node
   linkType: hard
 
-"@opentelemetry/context-async-hooks@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/context-async-hooks@npm:1.26.0"
+"@opentelemetry/context-async-hooks@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/context-async-hooks@npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: f0fe5bfa3aeed99fbe7d6f6157e3bcc2e4450850a62ef60e551812f3e5aa72cb81e38de8c4e1b6934c93e18579a503664597f78e7e7d9904e271f59c939a3e02
+  checksum: d0fb0dd9e9de9b5404c50b48aa982c096f1f58aa518e472a3e48bd8d404354700132005886a497b7067cae6e813dab374a6c1483e344e53e396274c5b00f2a31
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:1.24.0":
-  version: 1.24.0
-  resolution: "@opentelemetry/core@npm:1.24.0"
-  dependencies:
-    "@opentelemetry/semantic-conventions": 1.24.0
+"@opentelemetry/context-async-hooks@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/context-async-hooks@npm:1.29.0"
   peerDependencies:
-    "@opentelemetry/api": ">=1.0.0 <1.9.0"
-  checksum: b1af2641cd3af62fae772c97701434e45fbb2bbd53403aa640a589548f852759279598134b4338ed48bcde6099e273b2f34686cbf1e817d566282e3b846397b7
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: edbd8d20cee2adaec276e4ec723dca023036c004eccc8bfbfff59e9a8a25a196b05540ed33813f30f9b6e51bc8e51b3de95c927157e874cfaa6510af00d9cf0e
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:1.26.0, @opentelemetry/core@npm:^1.0.0, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.25.0, @opentelemetry/core@npm:^1.25.1, @opentelemetry/core@npm:^1.26.0, @opentelemetry/core@npm:^1.8.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/core@npm:1.26.0"
+"@opentelemetry/core@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/core@npm:1.27.0"
   dependencies:
     "@opentelemetry/semantic-conventions": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: e5b06b4d69605927b850109c6b898f00a6a921171b3bf62335a4e00b9a170c1b93ddef6d7f8cc480a551faeaf81074b594f4462a91d4fbc4b313e64ff9ebd717
+  checksum: 33ff551f89f0bb95830c9f9464c43b11adf88882ec1d3a03a5b9afcc89d2aafab33c36cb5047f18667d7929d6ab40ed0121649c42d0105f1cb33ffdca48f8b13
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-logs-otlp-grpc@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-grpc@npm:0.53.0"
+"@opentelemetry/core@npm:1.29.0, @opentelemetry/core@npm:^1.0.0, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.25.0, @opentelemetry/core@npm:^1.25.1, @opentelemetry/core@npm:^1.26.0, @opentelemetry/core@npm:^1.8.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/core@npm:1.29.0"
+  dependencies:
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: bf025473175ceee9a64c6d31f01f7d9924b54ebcb603b38dae56d2ef664acb5fe43f393ae9b0aff41deb3a80b7222b74b9fd2764712db30ee2547280aecff509
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-logs-otlp-grpc@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-grpc@npm:0.54.2"
   dependencies:
     "@grpc/grpc-js": ^1.7.1
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-grpc-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/sdk-logs": 0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: ff2d26958f5553e33f5be91bc2758449afb55eb30977a00262aec1c9044134d0e6cc4da4634dababe0a22e6ac67243181da7f95b7129ffe65901bb70cddca2c1
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/exporter-logs-otlp-http@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-http@npm:0.53.0"
-  dependencies:
-    "@opentelemetry/api-logs": 0.53.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/sdk-logs": 0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: cebff4b11872e5fcdeb345758759b0e69fc292100060edc7207ad0b594f66d990e86ee687ba9407d5eb44e020d384cd5517ee438a9d4cd5ff512ce468ffa72a1
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/exporter-logs-otlp-proto@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-proto@npm:0.53.0"
-  dependencies:
-    "@opentelemetry/api-logs": 0.53.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-logs": 0.53.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 86acdbb58723236aca2bc3e7822443038fe7009324176e190d700585cb1d0089a31a9270340af14c961b958ff3c42071f9b408aab569843a6555af55f923613c
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/exporter-prometheus@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-prometheus@npm:0.53.0"
-  dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-metrics": 1.26.0
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-grpc-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/sdk-logs": 0.54.2
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: a5f5997063728f9c421c4a16c928bfaa8bdf287c2c229ef1a523dc14d8e9ef2240842a68c59b008c506b547dea51993c21f3ac841b341cbcfe9c70a5fb6e9458
+  checksum: 1b23ab8c5002d56675542bc965cb06b40409fd45b03c75089497bda3438dac1dd70bafa3902a4db2d80f0ca51fa43fe434d7a803e8e50919e8afba4116eb5980
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-grpc@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-grpc@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-logs-otlp-grpc@npm:0.56.0"
   dependencies:
     "@grpc/grpc-js": ^1.7.1
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-grpc-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-grpc-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/sdk-logs": 0.56.0
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 8f851d05abc49a93779682f7194ec1f9ff116b407633dffe12ebdbb2f69d9bb475af431b2fded58557d4866ea18c534b0510889741f1650b8cd5300acfc9e630
+    "@opentelemetry/api": ^1.3.0
+  checksum: 107336fd62fc917bc75b745b219bff7ea5410e4688f2621c1f8bf05af57275113e64ecc3af23ff843afb1cc44fb4112f96c79b135b5246a6bad2a01c93c7938d
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-http@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-http@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-http@npm:0.54.2"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/api-logs": 0.54.2
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/sdk-logs": 0.54.2
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 647cd28b39cdc8de6958d14d70ee5b58b57fa8441b25e82c15b47be424186eabcf6b772e7fbd4dd86ee4617ddb0166d622fb68f950e0db242ab6e7ae4d07837b
+    "@opentelemetry/api": ^1.3.0
+  checksum: d9a9a8aae6c53b45363cb481d00819bfdc81e182ebeabe67c7caa04b877b78a3c1f165364fddf32079fb70f3d0a3595000f14f6ec8c7c89a3e723316225aa398
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-proto@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-http@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-logs-otlp-http@npm:0.56.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/api-logs": 0.56.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/sdk-logs": 0.56.0
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 52811ac5d4eb4f9a4bc31441429ad5df378834483b370ca438e7a49e22fdcef1c88d4cd6e4f3b23a9e43f08f09ec9e0cdef79b0edf70ba3922ac42567b3646ae
+    "@opentelemetry/api": ^1.3.0
+  checksum: 538c05f27821c447fe0463e159ee526baae6978393fe630943d415c115e6db8132c028ed82eaa0f4001e7418697870919b641696b89e355f2567b16323eff732
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-zipkin@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/exporter-zipkin@npm:1.26.0"
+"@opentelemetry/exporter-logs-otlp-proto@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-proto@npm:0.54.2"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/api-logs": 0.54.2
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-logs": 0.54.2
+    "@opentelemetry/sdk-trace-base": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 3e92c1155c4f743d69f3cff30093a8e3602935b2076851b436220cb23ef495f8b5d1ca161ca552740189c2c569f646179894c1b13e2b549cc1657e35814cae6c
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-logs-otlp-proto@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-logs-otlp-proto@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/api-logs": 0.56.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-logs": 0.56.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 77737c7007ee6f062f854b267044bca6d2fd8a19128771834fe943a3e1597aba5931f83ceb6c9ff2375ddc8a6b94ed67a92132396ef3ddd9e7e4db2c1f2864f3
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-prometheus@npm:^0.54.0":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-prometheus@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-metrics": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 27590be619db4e3dd4755687f058b98d4c33fb112952b11816b2b8a7563cf4e644f5b4efa804f9397db0739ab244694d1f036181d1df8503c6dd6a96f2e51f7a
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-grpc@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.54.2"
+  dependencies:
+    "@grpc/grpc-js": ^1.7.1
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-grpc-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 9f8737259ed76b5c4e8f4e2060edd1571f98ebcbef1da23028271459b47a7e6c60a2e1651c12f5fb6adbc454209f42dbccf0af9a36ed81585c9acac29dcdea48
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-grpc@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.56.0"
+  dependencies:
+    "@grpc/grpc-js": ^1.7.1
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-grpc-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 90501836c2c300ef47fcbe3fa5af46f6868de658f0f64a72f2fd115639c6673bf8fd7a24a537ba7a402313727136deeeefe8f97ff93453370f0f1ee7d80ef1e5
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-http@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 57df41eaf14575b079fff599ce348b233ad29d21bab184c1403a9e1a153309b78974c8537ccf1afa661515aacd726f2749597448a321af63b30cc1b6357fbfb5
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-http@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 4d436ab37c0c5a35e602fa418d69d8830bf4d8e99487206b178e1351a2db7f2a83fd31407e1517ed6dba8c7589d336604d7f44f5f3d30394a13956188d15fee5
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-proto@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: db54b9ba54ef2c401362a1852c2ee293723640949e590383029e4ba75899071c3f22f709278ca13a776f570b55f91e293f709425c1abbe2dcb7265db44bef1bb
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-trace-otlp-proto@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: e0e94aa50326fa78fd6fa1b8f2c05ad15b6a3a920fd61a13895a9cef935359221b87af233a053cbc3bbc7296ca96aa5dc242dda0aa93b70d291db7fe5580fc8a
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/exporter-zipkin@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/exporter-zipkin@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
     "@opentelemetry/semantic-conventions": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 30fe42eed605c6a40b50bd72d93d0ae668bee63120e43f4c5adb9e2b7868b19df8e21d80a366d63adbe31dbd4b1b08e2705a8f7d02e18f067306052744d0acde
+  checksum: 6da1f2c228473c06db4e011b0172c075c01bbbcd946ff4084981956be0fce931e20cf9e933bc571f74904d219103e2232e10d6d02f24a4136142dc62d0fa14f9
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-amqplib@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-amqplib@npm:0.42.0"
+"@opentelemetry/exporter-zipkin@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/exporter-zipkin@npm:1.29.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.0.0
+  checksum: 6455c96f28a1f6275459c513fab905c602cc60921cccd4b506050a242145bff5ce2a81268cc1c5531eb238de565cfa54c320231cdfa4bc1a6be6eb31517780a5
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-amqplib@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-amqplib@npm:0.45.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 64c5a07cca54f2673aa9708638ba8a3dce864d69686924acb926a08f981941b080d68dcfc465b3139dc6824f239f1be9fc49257557c9bfcb460cb2c1f3b4dc80
+  checksum: 3b009e67974f25c37265cbff30ab39e66b46852778e038197c228178f3ac5e6dfab647a24621f5f8aa9f4f1633ad6257c9f7a3638d957d9d81503c1f43179023
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-aws-lambda@npm:^0.45.0":
-  version: 0.45.0
-  resolution: "@opentelemetry/instrumentation-aws-lambda@npm:0.45.0"
+"@opentelemetry/instrumentation-aws-lambda@npm:^0.49.0":
+  version: 0.49.0
+  resolution: "@opentelemetry/instrumentation-aws-lambda@npm:0.49.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/propagator-aws-xray": ^1.3.1
-    "@opentelemetry/resources": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@types/aws-lambda": 8.10.143
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: c7be58071cf1a0f65567b806ff946ed6b941a7e3d41fd35a3d14fa35baad8829ed1b06dbdec312ff755145c23d6f0b281bcf471363f4fc1e6d8fc13c197f3c3c
+  checksum: 8f18748d606bd6d6a32fadcee5e127e939a48e8aac49de0edbe1dac61094c4dcabce6457f306c81c527c5c014abdbeb736b95be43c6312e77dffff5c90a68592
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-aws-sdk@npm:^0.44.0":
-  version: 0.44.0
-  resolution: "@opentelemetry/instrumentation-aws-sdk@npm:0.44.0"
+"@opentelemetry/instrumentation-aws-sdk@npm:^0.48.0":
+  version: 0.48.0
+  resolution: "@opentelemetry/instrumentation-aws-sdk@npm:0.48.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/propagation-utils": ^0.30.11
+    "@opentelemetry/instrumentation": ^0.56.0
+    "@opentelemetry/propagation-utils": ^0.30.14
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 7ab0fe1c9a93866a2bc01027d794cf5f1c59973490890982d9db82b50d555b4f896537e768df62374e365d4322e4afd4d27941910d124c6f48ac63a5212484f1
+  checksum: 0538f38b42a6cd7279ab6f9c85af19525b463a9873fd429163c30ddf817ed17916ab6a53ea05c034d8e6861d10bb031c7ebcbf607b49e3e3c4b89e589a381576
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-bunyan@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-bunyan@npm:0.41.0"
+"@opentelemetry/instrumentation-bunyan@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-bunyan@npm:0.44.0"
   dependencies:
-    "@opentelemetry/api-logs": ^0.53.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/api-logs": ^0.56.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@types/bunyan": 1.8.9
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: f53f0fd1f285e6f7bd7d5a1ccb5747ea0c928c83f855dd4853b8d37b8b1e163d060a592957a89d1891e740b5dab800d0cda7d5b9db29206adb7938679e6f05e1
+  checksum: 4d176289ffbc26e268c24995c385349d4a817abdc1104eea8bc97d5abd7d6e105cc3dd9f69ac568d1094ec33992597a2b8666b94dbfc1e3d9d3e8f103dafb007
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-cassandra-driver@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-cassandra-driver@npm:0.41.0"
+"@opentelemetry/instrumentation-cassandra-driver@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-cassandra-driver@npm:0.44.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: e9c620e241938f16e667746c741480c809b959b44e8affe1b27e90c412ab898da2631307eae3fdee1f8fb928f50b88bc7c74275592beefc3fffc6c5eef83a184
+  checksum: b4c809a3abd7ddefe14345da1a287958cc80de1470e72232363cf03467e1dbd4a99dc081361fea1472040e5e9ca9c377f997af3782c1ba32121bdb76a5966b60
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-connect@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-connect@npm:0.39.0"
+"@opentelemetry/instrumentation-connect@npm:^0.42.0":
+  version: 0.42.0
+  resolution: "@opentelemetry/instrumentation-connect@npm:0.42.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@types/connect": 3.4.36
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 946c3d7ea0ca569942fd1e45a1f149f94fed4ee86609b4f2aedb23d67feeafe29a563beffa75d97f9b10c6b18b01c42d5eabf92d4f9f160bc938317c88ebc0de
+  checksum: 45c749871feedf8af72de48968027005ab560d73054e55da3426f3091a422b9646fd0170ea5b597d4abd4efc585e2e2a6f9e91253d7fb38dccd42f486cb3ea30
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-cucumber@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@opentelemetry/instrumentation-cucumber@npm:0.9.0"
+"@opentelemetry/instrumentation-cucumber@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "@opentelemetry/instrumentation-cucumber@npm:0.12.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 31d702a2e3404298a8410362c7834efb840ec10de56144811803207ba9e0a12af9bcac483da96a5df32143597dc0b74c32ba697b6525b3db3601edb97d192e84
+  checksum: 2976f1b5ac2b6d218db4b64c173c25ccc4f2230ecfdc934223f1e27ba0cab2aeee8a0ed344646b001610898bf60aa0cd94ada3e1a05a688b6a4980db2d94b11b
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-dataloader@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "@opentelemetry/instrumentation-dataloader@npm:0.12.0"
-  dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 7d502bd4ca6eac448bebc971d7b7b85b1e1e959bfcbf4b7927ea3fe90784aec8132d147fef2e773e468a8d20241df825edec6e0753be824b155a15d89e6f57a1
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-dns@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-dns@npm:0.39.0"
-  dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-    semver: ^7.5.4
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 691358e32532c8a830a4dc4133ae90f80bd659b4acc2db308353d3027663a4223de9e0ae7ef8c24be895b20be5995cb78f1bb86e57b32b8397b43339f58b5555
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-express@npm:^0.43.0":
-  version: 0.43.0
-  resolution: "@opentelemetry/instrumentation-express@npm:0.43.0"
-  dependencies:
-    "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/semantic-conventions": ^1.27.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 69cb699cac00d7d5c4c2769f475e8d6db42063722f300d8c6d8370f015077cd923f1825c5efcd2848a744d9794aa15f8629da379ced3ccab421b039afaef0a03
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-fastify@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-fastify@npm:0.40.0"
-  dependencies:
-    "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/semantic-conventions": ^1.27.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: c7bcae25aa07c723b9cd80e88db928751eef38870ffe9a48d6008ddb85f220a9122575a8f1c7e902cafc8d3c3468a5e816ff6eebc043a1411d6796e187e80555
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-fs@npm:^0.15.0":
+"@opentelemetry/instrumentation-dataloader@npm:^0.15.0":
   version: 0.15.0
-  resolution: "@opentelemetry/instrumentation-fs@npm:0.15.0"
+  resolution: "@opentelemetry/instrumentation-dataloader@npm:0.15.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: a1f217be8064be3cbd116c0fb58feef46b6e05fe9ac3c0333d5cc43ac9df182550bb8f5b084e9557f73e0af7fe917a81d79d69f640009ef64624b97e17f1bb85
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-dns@npm:^0.42.0":
+  version: 0.42.0
+  resolution: "@opentelemetry/instrumentation-dns@npm:0.42.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 4717331b7429c5a427eb48d7ebd210584806bf672b71dde0bacf677488e39a201a593f3ac16ef7a7ce1ed75cc37e6ea5daff9dccfcd2ec79f09808b77ad55352
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-express@npm:^0.46.0":
+  version: 0.46.0
+  resolution: "@opentelemetry/instrumentation-express@npm:0.46.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: d1f50b541629e9155dcbfbdd26d5fa43d6569f835abf88ea35261e0c03c6afb89b26cd2056dda6e9c4de72a49d7e2ca0336e1dc75604256db09e0e09d2182466
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-generic-pool@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-generic-pool@npm:0.39.0"
-  dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 2d094b217afe9c1d388f06cdaca07f9801b70f0d01ee3db374f1b4f07cd18efba55e90679f0237c1f2a7db22f9ee0e564e8583161bb7d578ecea779b874e967e
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-graphql@npm:^0.43.0":
-  version: 0.43.0
-  resolution: "@opentelemetry/instrumentation-graphql@npm:0.43.0"
-  dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 4164f3dad9c44f3d9684750d879ba79a51949fe69179d8437f5736762cdd0156c63a8914c7accd767b090a18db45f011a9cff5e238d3240077f1c095d3c5dd28
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-grpc@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/instrumentation-grpc@npm:0.53.0"
-  dependencies:
-    "@opentelemetry/instrumentation": 0.53.0
-    "@opentelemetry/semantic-conventions": 1.27.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: 937e96ec7fe655d3599ba71ffe48d79ff068e3ce820600249ed2807d2e7b2769e0771b723e5961bcd11ae8585df26f596a39e320497a9d3299d816510bb61eca
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-hapi@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-hapi@npm:0.41.0"
-  dependencies:
-    "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 2195c8366d9b81a40dd6d8db041c13687932ab7ec761c9dfea13162c4000638c699dfebf384e22f985aea2d7692c742ed8090cb5bad056e5137d2db79a615380
+  checksum: 799938a06ded695d9e5f32f902d5f6d960e6756ec2d09f34b2373d74a441ea0b9dfeed6f0c1668cf97c9b33991a724fe5be8dec328f0c8cacc0ac8507df10687
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-http@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/instrumentation-http@npm:0.53.0"
+"@opentelemetry/instrumentation-fastify@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-fastify@npm:0.43.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/instrumentation": 0.53.0
-    "@opentelemetry/semantic-conventions": 1.27.0
+    "@opentelemetry/core": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.56.0
+    "@opentelemetry/semantic-conventions": ^1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 008c6f2567ecabe69552f78f8fbcefdf2492d85b0e3e0ac36bd47e6f13a8d02680e7cee1748cd4a70ca9f27213abd30c28bf14d7791ead8a06bf1c85986ef7f9
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-fs@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@opentelemetry/instrumentation-fs@npm:0.18.0"
+  dependencies:
+    "@opentelemetry/core": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 2fe2694f5dd4ef9bfe7b75e66655cbde93afe2bb4f55731841b8ec5ac5af18912d4428edfe6901806452442060262edef14e46719f1faf85e5f11bb0274a054b
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-generic-pool@npm:^0.42.0":
+  version: 0.42.0
+  resolution: "@opentelemetry/instrumentation-generic-pool@npm:0.42.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 5f35a30b76705f4527f0ab8ec83d83014615612f40a7bd16a87a75f922a7aeff113042ae99d30f7ab809853841d2769ddee2e03ce304de80251f1d8370ec2d89
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-graphql@npm:^0.46.0":
+  version: 0.46.0
+  resolution: "@opentelemetry/instrumentation-graphql@npm:0.46.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: b8c9faa2c002846bf85a4ccf4e9aba343d8f38a08e85d8c4e77a016da2d0b84291d6b8505aec7de70088761d4a341192a26163aafc23a2fc04a918c94c1686b6
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-grpc@npm:^0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/instrumentation-grpc@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/instrumentation": 0.56.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 8bb00759e74d05bc7ca3ba7c46fe6ab01ff16adcb5c658a3e1679c5ea6d10b0f381ffae970a694b014881cbaa707ec24076967fa47643187365b765f34f4094e
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-hapi@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-hapi@npm:0.44.0"
+  dependencies:
+    "@opentelemetry/core": ^1.8.0
+    "@opentelemetry/instrumentation": ^0.56.0
+    "@opentelemetry/semantic-conventions": ^1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 0ee7610e9a1149d087dc8883f6d20ed7d0a15c7b1da273fc170220daec5e68a1240e0624743b000c8d263bb8b21615ecf84b8a179508763523108de88fedadb4
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-http@npm:^0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/instrumentation-http@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/instrumentation": 0.56.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+    forwarded-parse: 2.1.2
     semver: ^7.5.2
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 4ee569f7fc8c7ce50fabaff016d33577f36e63272b0634ac45806d70bffdf38fcf09db3cd9dd27c3150f6c4547fec673c356c419a6ed2399ff2849b9487a6e89
+  checksum: f8033d8410d8b06bb222090959479fe4f24c8d52281ce3e240458a449eab8009cb889d09240f67135699b7a543a4708c2f401060cbf1bfa0663ee8687c451a15
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-ioredis@npm:^0.43.0":
-  version: 0.43.0
-  resolution: "@opentelemetry/instrumentation-ioredis@npm:0.43.0"
+"@opentelemetry/instrumentation-ioredis@npm:^0.46.0":
+  version: 0.46.0
+  resolution: "@opentelemetry/instrumentation-ioredis@npm:0.46.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/redis-common": ^0.36.2
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 16ae17687db3b4bbe78d92667ce86f3afb212adb5eda8f17b549a06ff9e1ba3e0f146ded9e943cb781780b64853a6b7fa3b85d2c2f5e4f42fd76d651c90aa71f
+  checksum: 02a816026d950726562104be37a434b13174fea5120639462a43d70dc011a4c334f402ff5d763a986aa3795d0c9ee9fc200d41ae77b57ea55a4eca14068216f4
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-kafkajs@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@opentelemetry/instrumentation-kafkajs@npm:0.3.0"
+"@opentelemetry/instrumentation-kafkajs@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@opentelemetry/instrumentation-kafkajs@npm:0.6.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 9ea20f4f70edd7d47b551f56f56b6b0462e5f9dff3981462d9d061084a3bb345f1989ddc46a2d8fabebf2a9650c52ab6c6fb906a03e9176191cc71073c2bf22c
+  checksum: 169877945296fa042b5468e25759a67dc81d169a7a4f22ee142e8e9bf0a9d82219397500596060554324f1a9a89c9843ac68633830cec11c99e838fd37d997f5
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-knex@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-knex@npm:0.40.0"
-  dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/semantic-conventions": ^1.27.0
-  peerDependencies:
-    "@opentelemetry/api": ^1.3.0
-  checksum: ca7f08b4a783ebb470663fa53a5418074cc04a42ad7b6f19939be04aff1c0db2070ca8b7ada17e363a412b1013149bde38bf1930f05c09cd6207a90711db0372
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/instrumentation-koa@npm:^0.43.0":
+"@opentelemetry/instrumentation-knex@npm:^0.43.0":
   version: 0.43.0
-  resolution: "@opentelemetry/instrumentation-koa@npm:0.43.0"
+  resolution: "@opentelemetry/instrumentation-knex@npm:0.43.0"
+  dependencies:
+    "@opentelemetry/instrumentation": ^0.56.0
+    "@opentelemetry/semantic-conventions": ^1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: e31af57cb7f3f24ec5ac0748eba0e785e3bb2bb7ad5cdaec2af1f37a077a73ea4b545521450fb5ddfceff3dd8388abbe660959a43222bb2252a155354c346c0b
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/instrumentation-koa@npm:^0.46.0":
+  version: 0.46.0
+  resolution: "@opentelemetry/instrumentation-koa@npm:0.46.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 7b30d11f8cbabc1570eeca771f421c65f014d87b850cf17a8f2aec98dc84a8a43ce6fe15634f5d16944466f8da1011508367498e215b3f6378e8f8d618a12ec9
+  checksum: b22a6cc9036b0766b5ea2fd8078944877d22cac916d310123af12f317a78b898039dd3ca788cccfce018ec2f6e6220850573ea006cdce1205dc858526fb6a6f9
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-lru-memoizer@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-lru-memoizer@npm:0.40.0"
+"@opentelemetry/instrumentation-lru-memoizer@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-lru-memoizer@npm:0.43.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 1a65e7c397707f9d09fe11f9fbd127d5094406ec98f84e74309c1d9869da23173c3895c851bccf9c5c1b8aeef6fc516340311f87d154832c74a344a0ed4ac9ef
+  checksum: a7c52fe37c25acab54d64d9d8944477925bce311d08794eb5fbe5e75e7d66ee00585f37c331a489f62947b511b3089b8848ff2de2954a49cc7a1c3cb58dd7ede
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-memcached@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-memcached@npm:0.39.0"
+"@opentelemetry/instrumentation-memcached@npm:^0.42.0":
+  version: 0.42.0
+  resolution: "@opentelemetry/instrumentation-memcached@npm:0.42.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@types/memcached": ^2.2.6
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: bbf976f90463fe1b8a64d6e20057fc1926342a1f644e4cfd160ce1b0a032269b48b754e6cd86eff41faf92bd2e3617f1572a1ef272cb5059ed21aaf7c6591ccb
+  checksum: 80bd1c3d5d14fb738b061dd61ff41950e146797ad18775da862d8e35401335e7506b33d3f9682235e5dcfed2371e4b2fe7cddad3b22aa1db588f47b6356325f9
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-mongodb@npm:^0.47.0":
-  version: 0.47.0
-  resolution: "@opentelemetry/instrumentation-mongodb@npm:0.47.0"
+"@opentelemetry/instrumentation-mongodb@npm:^0.50.0":
+  version: 0.50.0
+  resolution: "@opentelemetry/instrumentation-mongodb@npm:0.50.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/sdk-metrics": ^1.9.1
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 1d7c87532b5857e8d6d72272ce874f02a4b2adc8a135d07c48e432cc990a4493c110b15c842c72dfc79e33ddc63f518185b69e242e2c55521a06fe6503cb1980
+  checksum: 4d7c1823a3de297f8c68e1669792fa007028346eeb005103dc66d70a7f0cdb5bce323b97e4e247b7aa50e2a830b1c645ab718da432b319c31f3d714f85f1e629
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-mongoose@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-mongoose@npm:0.42.0"
+"@opentelemetry/instrumentation-mongoose@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-mongoose@npm:0.45.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 77d36437073ee589ccd73f4a10a4602afd0f4a3a89a9c572be18b2df75941f5a6885d4823094d8ffe8859801d827d0b46f93dee03f39286d89eead373edf76bb
+  checksum: 3288fdaa0bc141609f54fad75275d8e1bfaf55dafdce63dd54db76cf0eb955fdcf1788d475c577156138880120fcc179f55f55b7849636b228d8f482b2aa024c
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-mysql2@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-mysql2@npm:0.41.0"
+"@opentelemetry/instrumentation-mysql2@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-mysql2@npm:0.44.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@opentelemetry/sql-common": ^0.40.1
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 37c8a57fb6591ae1db353e149ad5f38ac68c5f727e313ba6d1cc403d910ae8e3b743c3234500272012ea6eecb5b838803ee493ce5096ad40bb285b09090f4a65
+  checksum: 72d5b5658d39d5f92ff5b8c1771d8d6ed28979b4d7fb16121dd5a6d76fd231cae364d162bf04a83de3682e149f829766a61c2715eb9959b34ee8ac303cb724c2
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-mysql@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-mysql@npm:0.41.0"
+"@opentelemetry/instrumentation-mysql@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-mysql@npm:0.44.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@types/mysql": 2.15.26
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: c8c23a1273e900902867ca4da8c026581d3f584e420a5f26ec738ace20c1a85695a411721541e63e0639d9ddbb8c3713a2bc25621886f81912014882395d3531
+  checksum: a1c55777fef8b8aa349f16a0c5f511bc06f553e6ac1d316a0cd768f49d92d1f75cdabce73d5a2e5590588773bae93521953eb27bf04444105a3727dfd8e10788
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-nestjs-core@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-nestjs-core@npm:0.40.0"
+"@opentelemetry/instrumentation-nestjs-core@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-nestjs-core@npm:0.43.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: ce6b2d9186d95e5fa5c65efd902254c724e296172787d1fa9382a6204ae9d089e861ce8831ba6e6865d449a96a8aada7b1049568217f1bda21af3f36e01b9512
+  checksum: f967f3f96ce6bf402f5acd9cedefca6f0548bbc786fc849e07a6229c3a7b16ce7b05cd864657ec1af2a8285ea9ea58c4199e8ec2610d115b85db7e4c50a5c1e6
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-net@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-net@npm:0.39.0"
+"@opentelemetry/instrumentation-net@npm:^0.42.0":
+  version: 0.42.0
+  resolution: "@opentelemetry/instrumentation-net@npm:0.42.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: ae3c7cdb4894a9aae7ea7a4d6a00cbef4afc2194539226f01f68ee78d25fb2d5debfb738b8a79a9842c4987bc4c673c7e6386d328c1e6bfc09e2613bf4677ed3
+  checksum: ebad2b908081f1c69a07b14ee273958216845e197d7059bee51eb1a12701c2c1406d6a0ad989c27300b7563166808bb1557a54419850f7c40fecf602ee1132ac
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-pg@npm:^0.46.0":
-  version: 0.46.0
-  resolution: "@opentelemetry/instrumentation-pg@npm:0.46.0"
+"@opentelemetry/instrumentation-pg@npm:^0.49.0":
+  version: 0.49.0
+  resolution: "@opentelemetry/instrumentation-pg@npm:0.49.0"
   dependencies:
     "@opentelemetry/core": ^1.26.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": 1.27.0
     "@opentelemetry/sql-common": ^0.40.1
     "@types/pg": 8.6.1
     "@types/pg-pool": 2.0.6
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 5e193003e79e249acf8db85259f7d09e3086a5ce942277f2898b46b23b193351d5eab952733bf61387d47688d911c88387fd2b8c65520046303cfc2a7a383780
+  checksum: a91ab43d5cc3e1ead331125207b1447edcfb9cfc13a7b3eced2b9965236b3b76bdbe43dc91a634c0253afdfc7996f6286b7e1748c63d82848b64a4d060df19d8
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-pino@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-pino@npm:0.42.0"
+"@opentelemetry/instrumentation-pino@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-pino@npm:0.45.0"
   dependencies:
-    "@opentelemetry/api-logs": ^0.53.0
+    "@opentelemetry/api-logs": ^0.56.0
     "@opentelemetry/core": ^1.25.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 005146e233c53ffbf703c97d855a523fe91d9d2632b77fd0b094caec6f3646908fd03c22bea77575d4a75eac0a2aa2065c7a2d9caac45c370e9592abe9b231c1
+  checksum: 4c3393b9bfd60b04baf9640763aa5f2873926384ec243d075fcd5f4000025453aa310cc523f946bc12a464c7aa084f6b8f88dd4bd257450486bd8603b0d2c6d6
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-redis-4@npm:^0.42.1":
-  version: 0.42.1
-  resolution: "@opentelemetry/instrumentation-redis-4@npm:0.42.1"
+"@opentelemetry/instrumentation-redis-4@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-redis-4@npm:0.45.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/redis-common": ^0.36.2
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: fb7ab000a16cbb3f602e57aa96b52f2f06992f2cebe0f7b1fae7b293fba542f11ed83f2602f2916bc0d5b1a51790a99ad749abcc281d59e3859038188428b4fd
+  checksum: d6a3f657d4c81c80b83b3c7f95d4d59fcb65dfd56ccc4da12bbe32d67837b6a91aa87d49373302a82dccc9c62a6090fefbcb1bc650e2858a70f3667df7a8ded7
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-redis@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-redis@npm:0.42.0"
+"@opentelemetry/instrumentation-redis@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-redis@npm:0.45.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/redis-common": ^0.36.2
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 1a84b516599a290de78eaf1a1db897bf2e866baaf4a77a76880b24261786f6ffa2673fcec36f360abf73d5e52104557ff957964b7b3683962b0bde2bbfbb074e
+  checksum: 7e0c9de80bc785c5e8bf83cb21a5647d24b512cd50d82f6b6e7b64267e49cfa02557dddb40eba13ca722dcb634a49ce82e1c9898d17f5fffe7bc3dd768cbb507
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-restify@npm:^0.41.0":
-  version: 0.41.0
-  resolution: "@opentelemetry/instrumentation-restify@npm:0.41.0"
+"@opentelemetry/instrumentation-restify@npm:^0.44.0":
+  version: 0.44.0
+  resolution: "@opentelemetry/instrumentation-restify@npm:0.44.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 28aac1e5bf2cdca2fa18c8423db3edb530bc338bb05a30537c24575bac12f4588d975598b020f58817393cf68354b913ca07e3720b3ff8497278887baee7b10b
+  checksum: 98ef2da10c5faa03db17032399565343dd2fbfbb70788cb7112653ed8ebe2a7920ec50416c9a7b406f239b9363e5ec49e8e56519f224ece6e63f4aaa193fc5ed
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-router@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-router@npm:0.40.0"
+"@opentelemetry/instrumentation-router@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-router@npm:0.43.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 7f8fb67d755cb8fa94dbe44f698d22e1ce80971071f574aa9a8b177410cf6a8ab37abd449777670705b73aa6a4272212e80d6dc3c6ec0aa7f99ce161238c7f33
+  checksum: c1045bd51631a5d1c4654a0b7c3c4a2ab2c2bca331e840bf16ab31ecf2a34effd3366db44e679c534b51232120f1ae0ea7bf4d04cbdfd3e6ea736a9133d4f348
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-socket.io@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-socket.io@npm:0.42.0"
+"@opentelemetry/instrumentation-socket.io@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-socket.io@npm:0.45.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 21f92a17b26627ac03bf19f8c5eea550bac915366919a7b7f73893f0bdd8669421e02ec0379387439a46b1e1ad05dfe8dc9a6f6784b9dc8919f8c7dc05694dd8
+  checksum: 0849eb3118ba223aaff324eda86d5b519e85ba24d66c1027dbd2e669fe94ee05d7f292f10e9ef8aa85b96e7e4bcb6934d796a3380c3e2835240d772df69806ce
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-tedious@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@opentelemetry/instrumentation-tedious@npm:0.14.0"
+"@opentelemetry/instrumentation-tedious@npm:^0.17.0":
+  version: 0.17.0
+  resolution: "@opentelemetry/instrumentation-tedious@npm:0.17.0"
   dependencies:
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     "@types/tedious": ^4.0.14
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 31d6f0d10c3c1f03c9bf3207d7b5569f23ff202f954cb5b91242d788813b5807e5fc204748d14c3b12d320fa5dc1205d4b54131847496117af54e205f025a23e
+  checksum: d4179b6d2010455cb00abf4a64d2276b10db8d572bf15454d62d458a9ca4b54a9df29d16fb455b3936868f5f64b2f69c8112d467efcf02e447172c0d2caa6f22
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-undici@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "@opentelemetry/instrumentation-undici@npm:0.6.0"
+"@opentelemetry/instrumentation-undici@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "@opentelemetry/instrumentation-undici@npm:0.9.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/instrumentation": ^0.56.0
   peerDependencies:
     "@opentelemetry/api": ^1.7.0
-  checksum: b16b9ff23fbca13a18889fc302ddae3db8b22ebd9d8224b0297bd45014bb914d6bea89e55aedda6879cee1760c93bcedc2eaa12e60e88f45dd8c9e5f61a0aefd
+  checksum: f64615394a511e1aeb88a2095940832b9f6bfa1244c8736234b9a4108da81d227cf8a7218216df30333918cc07b336fe8559fb127de6afc2cbfaa5ed7a49ee86
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-winston@npm:^0.40.0":
-  version: 0.40.0
-  resolution: "@opentelemetry/instrumentation-winston@npm:0.40.0"
+"@opentelemetry/instrumentation-winston@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-winston@npm:0.43.0"
   dependencies:
-    "@opentelemetry/api-logs": ^0.53.0
-    "@opentelemetry/instrumentation": ^0.53.0
+    "@opentelemetry/api-logs": ^0.56.0
+    "@opentelemetry/instrumentation": ^0.56.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: be7c3f6f8a5672db940b8196e9254a4188c9c6bb717a272088fe5e8319874a80a28a56b1073ad130bb2233a29d4459a754b4ea2f36855f90a679a9c379f5cf16
+  checksum: f8eafb7d943956f8daf0b432fce421fd85ac910f499f9bb6ec6fe048caafa33705d793c6fe8c6c969ba22951f888553f8862bef13f1cae78ef43d8f402173785
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation@npm:0.53.0, @opentelemetry/instrumentation@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/instrumentation@npm:0.53.0"
+"@opentelemetry/instrumentation@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/instrumentation@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": 0.53.0
+    "@opentelemetry/api-logs": 0.54.2
     "@types/shimmer": ^1.2.0
     import-in-the-middle: ^1.8.1
     require-in-the-middle: ^7.1.1
@@ -13552,92 +14616,162 @@ __metadata:
     shimmer: ^1.2.1
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: a386fe066eab71129a6edbc883ab407b1022850e8acc4750029a12e8730588a8b81442d0b008aaddb46f7614af40d19d331e7348790ca2d08ba8eed6d23ffdae
+  checksum: c8ebf9eab5dc16c51a937367f6c21e22068b863d44d72c8b1f7615750ad526218229c30ab3c90c376c2cc03ee17cae3949a6f6ed987486511a13a3bef100e6b6
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-exporter-base@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-exporter-base@npm:0.53.0"
+"@opentelemetry/instrumentation@npm:0.56.0, @opentelemetry/instrumentation@npm:^0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/instrumentation@npm:0.56.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-transformer": 0.53.0
+    "@opentelemetry/api-logs": 0.56.0
+    "@types/shimmer": ^1.2.0
+    import-in-the-middle: ^1.8.1
+    require-in-the-middle: ^7.1.1
+    semver: ^7.5.2
+    shimmer: ^1.2.1
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 8c80374c476e7aacf04172d18ffba5ec7ecc33c98dd102f74d22c916f20e147a42038662bc4ec17eaa7b7ffc85f8fde0c72b81b978a7460977fe236fc757207b
+    "@opentelemetry/api": ^1.3.0
+  checksum: 2c0cf2c91a5ac36a9e95978bfcc92ed9e770d93346fb87cc6e62ca7e028b219695e921142eef3ff5541bdfb9045996817bd7cefdb668e0419a27abde4854d2e0
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-grpc-exporter-base@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.53.0"
+"@opentelemetry/otlp-exporter-base@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-exporter-base@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-transformer": 0.54.2
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 97a6b0713ba1aebc44bfd90c129f950cdf34e75d13a933aecd6b257b3d90166dd1dbec3742ccfa163e78dd351f26a78a0fa5a983705a43510d08a88d2321525b
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/otlp-exporter-base@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/otlp-exporter-base@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 19537be39eed2969003f244de9f0616af5fae4dbfceaf24918b9f051ab906817f1c32a657d9b548c4c24742eb45c48a21b75cd2bee0b33068cedb0b592a002ae
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/otlp-grpc-exporter-base@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.54.2"
   dependencies:
     "@grpc/grpc-js": ^1.7.1
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/otlp-exporter-base": 0.53.0
-    "@opentelemetry/otlp-transformer": 0.53.0
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/otlp-exporter-base": 0.54.2
+    "@opentelemetry/otlp-transformer": 0.54.2
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 1e59ad97cd65e618a7d1f43590b8039e4b0aea91231719515ba80a414bd1063ecb7457466f1d73b60f9571415e1621b48af374e1cd7f70f9325d2a06c393c045
+    "@opentelemetry/api": ^1.3.0
+  checksum: ca313f22a53b438b5f9ca2b4a97168406c36cab1c39d66bd0475abf4e6913efd51d9b4bb9f50b20954115b718b337e2bf762d94deb5dd2f317614474b8a4cf36
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-transformer@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-transformer@npm:0.53.0"
+"@opentelemetry/otlp-grpc-exporter-base@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.56.0"
   dependencies:
-    "@opentelemetry/api-logs": 0.53.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-logs": 0.53.0
-    "@opentelemetry/sdk-metrics": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@grpc/grpc-js": ^1.7.1
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/otlp-exporter-base": 0.56.0
+    "@opentelemetry/otlp-transformer": 0.56.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: d2188bd77c192df2a72cdf2bc3e219da26b599e03eb4ca32ab76eac83419ddb0729efe472e756a0c00500a071e10940d0f06e63ff879ced5204cce4213ba2598
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/otlp-transformer@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-transformer@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/api-logs": 0.54.2
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-logs": 0.54.2
+    "@opentelemetry/sdk-metrics": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
     protobufjs: ^7.3.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 0dbec27a293a70802ae68e5cd75f094477b80e15026bff185acd4c7ce45d28e9964033715a0d909f8e8bd8eda92bd31f2a8e9f4444717e40880334f1341465de
+  checksum: 972a269cb9868d36703e78f1cf6f36026854d00dd3959e636d9ac8ce5eecb7225537d7dea97b786306d94e6cacf49e7e64e32e45e0d21a58b6b4126c53ec65be
   languageName: node
   linkType: hard
 
-"@opentelemetry/propagation-utils@npm:^0.30.11":
-  version: 0.30.11
-  resolution: "@opentelemetry/propagation-utils@npm:0.30.11"
+"@opentelemetry/otlp-transformer@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/otlp-transformer@npm:0.56.0"
+  dependencies:
+    "@opentelemetry/api-logs": 0.56.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-logs": 0.56.0
+    "@opentelemetry/sdk-metrics": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+    protobufjs: ^7.3.0
+  peerDependencies:
+    "@opentelemetry/api": ^1.3.0
+  checksum: 3b95605194f126be450fd7b5a7522a08bb563f716a43c863e21f7c5e4175101833a94d8f0955e1181ce75211e2b2acfe8691efd0302afa7b41d8b26ddaba3a10
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/propagation-utils@npm:^0.30.14":
+  version: 0.30.14
+  resolution: "@opentelemetry/propagation-utils@npm:0.30.14"
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 4cce9958ca40b042adda8601b651799f1a140a513dd8c085094cb88265470bf40a04ed5f84301d891fef90f59698802e20828311b6189e4ab6c741101d8ac248
+  checksum: 2f7ddc71d39b4d095973087b437191d276fea341750d8e1843da230f83bef9779ca61fe70515bb7a8b8e45671d069ce910ad0d578110860cf08b211fc514801a
   languageName: node
   linkType: hard
 
-"@opentelemetry/propagator-aws-xray@npm:^1.3.1":
-  version: 1.24.0
-  resolution: "@opentelemetry/propagator-aws-xray@npm:1.24.0"
+"@opentelemetry/propagator-b3@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/propagator-b3@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": 1.24.0
-  peerDependencies:
-    "@opentelemetry/api": ">=1.0.0 <1.9.0"
-  checksum: 51d78403749e110c31f916a82edef2c5d1df1e8a1a9ada8dd420bf3ef5c1baafb0748193cd74fbb3975745110afe99602d5977a0e38690c9ba53e2166c28d4c5
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/propagator-b3@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/propagator-b3@npm:1.26.0"
-  dependencies:
-    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/core": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: c2e99a8ed2814cf5b8e6e2a79411f2f6d668b7d5fc8351e5302ea4149601a96ec655422cf59470c66d8a408850f8a6b5156bf7deac7afb07d3f7a935c51fff04
+  checksum: 4bfe531e1fb5606d25d09e7b3c84188938e76618f8a0a098d57ebacf9f7bafaab24ba6e6e26cbb4c3da3ea8ecd31e2c68e86735ef48f45cdfc2e698c0b098249
   languageName: node
   linkType: hard
 
-"@opentelemetry/propagator-jaeger@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/propagator-jaeger@npm:1.26.0"
+"@opentelemetry/propagator-b3@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/propagator-b3@npm:1.29.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/core": 1.29.0
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: a0ac3888c86f1b4671c7ca520396b89b4c47fa9e9d976bd014472d2b7786e7c5bdf4823a6e2a900fed5ea5dfe23eda0bdf6740e77c1352f2c0f82b13a71c03df
+  checksum: 36720d2f4572c45d80149dda1cf1000cd6da8baf7bf1679fa4a58b000668837133b9ab9d8fad93af4752bcc14946364a41ad5e71c0262e4dcdcb43926132df6d
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/propagator-jaeger@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/propagator-jaeger@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 87ab8a15b57230e40b9f59e63a01a31d38bfef77cafb91543a1549c179a9d01fef73ce5cf58ad7c6ed0093ab3b4a64ea9ba00e9d257d4084447267fe39f9163d
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/propagator-jaeger@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/propagator-jaeger@npm:1.29.0"
+  dependencies:
+    "@opentelemetry/core": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: eb19ad74c16ef2bd7805f06cf3c6e5ab654889c49221678be75933c45f47d6b496343947b364ec57860d8d9432ce5542d6ac43f8bd0d153b9b47f251abff6653
   languageName: node
   linkType: hard
 
@@ -13648,61 +14782,61 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-alibaba-cloud@npm:^0.29.3":
-  version: 0.29.3
-  resolution: "@opentelemetry/resource-detector-alibaba-cloud@npm:0.29.3"
+"@opentelemetry/resource-detector-alibaba-cloud@npm:^0.29.6":
+  version: 0.29.6
+  resolution: "@opentelemetry/resource-detector-alibaba-cloud@npm:0.29.6"
   dependencies:
     "@opentelemetry/core": ^1.26.0
     "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: e3cb36aa8b4ce7b6fc60fe15f51139493728f4c8e7af11f70cb567b5667680c16147bc382aa1a330b8bca26b392e7dddd5f66b6c393ca50aa315329baa0bea14
+  checksum: d8cef13063b0e674fb581312c4fdeab41c95829d72f8a0971e49a8ea667fcd0bd235fb6e44f248412205bf9dfb8c307aeb3af11ade482f19864e0b4eb16d863d
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-aws@npm:^1.6.2":
-  version: 1.6.2
-  resolution: "@opentelemetry/resource-detector-aws@npm:1.6.2"
+"@opentelemetry/resource-detector-aws@npm:^1.9.0":
+  version: 1.9.0
+  resolution: "@opentelemetry/resource-detector-aws@npm:1.9.0"
   dependencies:
     "@opentelemetry/core": ^1.0.0
     "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 82047c95f4ac1cf9eb6688ac924562cdf5e31bc9ebf4d1f2205e652de92350e6f85b111a220a1156d77fcafdbf513aaabb69919da19c8ce83fc3e6a3dd0dde8e
+  checksum: 11d8a3a4ffb66124f420f800488dfb1e46eed3ff9328693ee47b5ba65638c4f2ac16ac2b6e9edcd271d1a35bcc9044766daa17754d9f95f1ebbba10ec63507e4
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-azure@npm:^0.2.11":
-  version: 0.2.11
-  resolution: "@opentelemetry/resource-detector-azure@npm:0.2.11"
+"@opentelemetry/resource-detector-azure@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@opentelemetry/resource-detector-azure@npm:0.4.0"
   dependencies:
     "@opentelemetry/core": ^1.25.1
     "@opentelemetry/resources": ^1.10.1
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 13515be1d57f9a9611064224e55766a7a66176d85bcbc62e7313e261c0a40e8c02e6ec024ed51f1e20ce16f3e969a601a756d2130f01b24a1e088743886903b3
+  checksum: 1dce98349bc0bcaaf933f8e243026bb7d93f872ce08f3bd214ecc0125dad27afd84b607f0aae50c18316d10efa755c7e8c0b71a5a728408dacee71df2c8f02f6
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-container@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@opentelemetry/resource-detector-container@npm:0.4.4"
+"@opentelemetry/resource-detector-container@npm:^0.5.2":
+  version: 0.5.2
+  resolution: "@opentelemetry/resource-detector-container@npm:0.5.2"
   dependencies:
     "@opentelemetry/core": ^1.26.0
     "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: c99a859718fa496062a4392edba478bae38f24a78450f38df31cb13014ef159e6bb48cb41fba4eef717229f85bc79dc8f4031e9f263efa8eff3c583b5efa8069
+  checksum: 7d09a68f0e6f3f455f075e499eb5229f8f561124813b55a727e17d7de7c430470906634d97265a365971ffec67c70f0a3271b4e6c25ade8a65a48f9668c67c68
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-gcp@npm:^0.29.12":
-  version: 0.29.12
-  resolution: "@opentelemetry/resource-detector-gcp@npm:0.29.12"
+"@opentelemetry/resource-detector-gcp@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@opentelemetry/resource-detector-gcp@npm:0.31.0"
   dependencies:
     "@opentelemetry/core": ^1.0.0
     "@opentelemetry/resources": ^1.10.0
@@ -13710,116 +14844,208 @@ __metadata:
     gcp-metadata: ^6.0.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 5460a3c3cf9484dc38aff5625f7f905c08b380468b1ae3e0677c3b5a9319ba2297fd00a517361c28dcd8812a73e680fe5bf123bbcfdd240bc7d786b681998d3d
+  checksum: d62de94728ca67f03d9aa75a8a291285061cb058a8f245c2ca7b4a8e92e8c480e9958cc9dfd4550ba39475c5f06e0a692e19f6c0762f02005b617622082e3cc1
   languageName: node
   linkType: hard
 
-"@opentelemetry/resources@npm:1.26.0, @opentelemetry/resources@npm:^1.10.0, @opentelemetry/resources@npm:^1.10.1, @opentelemetry/resources@npm:^1.24.0, @opentelemetry/resources@npm:^1.8.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/resources@npm:1.26.0"
+"@opentelemetry/resources@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/resources@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
+    "@opentelemetry/core": 1.27.0
     "@opentelemetry/semantic-conventions": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: f70b0fdf4fb00c950bc30084818c92a5339f1be5d709bd681ab14453e877d6bb9f700324b8e65a0eabfeea618d01ed071abf9088e00fa0bf7f3305b1abad22cb
+  checksum: 43d298afea7daf7524e6b98c1441bcce9fa73b76aecf17e36cabb1a4cfaae6818acf9759d3e42706b1fd91243644076d2291e78c3ed81641d3b351fcff6cb9a9
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-logs@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/sdk-logs@npm:0.53.0"
+"@opentelemetry/resources@npm:1.29.0, @opentelemetry/resources@npm:^1.10.0, @opentelemetry/resources@npm:^1.10.1, @opentelemetry/resources@npm:^1.24.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/resources@npm:1.29.0"
   dependencies:
-    "@opentelemetry/api-logs": 0.53.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: dfa68245089fe4eb8983503539e2109753fd232d769f8bba675c3277ababde88b4e7d60af7ed34a7529a021af0f0df457e3782563597a58ba0599f0161b502b2
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-logs@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/sdk-logs@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/api-logs": 0.54.2
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.4.0 <1.10.0"
-  checksum: f36c051f6264786688e3b20b4b1a876e6f7a40166b425efaa6aab12dfe32f2ebbcc5bea1662631b2b17016ec5cf9205798219c896234828503477b144b02342e
+  checksum: 5d428d872df5357750c7025018968a1a9971d2236388657ebcb4925197b8d13e6f93ea8fedb0d8d6b1ba44da91c1a045680b2b57ef45e7ee29a5bc08630948cb
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-metrics@npm:1.26.0, @opentelemetry/sdk-metrics@npm:^1.9.1":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-metrics@npm:1.26.0"
+"@opentelemetry/sdk-logs@npm:0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/sdk-logs@npm:0.56.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
+    "@opentelemetry/api-logs": 0.56.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/resources": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.4.0 <1.10.0"
+  checksum: f0aed974f93a1b4e21a8d8a4fdc1ae87defe1f7b45dc58f56bb5d7bd41d0dc400ca9bb28af72b193baa4ddef4a1ec1168aee17aa4bf62c58caf1070e521ddfe2
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-metrics@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-metrics@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.3.0 <1.10.0"
-  checksum: c7fd09991bc28c4cfa0eef2e75a9fcfd1465638327e50ce55fb7631c9e333ae27c7c4bfbb4875c8fbb60f94bb60a307af157a898ea21f13fef967ab5e1146ed5
+  checksum: c8776577063a3a5199d5717247270daf5820ce6636530b5ea4b5a8d6b40170cec9bb6b56dacb5c118d2e90588af83d0ebbb13f4d370c7efe50f69d22e5d13463
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-node@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/sdk-node@npm:0.53.0"
+"@opentelemetry/sdk-metrics@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/sdk-metrics@npm:1.29.0"
   dependencies:
-    "@opentelemetry/api-logs": 0.53.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/exporter-logs-otlp-grpc": 0.53.0
-    "@opentelemetry/exporter-logs-otlp-http": 0.53.0
-    "@opentelemetry/exporter-logs-otlp-proto": 0.53.0
-    "@opentelemetry/exporter-trace-otlp-grpc": 0.53.0
-    "@opentelemetry/exporter-trace-otlp-http": 0.53.0
-    "@opentelemetry/exporter-trace-otlp-proto": 0.53.0
-    "@opentelemetry/exporter-zipkin": 1.26.0
-    "@opentelemetry/instrumentation": 0.53.0
-    "@opentelemetry/resources": 1.26.0
-    "@opentelemetry/sdk-logs": 0.53.0
-    "@opentelemetry/sdk-metrics": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
-    "@opentelemetry/sdk-trace-node": 1.26.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/resources": 1.29.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.3.0 <1.10.0"
+  checksum: 036f2da0adff7ffd69cd2b7892b81ef4dcd0caa0c3d176dbfec9282a004f56af46956b66949f8e3ce27db589c99fa56a996e3854599979fa35dab876109f533a
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-node@npm:^0.54.0":
+  version: 0.54.2
+  resolution: "@opentelemetry/sdk-node@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/api-logs": 0.54.2
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/exporter-logs-otlp-grpc": 0.54.2
+    "@opentelemetry/exporter-logs-otlp-http": 0.54.2
+    "@opentelemetry/exporter-logs-otlp-proto": 0.54.2
+    "@opentelemetry/exporter-trace-otlp-grpc": 0.54.2
+    "@opentelemetry/exporter-trace-otlp-http": 0.54.2
+    "@opentelemetry/exporter-trace-otlp-proto": 0.54.2
+    "@opentelemetry/exporter-zipkin": 1.27.0
+    "@opentelemetry/instrumentation": 0.54.2
+    "@opentelemetry/resources": 1.27.0
+    "@opentelemetry/sdk-logs": 0.54.2
+    "@opentelemetry/sdk-metrics": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
+    "@opentelemetry/sdk-trace-node": 1.27.0
     "@opentelemetry/semantic-conventions": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.3.0 <1.10.0"
-  checksum: b58dd621961f4d020527a7b0551ebd190330c83f4c19b552cd899079c7047064206b7d71735833506b52796831c22e72e73b635309a7d2e6ba78355ec93cd305
+  checksum: b975fc8c335b8d22e045dfb94028c90d28fa1d8080a4ddbe787700136c746d0cd969dea8b41d889de29e7d6257e74cc2ee26bf8aedeeb2369bbfef33d704eda6
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-trace-base@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-trace-base@npm:1.26.0"
+"@opentelemetry/sdk-node@npm:^0.56.0":
+  version: 0.56.0
+  resolution: "@opentelemetry/sdk-node@npm:0.56.0"
   dependencies:
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/resources": 1.26.0
+    "@opentelemetry/api-logs": 0.56.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/exporter-logs-otlp-grpc": 0.56.0
+    "@opentelemetry/exporter-logs-otlp-http": 0.56.0
+    "@opentelemetry/exporter-logs-otlp-proto": 0.56.0
+    "@opentelemetry/exporter-trace-otlp-grpc": 0.56.0
+    "@opentelemetry/exporter-trace-otlp-http": 0.56.0
+    "@opentelemetry/exporter-trace-otlp-proto": 0.56.0
+    "@opentelemetry/exporter-zipkin": 1.29.0
+    "@opentelemetry/instrumentation": 0.56.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/sdk-logs": 0.56.0
+    "@opentelemetry/sdk-metrics": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+    "@opentelemetry/sdk-trace-node": 1.29.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.3.0 <1.10.0"
+  checksum: f3261c1bf8a43f4a45bdc08fc80abf2abc9e0f59fbe557f7b6109078cfbd4bebfdd7c4289a907d02d0d2ef944efb72647718a68a3feb6c9676345ffbfe4e90bb
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-trace-base@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/resources": 1.27.0
     "@opentelemetry/semantic-conventions": 1.27.0
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: a4f4ddf644fd0d79b2bd49e4377143688d2aa657643a470d8bed6696f26817598fb4e9f16ba2d8c237292af56f06eec56594a7b4cc417d4ea7e490a45a22113b
+  checksum: d28c36724aeaf4884f7957e2ab138d9a0ca715a68b2ad23e2935ff0e39cd438c57fd0c8cc85fd5e280464857ede1ae8f9c8e40a37088a1e34d2e625e77276fee
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-trace-node@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-trace-node@npm:1.26.0"
+"@opentelemetry/sdk-trace-base@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.29.0"
   dependencies:
-    "@opentelemetry/context-async-hooks": 1.26.0
-    "@opentelemetry/core": 1.26.0
-    "@opentelemetry/propagator-b3": 1.26.0
-    "@opentelemetry/propagator-jaeger": 1.26.0
-    "@opentelemetry/sdk-trace-base": 1.26.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/resources": 1.29.0
+    "@opentelemetry/semantic-conventions": 1.28.0
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: 750aa58f5323bda8391213d5bdabadbf2dfb28462198b87f7f41586fa7825cccfd04bdb1c199d3fd368f9837ba7d5f890cae1f7f5d29ec2aeb9e2b7f6a88ba37
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-trace-node@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-node@npm:1.27.0"
+  dependencies:
+    "@opentelemetry/context-async-hooks": 1.27.0
+    "@opentelemetry/core": 1.27.0
+    "@opentelemetry/propagator-b3": 1.27.0
+    "@opentelemetry/propagator-jaeger": 1.27.0
+    "@opentelemetry/sdk-trace-base": 1.27.0
     semver: ^7.5.2
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 1d63bed8fc36496698919ccd25be3b7b0e0d0bf9478f413a26bdbfe0bf0d4166bf58bbbee2415fb2fe42d3008b5c32ec7e4e42f2cb6d18b665b349eb025c15eb
+  checksum: 2abbd609ebefc3c8ece87321281d3b31a59201e799e55cbde0ad0d87b7643e4e5ac47d83dcde2306d32780438b6eba49f57113bc56ed02e95b6fab1732780247
   languageName: node
   linkType: hard
 
-"@opentelemetry/semantic-conventions@npm:1.24.0":
-  version: 1.24.0
-  resolution: "@opentelemetry/semantic-conventions@npm:1.24.0"
-  checksum: ba7c71602f3eddc3f015457cf1183bd24f0300b2636b57cafe2e5196ae233daf05e573e3a7b954818e8f2d9543a44282a0406f327b9c066ae948eea5f4a91d27
+"@opentelemetry/sdk-trace-node@npm:1.29.0":
+  version: 1.29.0
+  resolution: "@opentelemetry/sdk-trace-node@npm:1.29.0"
+  dependencies:
+    "@opentelemetry/context-async-hooks": 1.29.0
+    "@opentelemetry/core": 1.29.0
+    "@opentelemetry/propagator-b3": 1.29.0
+    "@opentelemetry/propagator-jaeger": 1.29.0
+    "@opentelemetry/sdk-trace-base": 1.29.0
+    semver: ^7.5.2
+  peerDependencies:
+    "@opentelemetry/api": ">=1.0.0 <1.10.0"
+  checksum: f55a0ca916482d97227529783aa8506ab569a8835c0d39baadf93451e06b5eb44dbe8399be78ff080a89b24ab9a582d0fc1c5163bba641cbc4383a0f3da5f8b3
   languageName: node
   linkType: hard
 
-"@opentelemetry/semantic-conventions@npm:1.27.0, @opentelemetry/semantic-conventions@npm:^1.27.0":
+"@opentelemetry/semantic-conventions@npm:1.27.0":
   version: 1.27.0
   resolution: "@opentelemetry/semantic-conventions@npm:1.27.0"
   checksum: 26d85f8d13c8c64024f7a84528cff41d56afc9829e7ff8a654576404f8b2c1a9c264adcc6fa5a9551bacdd938a4a464041fa9493e0a722e5605f2c2ae6752398
   languageName: node
   linkType: hard
 
+"@opentelemetry/semantic-conventions@npm:1.28.0, @opentelemetry/semantic-conventions@npm:^1.27.0":
+  version: 1.28.0
+  resolution: "@opentelemetry/semantic-conventions@npm:1.28.0"
+  checksum: 1d708afa654990236cdb6b5da84f7ab899b70bff9f753bc49d93616a5c7f7f339ba1eba6a9fbb57dee596995334f4e7effa57a4624741882ab5b3c419c3511e2
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/sql-common@npm:^0.40.1":
   version: 0.40.1
   resolution: "@opentelemetry/sql-common@npm:0.40.1"
@@ -13831,14 +15057,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oriflame/backstage-plugin-score-card@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@oriflame/backstage-plugin-score-card@npm:0.8.0"
+"@oriflame/backstage-plugin-score-card@npm:^0.9.0":
+  version: 0.9.1
+  resolution: "@oriflame/backstage-plugin-score-card@npm:0.9.1"
   dependencies:
     "@backstage/catalog-model": ^1.4.3
     "@backstage/config": ^1.1.1
     "@backstage/core-components": ^0.13.10
     "@backstage/core-plugin-api": ^1.8.2
+    "@backstage/integration": ^1.9.0
+    "@backstage/integration-react": ^1.1.24
     "@backstage/plugin-catalog-common": ^1.0.20
     "@backstage/plugin-catalog-react": ^1.9.3
     "@backstage/theme": ^0.5.0
@@ -13847,13 +15075,13 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.11.2
     "@material-ui/lab": ^4.0.0-alpha.57
-    "@types/react": ^18.0.0
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react-use: ^17.2.4
   peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-    react-router-dom: ^6.4.3
-  checksum: 4d1bf78b3fc6cce80b3cbc1abef5613bb609d2262e0d410aa57cc7e175eaf5cb727796ab61b44507f5c826b1f059f4ec03c280ce6cdbf7291d4461d745a9b5b6
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: cebd9fd9f7d31e1b96765a02eefa2c817e401654bc28a40fe40236e0d79589760188e460797dbaf23ab56478120a60604403339267fb9ae9a9d23fcdfdb674a1
   languageName: node
   linkType: hard
 
@@ -13865,13 +15093,13 @@ __metadata:
   linkType: hard
 
 "@playwright/test@npm:^1.32.3":
-  version: 1.48.1
-  resolution: "@playwright/test@npm:1.48.1"
+  version: 1.49.0
+  resolution: "@playwright/test@npm:1.49.0"
   dependencies:
-    playwright: 1.48.1
+    playwright: 1.49.0
   bin:
     playwright: cli.js
-  checksum: 3f3f32dadeea9da4b9f835ba41d6bfabbd4c8d322bbba059250cb7bbdf2ae8fd32d547f64cef0bda492dff32128b4d4d802422525995570ebb57e62605c0557f
+  checksum: f8477aa61d59fd22c6161c48221ab246340dc37bbe2804e1a7d1be8cbd0fd861747fcb7ca559f4bc7328226ff2c90ccb7efa588a7d7d7829f3e57902b28fe39a
   languageName: node
   linkType: hard
 
@@ -14589,10 +15817,66 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.20.0":
-  version: 1.20.0
-  resolution: "@remix-run/router@npm:1.20.0"
-  checksum: 6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
+"@redis/bloom@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@redis/bloom@npm:1.2.0"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 8c214227287d6b278109098bca00afc601cf84f7da9c6c24f4fa7d3854b946170e5893aa86ed607ba017a4198231d570541c79931b98b6d50b262971022d1d6c
+  languageName: node
+  linkType: hard
+
+"@redis/client@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@redis/client@npm:1.6.0"
+  dependencies:
+    cluster-key-slot: 1.1.2
+    generic-pool: 3.9.0
+    yallist: 4.0.0
+  checksum: c01c89a793541dc6908a97f375fec3ac28bed7f92b1c20351a3073ce75c0263998a30c3316cbb76e6a4403059d9982d40aec0bc8f1b3cab43615edaaf05980da
+  languageName: node
+  linkType: hard
+
+"@redis/graph@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@redis/graph@npm:1.1.1"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: caf9b9a3ff82a08ae543c356a3fed548399ae79aba5ed08ce6cf1b522b955eb5cee4406b0ed0c6899345f8fbc06dfd6cd51304ae8422c3ebbc468f53294dc509
+  languageName: node
+  linkType: hard
+
+"@redis/json@npm:1.0.7":
+  version: 1.0.7
+  resolution: "@redis/json@npm:1.0.7"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: a84d51c06a2af9a42eff5a6db795e7c0f7ada27d958f5d762b6f9778f413399dbe6a0c2ab00dd7ccc5fdab5f2940afbab4a56c2b1c284a2326d0f79965d5bba1
+  languageName: node
+  linkType: hard
+
+"@redis/search@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@redis/search@npm:1.2.0"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 256ddf8b30f216b605e571c9085e0efd5e3b43229b57db8ba0eea3376540ada437b68509c3bb0354e3c784f5fa1b825593cc602ebbfc5cbfa9e46d5c7be67eb6
+  languageName: node
+  linkType: hard
+
+"@redis/time-series@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@redis/time-series@npm:1.1.0"
+  peerDependencies:
+    "@redis/client": ^1.0.0
+  checksum: 785f024e1c83866708beb254f765e561ccd6e6caad61b697223b3355ee92ca1e99a4d312c4ce03a3d6a29a223f38a2ec844c80b47990fa3bd9ddc56a30c1376f
+  languageName: node
+  linkType: hard
+
+"@remix-run/router@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@remix-run/router@npm:1.21.0"
+  checksum: d9477a7772053ad0ffcf03385cfb1a54e56f8a56d1f9f5062de3b1dfcbd019dd73282a00a5a72aa55c120771110982448c165c1405d64540aaef13051a8e45cc
   languageName: node
   linkType: hard
 
@@ -14603,6 +15887,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@remixicon/react@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "@remixicon/react@npm:4.5.0"
+  peerDependencies:
+    react: ">=18.2.0"
+  checksum: e37b61090954954601d35367a740b7be30c105a49f67eaa5a697db16d4668d71d9fd94b339da6d449a254736d5af3b567d3694021b79d3c82fe28afb818830bc
+  languageName: node
+  linkType: hard
+
 "@repeaterjs/repeater@npm:^3.0.4":
   version: 3.0.5
   resolution: "@repeaterjs/repeater@npm:3.0.5"
@@ -14610,9 +15903,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/core@npm:5.21.2":
-  version: 5.21.2
-  resolution: "@rjsf/core@npm:5.21.2"
+"@rjsf/core@npm:5.23.1":
+  version: 5.23.1
+  resolution: "@rjsf/core@npm:5.23.1"
   dependencies:
     lodash: ^4.17.21
     lodash-es: ^4.17.21
@@ -14620,28 +15913,28 @@ __metadata:
     nanoid: ^3.3.7
     prop-types: ^15.8.1
   peerDependencies:
-    "@rjsf/utils": ^5.20.x
+    "@rjsf/utils": ^5.23.x
     react: ^16.14.0 || >=17
-  checksum: ac5c4ff0e0cf74ba8cf6d58df314f8f17de6be5b00bb0ca14f79861347bbaa59f37b8f572d80f30388c5007de1d2dedfc3ff70e419eb874331d58f0ba9eeeb42
+  checksum: acb5b1541b7e6f9911dce33455c297402fc1b2278b0c688073decdea977efae7d4227962eaadeb48fd14c2a8e4bba73a80df975b1c49aa2e2b933c2646ab4904
   languageName: node
   linkType: hard
 
-"@rjsf/material-ui@npm:5.21.2":
-  version: 5.21.2
-  resolution: "@rjsf/material-ui@npm:5.21.2"
+"@rjsf/material-ui@npm:5.23.1":
+  version: 5.23.1
+  resolution: "@rjsf/material-ui@npm:5.23.1"
   peerDependencies:
     "@material-ui/core": ^4.12.3
     "@material-ui/icons": ^4.11.2
-    "@rjsf/core": ^5.20.x
-    "@rjsf/utils": ^5.20.x
+    "@rjsf/core": ^5.23.x
+    "@rjsf/utils": ^5.23.x
     react: ^16.14.0 || >=17
-  checksum: 868d86f0a9786b0404734628d5fd158ab1bed4bb6eed8b23cdcdb3e68c398993b6ea8edb5ff4cc68006b081bfeaecb2e5ee6252872604d2124e9dc3078732676
+  checksum: ae0d401edd407c534406cce60fda2725fc246286cbedd8a8e4031097d4d318761fd8a4f35339d0f3f857a3dc863b88a75002d6900176052913bb629d0ebde4f9
   languageName: node
   linkType: hard
 
-"@rjsf/utils@npm:5.21.2":
-  version: 5.21.2
-  resolution: "@rjsf/utils@npm:5.21.2"
+"@rjsf/utils@npm:5.23.1":
+  version: 5.23.1
+  resolution: "@rjsf/utils@npm:5.23.1"
   dependencies:
     json-schema-merge-allof: ^0.8.1
     jsonpointer: ^5.0.1
@@ -14650,21 +15943,21 @@ __metadata:
     react-is: ^18.2.0
   peerDependencies:
     react: ^16.14.0 || >=17
-  checksum: 05460f3c95e1a407001accaf2e9b90c0731433936cfea6a129ac01b49575f56ba336f1ae46e3930f0226580d06c6300c8622d1c3a56354c3e723caf3654f02e1
+  checksum: 7580419cf07416fe1e608ed171c30b25b3a78cfebba7d97e3120fe2e40f702fd0e61494e6c823281091522b053a39a83ab31ceb97c078cfb39ac636dc2d997c1
   languageName: node
   linkType: hard
 
-"@rjsf/validator-ajv8@npm:5.21.2":
-  version: 5.21.2
-  resolution: "@rjsf/validator-ajv8@npm:5.21.2"
+"@rjsf/validator-ajv8@npm:5.23.1":
+  version: 5.23.1
+  resolution: "@rjsf/validator-ajv8@npm:5.23.1"
   dependencies:
     ajv: ^8.12.0
     ajv-formats: ^2.1.1
     lodash: ^4.17.21
     lodash-es: ^4.17.21
   peerDependencies:
-    "@rjsf/utils": ^5.20.x
-  checksum: 06d34e70e6595c5a0e999a3a2a651fccc7a36dbb2395f5805ce1ac6b47201111e6d84c9e122f3d336bbdbaca61875a90efd65e1839d9da3c9aafe282dcc03086
+    "@rjsf/utils": ^5.23.x
+  checksum: 3eca428bd682ea8226558e0c719f263912ad8d6fde2c3ee817c5c106070fd3142f614dc35e15819000f8f00f9c00aa654c2dab5fd3a7318164ad6420d53068f5
   languageName: node
   linkType: hard
 
@@ -14777,194 +16070,208 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.24.0"
+"@rollup/rollup-android-arm-eabi@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.27.4"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-android-arm64@npm:4.24.0"
+"@rollup/rollup-android-arm64@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-android-arm64@npm:4.27.4"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.24.0"
+"@rollup/rollup-darwin-arm64@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.27.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-darwin-x64@npm:4.24.0"
+"@rollup/rollup-darwin-x64@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-darwin-x64@npm:4.27.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.24.0"
+"@rollup/rollup-freebsd-arm64@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-freebsd-arm64@npm:4.27.4"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-freebsd-x64@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-freebsd-x64@npm:4.27.4"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.27.4"
   conditions: os=linux & cpu=arm & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.24.0"
+"@rollup/rollup-linux-arm-musleabihf@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.27.4"
   conditions: os=linux & cpu=arm & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.24.0"
+"@rollup/rollup-linux-arm64-gnu@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.27.4"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.24.0"
+"@rollup/rollup-linux-arm64-musl@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.27.4"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.0"
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.4"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.24.0"
+"@rollup/rollup-linux-riscv64-gnu@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.27.4"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.24.0"
+"@rollup/rollup-linux-s390x-gnu@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.27.4"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.24.0"
+"@rollup/rollup-linux-x64-gnu@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.27.4"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.24.0"
+"@rollup/rollup-linux-x64-musl@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.27.4"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.24.0"
+"@rollup/rollup-win32-arm64-msvc@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.27.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.24.0"
+"@rollup/rollup-win32-ia32-msvc@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.27.4"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.24.0":
-  version: 4.24.0
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.24.0"
+"@rollup/rollup-win32-x64-msvc@npm:4.27.4":
+  version: 4.27.4
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.27.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@rspack/binding-darwin-arm64@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-darwin-arm64@npm:1.0.13"
+"@rspack/binding-darwin-arm64@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-darwin-arm64@npm:1.1.5"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rspack/binding-darwin-x64@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-darwin-x64@npm:1.0.13"
+"@rspack/binding-darwin-x64@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-darwin-x64@npm:1.1.5"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-arm64-gnu@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-linux-arm64-gnu@npm:1.0.13"
+"@rspack/binding-linux-arm64-gnu@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-linux-arm64-gnu@npm:1.1.5"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-arm64-musl@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-linux-arm64-musl@npm:1.0.13"
+"@rspack/binding-linux-arm64-musl@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-linux-arm64-musl@npm:1.1.5"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-x64-gnu@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-linux-x64-gnu@npm:1.0.13"
+"@rspack/binding-linux-x64-gnu@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-linux-x64-gnu@npm:1.1.5"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-x64-musl@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-linux-x64-musl@npm:1.0.13"
+"@rspack/binding-linux-x64-musl@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-linux-x64-musl@npm:1.1.5"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-arm64-msvc@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-win32-arm64-msvc@npm:1.0.13"
+"@rspack/binding-win32-arm64-msvc@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-win32-arm64-msvc@npm:1.1.5"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-ia32-msvc@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-win32-ia32-msvc@npm:1.0.13"
+"@rspack/binding-win32-ia32-msvc@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-win32-ia32-msvc@npm:1.1.5"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-x64-msvc@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding-win32-x64-msvc@npm:1.0.13"
+"@rspack/binding-win32-x64-msvc@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding-win32-x64-msvc@npm:1.1.5"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@rspack/binding@npm:1.0.13":
-  version: 1.0.13
-  resolution: "@rspack/binding@npm:1.0.13"
+"@rspack/binding@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@rspack/binding@npm:1.1.5"
   dependencies:
-    "@rspack/binding-darwin-arm64": 1.0.13
-    "@rspack/binding-darwin-x64": 1.0.13
-    "@rspack/binding-linux-arm64-gnu": 1.0.13
-    "@rspack/binding-linux-arm64-musl": 1.0.13
-    "@rspack/binding-linux-x64-gnu": 1.0.13
-    "@rspack/binding-linux-x64-musl": 1.0.13
-    "@rspack/binding-win32-arm64-msvc": 1.0.13
-    "@rspack/binding-win32-ia32-msvc": 1.0.13
-    "@rspack/binding-win32-x64-msvc": 1.0.13
+    "@rspack/binding-darwin-arm64": 1.1.5
+    "@rspack/binding-darwin-x64": 1.1.5
+    "@rspack/binding-linux-arm64-gnu": 1.1.5
+    "@rspack/binding-linux-arm64-musl": 1.1.5
+    "@rspack/binding-linux-x64-gnu": 1.1.5
+    "@rspack/binding-linux-x64-musl": 1.1.5
+    "@rspack/binding-win32-arm64-msvc": 1.1.5
+    "@rspack/binding-win32-ia32-msvc": 1.1.5
+    "@rspack/binding-win32-x64-msvc": 1.1.5
   dependenciesMeta:
     "@rspack/binding-darwin-arm64":
       optional: true
@@ -14984,16 +16291,16 @@ __metadata:
       optional: true
     "@rspack/binding-win32-x64-msvc":
       optional: true
-  checksum: c3dfffcaf9699c1cb9fa37fd117a93411ae2f74c17fd2a0523f21358f5c25ee50ab53c37b0589f92d39136aa85317a7ab67130a38056d5241cfa8f69ed2c9cdc
+  checksum: 6fe7d4cd04613c8c25d1e5eabf97abd82c721ec68f787150eab3026ef01830043e9c062851a286618106cadca759fc55929ec39b85b12e21025cffd39655dfc6
   languageName: node
   linkType: hard
 
 "@rspack/core@npm:^1.0.10":
-  version: 1.0.13
-  resolution: "@rspack/core@npm:1.0.13"
+  version: 1.1.5
+  resolution: "@rspack/core@npm:1.1.5"
   dependencies:
     "@module-federation/runtime-tools": 0.5.1
-    "@rspack/binding": 1.0.13
+    "@rspack/binding": 1.1.5
     "@rspack/lite-tapable": 1.0.1
     caniuse-lite: ^1.0.30001616
   peerDependencies:
@@ -15001,7 +16308,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: f26684ea009b032d79597ce3283ce6afd81b79a679682d845a44849fe338ccf153373158af5e851b5c0d9ac6e7e2928696b23dd2a414eda667c67d0a40e8fe5f
+  checksum: 795da019b01555f7f3035ee1c80f39d808ddd1a6043aa2ab8caa3c42e3f73f966fb581bcb9c959852fd31d52ea8f89e2a135c8fa29c31cb7effa7d237a854520
   languageName: node
   linkType: hard
 
@@ -15128,6 +16435,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scarf/scarf@npm:=1.4.0":
+  version: 1.4.0
+  resolution: "@scarf/scarf@npm:1.4.0"
+  checksum: def62aa403f7e63165ccb219efd2c420fc0b7357b0ba43397f635e4aa813ace1cdf3855a93fc559b4619bcc0469ae4767b8cb72af30ea5c0522bf4a2ecb18198
+  languageName: node
+  linkType: hard
+
+"@sec-ant/readable-stream@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@sec-ant/readable-stream@npm:0.4.1"
+  checksum: eb56f72a70995f725269f1c1c206d6dbeb090e88413b1302a456c600041175a7a484c2f0172454f7bed65a8ab95ffed7647d8ad03e6c23b1e3bbc9845f78cd17
+  languageName: node
+  linkType: hard
+
 "@segment/analytics-core@npm:1.4.1":
   version: 1.4.1
   resolution: "@segment/analytics-core@npm:1.4.1"
@@ -15264,6 +16585,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sindresorhus/merge-streams@npm:^2.1.0":
+  version: 2.3.0
+  resolution: "@sindresorhus/merge-streams@npm:2.3.0"
+  checksum: e989d53dee68d7e49b4ac02ae49178d561c461144cea83f66fa91ff012d981ad0ad2340cbd13f2fdb57989197f5c987ca22a74eb56478626f04e79df84291159
+  languageName: node
+  linkType: hard
+
 "@sinonjs/commons@npm:^2.0.0":
   version: 2.0.0
   resolution: "@sinonjs/commons@npm:2.0.0"
@@ -15327,13 +16655,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/abort-controller@npm:^3.1.2, @smithy/abort-controller@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "@smithy/abort-controller@npm:3.1.5"
+"@smithy/abort-controller@npm:^3.1.2, @smithy/abort-controller@npm:^3.1.8":
+  version: 3.1.8
+  resolution: "@smithy/abort-controller@npm:3.1.8"
   dependencies:
-    "@smithy/types": ^3.5.0
+    "@smithy/types": ^3.7.1
     tslib: ^2.6.2
-  checksum: 538c88d6dfe84d92a7dead4eb149d48bc59857df8235057727c0481e851b0ceea6aabfd5cc059c9e37e66fbadead461c85d6a7c8436e2db6681f06333e814281
+  checksum: edfe448be34e33120dfb11a564e87362288ed76d69eaae3449d5f1ee806def1fc844c35421caf2cf579e3bc45df97340e74e36927ec439c8c8aca5c5edf8fb85
   languageName: node
   linkType: hard
 
@@ -15618,15 +16946,15 @@ __metadata:
   linkType: hard
 
 "@smithy/node-http-handler@npm:^3.0.0, @smithy/node-http-handler@npm:^3.2.0":
-  version: 3.2.4
-  resolution: "@smithy/node-http-handler@npm:3.2.4"
+  version: 3.3.1
+  resolution: "@smithy/node-http-handler@npm:3.3.1"
   dependencies:
-    "@smithy/abort-controller": ^3.1.5
-    "@smithy/protocol-http": ^4.1.4
-    "@smithy/querystring-builder": ^3.0.7
-    "@smithy/types": ^3.5.0
+    "@smithy/abort-controller": ^3.1.8
+    "@smithy/protocol-http": ^4.1.7
+    "@smithy/querystring-builder": ^3.0.10
+    "@smithy/types": ^3.7.1
     tslib: ^2.6.2
-  checksum: 658934366953828af04e5f8d0229f24e8ff783c1bd34b179203099321e4b41b19dfd921c3ef431d8067fc2d49a0c806d0c758fff6ea10606e092480dcf6b0f26
+  checksum: 483766a6f7d9625b254a1e88f54c0bd89e83bb0c3a3518d3b298dcd9bbc2160bca2e867a859654c483aed78e8578e0c3c65ae4e0c4aa6e5e50bc04cdb7af1b37
   languageName: node
   linkType: hard
 
@@ -15640,24 +16968,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/protocol-http@npm:^4.1.1, @smithy/protocol-http@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "@smithy/protocol-http@npm:4.1.4"
+"@smithy/protocol-http@npm:^4.1.1, @smithy/protocol-http@npm:^4.1.7":
+  version: 4.1.7
+  resolution: "@smithy/protocol-http@npm:4.1.7"
   dependencies:
-    "@smithy/types": ^3.5.0
+    "@smithy/types": ^3.7.1
     tslib: ^2.6.2
-  checksum: c0655e2031ec6ae96d63a125b76ca9bb46b3e4b8f4436ef0ea9bcf08303c1b6cdd4f0d17a1cd87cfdbe60bde34e5001d65f91d4e3eaa24cf560ed718967686de
+  checksum: 3d78a52558edb712e7b399535fcb9de5960610dc4b81ce15f1b52c7ac3ea96f47c53132974ce9e1108378dc1c5ee90333828dfa1a071dff7b49cf7b687537452
   languageName: node
   linkType: hard
 
-"@smithy/querystring-builder@npm:^3.0.4, @smithy/querystring-builder@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@smithy/querystring-builder@npm:3.0.7"
+"@smithy/querystring-builder@npm:^3.0.10, @smithy/querystring-builder@npm:^3.0.4":
+  version: 3.0.10
+  resolution: "@smithy/querystring-builder@npm:3.0.10"
   dependencies:
-    "@smithy/types": ^3.5.0
+    "@smithy/types": ^3.7.1
     "@smithy/util-uri-escape": ^3.0.0
     tslib: ^2.6.2
-  checksum: 0c41ce1993ce4b7dc509bc1fa50c42000a1cb5801601fc28d9113494349c337e88f77bff998f0debf0be0eba41d67d653a6648eea0f5b3b1e0f8a3cd57229631
+  checksum: a789b6f43392247880d71a4d88a89309d2da0c66e2c0f1708c9befd19db66151b8653e6ba3a13cb9aae2a9ed3889245ad394ecdb1076c25b447296b0a4d83877
   languageName: node
   linkType: hard
 
@@ -15729,12 +17057,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/types@npm:^3.4.0, @smithy/types@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "@smithy/types@npm:3.5.0"
+"@smithy/types@npm:^3.4.0, @smithy/types@npm:^3.7.1":
+  version: 3.7.1
+  resolution: "@smithy/types@npm:3.7.1"
   dependencies:
     tslib: ^2.6.2
-  checksum: 5d297005549991f6928daf038e0610c959423add6e435af970b8c8dcac988bf62b0cdbf4dd5df43197d9bc7af5c290792f17af6e2f5051be2ffa40dd98ab4659
+  checksum: 8db4393211db97aec515cc06748fa23acfc0c26a19c5ed6d009add623e1b1b7a470603a71f55b9de31a15696a2918e4a0913cb3531bfc7951b80bc7872f594f0
   languageName: node
   linkType: hard
 
@@ -15987,15 +17315,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spotify/prettier-config@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@spotify/prettier-config@npm:15.0.0"
-  peerDependencies:
-    prettier: 2.x
-  checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44
-  languageName: node
-  linkType: hard
-
 "@stoplight/better-ajv-errors@npm:1.0.3":
   version: 1.0.3
   resolution: "@stoplight/better-ajv-errors@npm:1.0.3"
@@ -16036,7 +17355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@stoplight/json@npm:^3.17.0, @stoplight/json@npm:^3.17.1, @stoplight/json@npm:^3.20.2, @stoplight/json@npm:^3.21.0, @stoplight/json@npm:~3.21.0":
+"@stoplight/json@npm:3.21.0":
   version: 3.21.0
   resolution: "@stoplight/json@npm:3.21.0"
   dependencies:
@@ -16050,6 +17369,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@stoplight/json@npm:^3.17.0, @stoplight/json@npm:^3.17.1, @stoplight/json@npm:^3.20.1, @stoplight/json@npm:^3.21.0, @stoplight/json@npm:~3.21.0":
+  version: 3.21.7
+  resolution: "@stoplight/json@npm:3.21.7"
+  dependencies:
+    "@stoplight/ordered-object-literal": ^1.0.3
+    "@stoplight/path": ^1.3.2
+    "@stoplight/types": ^13.6.0
+    jsonc-parser: ~2.2.1
+    lodash: ^4.17.21
+    safe-stable-stringify: ^1.1
+  checksum: 5b0cd67e91e8f4cfac7ff0fe37c07e203611f429e8af7fce51cacb82f9c97150a3fa3aeda41daa9e65bc42d217b630bf01a8bf1f6db12b047079b0da9d7cd9af
+  languageName: node
+  linkType: hard
+
 "@stoplight/ordered-object-literal@npm:^1.0.3, @stoplight/ordered-object-literal@npm:^1.0.5":
   version: 1.0.5
   resolution: "@stoplight/ordered-object-literal@npm:1.0.5"
@@ -16064,16 +17397,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@stoplight/spectral-core@npm:^1.15.1, @stoplight/spectral-core@npm:^1.16.1, @stoplight/spectral-core@npm:^1.18.0, @stoplight/spectral-core@npm:^1.7.0, @stoplight/spectral-core@npm:^1.8.0, @stoplight/spectral-core@npm:^1.8.1":
-  version: 1.19.1
-  resolution: "@stoplight/spectral-core@npm:1.19.1"
+"@stoplight/spectral-core@npm:^1.18.0, @stoplight/spectral-core@npm:^1.18.3, @stoplight/spectral-core@npm:^1.19.2, @stoplight/spectral-core@npm:^1.19.4, @stoplight/spectral-core@npm:^1.8.1":
+  version: 1.19.4
+  resolution: "@stoplight/spectral-core@npm:1.19.4"
   dependencies:
     "@stoplight/better-ajv-errors": 1.0.3
     "@stoplight/json": ~3.21.0
     "@stoplight/path": 1.3.2
     "@stoplight/spectral-parsers": ^1.0.0
     "@stoplight/spectral-ref-resolver": ^1.0.4
-    "@stoplight/spectral-runtime": ^1.0.0
+    "@stoplight/spectral-runtime": ^1.1.2
     "@stoplight/types": ~13.6.0
     "@types/es-aggregate-error": ^1.0.2
     "@types/json-schema": ^7.0.11
@@ -16081,37 +17414,37 @@ __metadata:
     ajv-errors: ~3.0.0
     ajv-formats: ~2.1.0
     es-aggregate-error: ^1.0.7
-    jsonpath-plus: 7.1.0
+    jsonpath-plus: 10.2.0
     lodash: ~4.17.21
     lodash.topath: ^4.5.2
     minimatch: 3.1.2
-    nimma: 0.2.2
-    pony-cause: ^1.0.0
-    simple-eval: 1.0.0
-    tslib: ^2.3.0
-  checksum: 35495c3f72eacd02d74b0913ad5a8cdad7573ab06c08cc9f6b44abd68e0c8b2229df9efee11cfe8a47ffeea802ce2b3bb17e378dffe5eab47504f70abd8b492c
+    nimma: 0.2.3
+    pony-cause: ^1.1.1
+    simple-eval: 1.0.1
+    tslib: ^2.8.1
+  checksum: c9efb0892a80f66f58309e297e7cb27580847403a5625f95b0332dbba4e3fe360f04aa60339d61824a025e3ee6296c2f73e1ca7119b783f9349f21d971b73dd8
   languageName: node
   linkType: hard
 
-"@stoplight/spectral-formats@npm:^1.2.0, @stoplight/spectral-formats@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "@stoplight/spectral-formats@npm:1.7.0"
+"@stoplight/spectral-formats@npm:^1.2.0, @stoplight/spectral-formats@npm:^1.8.1":
+  version: 1.8.2
+  resolution: "@stoplight/spectral-formats@npm:1.8.2"
   dependencies:
     "@stoplight/json": ^3.17.0
-    "@stoplight/spectral-core": ^1.8.0
+    "@stoplight/spectral-core": ^1.19.2
     "@types/json-schema": ^7.0.7
-    tslib: ^2.3.1
-  checksum: eccc2a6c099c7cbdd7c0b6c48b7fbfa334cdc2323958790496aa0295af27ef42ccae8b40e05c742aa3431da724b8d494c837af1af60f86d05189853b95b7c2c9
+    tslib: ^2.8.1
+  checksum: 1724aeaf933446cda79cc62aef4326ff9df4dad2cfa64e3e1286b001957e628235be679610cf61e4f01d53703ede11853ff389f0d038e6af367e7861219a5c2d
   languageName: node
   linkType: hard
 
 "@stoplight/spectral-formatters@npm:^1.1.0":
-  version: 1.4.0
-  resolution: "@stoplight/spectral-formatters@npm:1.4.0"
+  version: 1.4.3
+  resolution: "@stoplight/spectral-formatters@npm:1.4.3"
   dependencies:
     "@stoplight/path": ^1.3.2
-    "@stoplight/spectral-core": ^1.15.1
-    "@stoplight/spectral-runtime": ^1.1.0
+    "@stoplight/spectral-core": ^1.19.4
+    "@stoplight/spectral-runtime": ^1.1.2
     "@stoplight/types": ^13.15.0
     "@types/markdown-escape": ^1.1.3
     chalk: 4.1.2
@@ -16121,39 +17454,39 @@ __metadata:
     node-sarif-builder: ^2.0.3
     strip-ansi: 6.0
     text-table: ^0.2.0
-    tslib: ^2.5.0
-  checksum: fd8b0c96df54b1afa1e2c325edac6a95df0ce4c9a14e3cd46786d229259417eeec7795e7c7ccf4e896a343c5dbd06e62f8692214985acd786d19485bd512958d
+    tslib: ^2.8.1
+  checksum: 949d82f1a790136357a305a71cb96cfd77ad4bff044941e36eecb98b30601aec92b6020d1869f5eca54e03c0c7e6e5aeb74346327489973332192629fbafdff7
   languageName: node
   linkType: hard
 
-"@stoplight/spectral-functions@npm:^1.5.1, @stoplight/spectral-functions@npm:^1.6.1, @stoplight/spectral-functions@npm:^1.7.2":
-  version: 1.9.0
-  resolution: "@stoplight/spectral-functions@npm:1.9.0"
+"@stoplight/spectral-functions@npm:^1.6.1, @stoplight/spectral-functions@npm:^1.7.2, @stoplight/spectral-functions@npm:^1.9.1":
+  version: 1.9.3
+  resolution: "@stoplight/spectral-functions@npm:1.9.3"
   dependencies:
     "@stoplight/better-ajv-errors": 1.0.3
     "@stoplight/json": ^3.17.1
-    "@stoplight/spectral-core": ^1.7.0
-    "@stoplight/spectral-formats": ^1.7.0
-    "@stoplight/spectral-runtime": ^1.1.0
+    "@stoplight/spectral-core": ^1.19.4
+    "@stoplight/spectral-formats": ^1.8.1
+    "@stoplight/spectral-runtime": ^1.1.2
     ajv: ^8.17.1
     ajv-draft-04: ~1.0.0
     ajv-errors: ~3.0.0
     ajv-formats: ~2.1.0
     lodash: ~4.17.21
-    tslib: ^2.3.0
-  checksum: 278dc6e84b3b4fdef73f6b2b2cc7071140ade604dbc938b3946203253f37c0977659a609dc148df6f73668ddcb84a809e279643a12fd3f4372e72e97973f0058
+    tslib: ^2.8.1
+  checksum: bdb1c95b12b4ebef4f429621dd9f1b30134b07c23086573ad1e937cfc7b15d60c52cb2810939e030a8f8edb59100d198a40ee1278b832869ca71b058a0e857b1
   languageName: node
   linkType: hard
 
 "@stoplight/spectral-parsers@npm:^1.0.0, @stoplight/spectral-parsers@npm:^1.0.2":
-  version: 1.0.4
-  resolution: "@stoplight/spectral-parsers@npm:1.0.4"
+  version: 1.0.5
+  resolution: "@stoplight/spectral-parsers@npm:1.0.5"
   dependencies:
     "@stoplight/json": ~3.21.0
     "@stoplight/types": ^14.1.1
     "@stoplight/yaml": ~4.3.0
-    tslib: ^2.3.1
-  checksum: ca88183661651d99b40da254316fec062c219253ea3054151b9379e7c492121cdeef49a2d1ac08cd89b2f89f7d16dbc4ecf9da6d7a7539979ac6418991fe804a
+    tslib: ^2.8.1
+  checksum: 633921b78c67201a32ee99c35ecaf4425f488b9ad65e13551b16a7042704846d3d12ee8b87aa39a2525527e78b55840d40bd6b6396c22b3a4aa2aa5ce05c565b
   languageName: node
   linkType: hard
 
@@ -16171,16 +17504,16 @@ __metadata:
   linkType: hard
 
 "@stoplight/spectral-rulesets@npm:^1.14.1, @stoplight/spectral-rulesets@npm:^1.18.0":
-  version: 1.20.2
-  resolution: "@stoplight/spectral-rulesets@npm:1.20.2"
+  version: 1.21.3
+  resolution: "@stoplight/spectral-rulesets@npm:1.21.3"
   dependencies:
-    "@asyncapi/specs": ^4.1.0
+    "@asyncapi/specs": ^6.8.0
     "@stoplight/better-ajv-errors": 1.0.3
     "@stoplight/json": ^3.17.0
-    "@stoplight/spectral-core": ^1.8.1
-    "@stoplight/spectral-formats": ^1.7.0
-    "@stoplight/spectral-functions": ^1.5.1
-    "@stoplight/spectral-runtime": ^1.1.1
+    "@stoplight/spectral-core": ^1.19.4
+    "@stoplight/spectral-formats": ^1.8.1
+    "@stoplight/spectral-functions": ^1.9.1
+    "@stoplight/spectral-runtime": ^1.1.2
     "@stoplight/types": ^13.6.0
     "@types/json-schema": ^7.0.7
     ajv: ^8.17.1
@@ -16188,33 +17521,23 @@ __metadata:
     json-schema-traverse: ^1.0.0
     leven: 3.1.0
     lodash: ~4.17.21
-    tslib: ^2.3.0
-  checksum: 53b8515864f7132cd727073886adbf61fcbe39543ddf6d975799c75d9ef13d91f3940d5585c81c72da3c94365fd735d8935e885a3ac388c67d03a943af37977f
+    tslib: ^2.8.1
+  checksum: 41aa70864efb46074b24f63101eeb472644dea703b9ac55640ca9e398e2e4f8e9de3c46fe502b9912c2629441113e51d80d9a171689b5122ff40bb13072dc43b
   languageName: node
   linkType: hard
 
-"@stoplight/spectral-runtime@npm:^1.0.0, @stoplight/spectral-runtime@npm:^1.1.0, @stoplight/spectral-runtime@npm:^1.1.1, @stoplight/spectral-runtime@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@stoplight/spectral-runtime@npm:1.1.2"
+"@stoplight/spectral-runtime@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "@stoplight/spectral-runtime@npm:1.1.3"
   dependencies:
-    "@stoplight/json": ^3.17.0
+    "@stoplight/json": ^3.20.1
     "@stoplight/path": ^1.3.2
-    "@stoplight/types": ^12.3.0
+    "@stoplight/types": ^13.6.0
     abort-controller: ^3.0.0
     lodash: ^4.17.21
     node-fetch: ^2.6.7
-    tslib: ^2.3.1
-  checksum: 35964a38f82384e6e0158988173a50ab7f473a2ed6e942073de023bd28fb696b5b913336a84d016b046346294be9cfa3a88c6a908c2622c0ceb36f16ca76e084
-  languageName: node
-  linkType: hard
-
-"@stoplight/types@npm:^12.3.0":
-  version: 12.5.0
-  resolution: "@stoplight/types@npm:12.5.0"
-  dependencies:
-    "@types/json-schema": ^7.0.4
-    utility-types: ^3.10.0
-  checksum: fe4a09df6e1c2f0cdb53f474b180cc7b8184e814e1ac4427d199642f10958335f597060530a908c0e5800ba2569d077afe124a51deaee466255ce942e1e03941
+    tslib: ^2.8.1
+  checksum: 33af5713fd98de76e8007c9969d41440ef2abbff34e92db9a4b00b37a58dc7e7d4f0a0612c45183fb1aa9cd1a42dfe5ebfa59abf3b784e22d5f4b54c9f9d3d4c
   languageName: node
   linkType: hard
 
@@ -16267,6 +17590,493 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/addon-actions@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-actions@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    "@types/uuid": ^9.0.1
+    dequal: ^2.0.2
+    polished: ^4.2.2
+    uuid: ^9.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 93a453321f14eddf7f58e4c235e6ebbee5a9b680453834cc5593ff59d7607d9e99c53d5fac9bf59f6072c3a6f64a5f53174078c9e6c9054b125dc4c25be43842
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-backgrounds@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-backgrounds@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    memoizerific: ^1.11.3
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: acedc2b2b74dafc6cd236ec815f568b33f9cbf2eb714209f3ef8594df9bff29b72cf3d3aba3e778cb0cd962acaa7352657de353914353fbbd235d0ff37acfbd2
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-controls@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-controls@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    dequal: ^2.0.2
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: bd0804d54d7dbcf4a557738240aaf07c4cc1f022141c85f13d62a0029d8d363b1a7435330f0ee161cc3519e597a0bcfe4f7c16285447cca4eda23148d6a1cb4c
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-docs@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-docs@npm:8.4.6"
+  dependencies:
+    "@mdx-js/react": ^3.0.0
+    "@storybook/blocks": 8.4.6
+    "@storybook/csf-plugin": 8.4.6
+    "@storybook/react-dom-shim": 8.4.6
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 767bdbc9c83ac10129ec5863ccf2b658ad1807e1a22def2f734d4edde1791291d66186eca30a31ce57cf1863601a03dde075441ef60a9b0e66080a16ca9ed481
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-essentials@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-essentials@npm:8.4.6"
+  dependencies:
+    "@storybook/addon-actions": 8.4.6
+    "@storybook/addon-backgrounds": 8.4.6
+    "@storybook/addon-controls": 8.4.6
+    "@storybook/addon-docs": 8.4.6
+    "@storybook/addon-highlight": 8.4.6
+    "@storybook/addon-measure": 8.4.6
+    "@storybook/addon-outline": 8.4.6
+    "@storybook/addon-toolbars": 8.4.6
+    "@storybook/addon-viewport": 8.4.6
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 72915e83a3cbae4c302d76721f1b3446455f7dbc49f76234e8b25f673cf69f448a1c3aeae121e800bec4aee35c55031ef1b430a0827e358c6dce4ee17375704a
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-highlight@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-highlight@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 6549a3e859f3ed20a7defe73fa91eda0753d6412210a1c0fdcbc51c48f55a963064743224b56285b4c9d7d42a8fc195cbd5c052ac992c34fbcec798de9368e98
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-interactions@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-interactions@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    "@storybook/instrumenter": 8.4.6
+    "@storybook/test": 8.4.6
+    polished: ^4.2.2
+    ts-dedent: ^2.2.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 7ab3e92943b4073c54546a4fb6e1760524f8af60b3acd18ddac57b164094984f3331b76b9b35ee5d05c820bcf34d6e254ad93346fbf352030641a7b599deff89
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-measure@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-measure@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    tiny-invariant: ^1.3.1
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 30a73659f2eafea2cfcd4727c6af159739e33d8de6e7aa9703311d4de1c752f512a0cdbea76079a6169f5bcbdd0519771284d18d050374e3e4721d12d780fe9b
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-outline@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-outline@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 82b864ecc476d1c8b2ff8ccb587868b7a81610f527706873fbe4846a31f865b5c8bc17c3f59991ba73b0c200ecd06b1a4d75c5903024f7763cd0a0d1efcba322
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-styling-webpack@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@storybook/addon-styling-webpack@npm:1.0.1"
+  dependencies:
+    "@storybook/node-logger": ^8.0.0-alpha.10
+  peerDependencies:
+    webpack: ^5.0.0
+  checksum: 3a507f9e944d1b23f97c201a59169c62e5d3fe7a750226a1fd13a2941d96a92543b87b1bcda3deb780831505fa75956b1ebd1838a7445495831c9a63f9b192b9
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-themes@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-themes@npm:8.4.6"
+  dependencies:
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 6f41a7c2de3158320e3af3ce134e1b4d0dd26ba34fd7545c02e87557348498fd815dfba4f350d5c98c078768e773d43bd1a84d06110e0d55dac7897e68d2d58f
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-toolbars@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-toolbars@npm:8.4.6"
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 7b5737c2d1eb62ab8ce3245b3791ab0000b745aab9094beca52a146af335c4caf9df9429d9f868184e3ff05ba8952a5f2d5bc82f7a863a67fec24f22abf90d4d
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-viewport@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/addon-viewport@npm:8.4.6"
+  dependencies:
+    memoizerific: ^1.11.3
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: ada45a76dc0311a7c8b8740ef6ca5f7f78201252d2157595a01c50f7de3773ebda4daf3a7ad0744687c8d6cbf730fc8c731b229029068ff6020eb09d9ed03e93
+  languageName: node
+  linkType: hard
+
+"@storybook/addon-webpack5-compiler-swc@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@storybook/addon-webpack5-compiler-swc@npm:1.0.5"
+  dependencies:
+    "@swc/core": ^1.7.3
+    swc-loader: ^0.2.3
+  checksum: ed3177427f528cb1842bc57c9bc32501140c9a5bdf14926959cba024d38e5d6a24bccb6c977666e3a0a58dc7890feb92c616ec1f43bed33e691cbb1c5a575bd0
+  languageName: node
+  linkType: hard
+
+"@storybook/blocks@npm:8.4.6, @storybook/blocks@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/blocks@npm:8.4.6"
+  dependencies:
+    "@storybook/csf": ^0.1.11
+    "@storybook/icons": ^1.2.12
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.4.6
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 355c242c2dbc0ae11816b1882673db4e2c2ffe354284a023717d29ef23a623f1b0ff945798018293c20092c7a2d89d302f8ac48e6156deb90f313a426a9d1c74
+  languageName: node
+  linkType: hard
+
+"@storybook/builder-webpack5@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/builder-webpack5@npm:8.4.6"
+  dependencies:
+    "@storybook/core-webpack": 8.4.6
+    "@types/node": ^22.0.0
+    "@types/semver": ^7.3.4
+    browser-assert: ^1.2.1
+    case-sensitive-paths-webpack-plugin: ^2.4.0
+    cjs-module-lexer: ^1.2.3
+    constants-browserify: ^1.0.0
+    css-loader: ^6.7.1
+    es-module-lexer: ^1.5.0
+    fork-ts-checker-webpack-plugin: ^8.0.0
+    html-webpack-plugin: ^5.5.0
+    magic-string: ^0.30.5
+    path-browserify: ^1.0.1
+    process: ^0.11.10
+    semver: ^7.3.7
+    style-loader: ^3.3.1
+    terser-webpack-plugin: ^5.3.1
+    ts-dedent: ^2.0.0
+    url: ^0.11.0
+    util: ^0.12.4
+    util-deprecate: ^1.0.2
+    webpack: 5
+    webpack-dev-middleware: ^6.1.2
+    webpack-hot-middleware: ^2.25.1
+    webpack-virtual-modules: ^0.6.0
+  peerDependencies:
+    storybook: ^8.4.6
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 8a45e5089ff5d644426fe5131718d53aefc2c4d638cfaa07cef7bfcec325cac000932d18e732df7899bb89f100e401c32b6a06f0787fd290153d949087daf2d4
+  languageName: node
+  linkType: hard
+
+"@storybook/components@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/components@npm:8.4.6"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 66b08f840017e279274a0be2d9cba9edaa50139d5d7cdd9f148ff815f693db0026531e3e15efc9706c9e32aeccb0a97717aca7b81a2119b79f5875a69f0b81a3
+  languageName: node
+  linkType: hard
+
+"@storybook/core-webpack@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/core-webpack@npm:8.4.6"
+  dependencies:
+    "@types/node": ^22.0.0
+    ts-dedent: ^2.0.0
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: d42870e9225d561618115631240728df16cc36e08a7a8e4b68701f28341a289cfb110b4333158e24ea975d18df30412d11808b5be407141db704dd932e59d531
+  languageName: node
+  linkType: hard
+
+"@storybook/core@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/core@npm:8.4.6"
+  dependencies:
+    "@storybook/csf": ^0.1.11
+    better-opn: ^3.0.2
+    browser-assert: ^1.2.1
+    esbuild: ^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0
+    esbuild-register: ^3.5.0
+    jsdoc-type-pratt-parser: ^4.0.0
+    process: ^0.11.10
+    recast: ^0.23.5
+    semver: ^7.6.2
+    util: ^0.12.5
+    ws: ^8.2.3
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
+  checksum: c9c4b5aa1f49ee8e3b51c2e179cbafd6826415e6a788a0b11a04bf0dedbbb56b81dd187719086cdeb695fa31c46709dc6184027e2938eb5fc9ab41c4ed2b15d7
+  languageName: node
+  linkType: hard
+
+"@storybook/csf-plugin@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/csf-plugin@npm:8.4.6"
+  dependencies:
+    unplugin: ^1.3.1
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: e09a2175bc3af950668a307626bcc68b51c88b8404e39f2a57942097ff638b5c997aafaaf694493dac611b11572863f8a9cb6246c0b117a07c0d650299fff620
+  languageName: node
+  linkType: hard
+
+"@storybook/csf@npm:^0.1.11":
+  version: 0.1.11
+  resolution: "@storybook/csf@npm:0.1.11"
+  dependencies:
+    type-fest: ^2.19.0
+  checksum: ba2a265f62ad82a2853b069f77e974efe31bed263a640ca1dd8e6d7e194022018a67ad4a2587ae928f33ae45aaf6ffedd5925ba3fcf3fe5b7996667a918e22eb
+  languageName: node
+  linkType: hard
+
+"@storybook/global@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@storybook/global@npm:5.0.0"
+  checksum: ede0ad35ec411fe31c61150dbd118fef344d1d0e72bf5d3502368e35cf68126f6b7ae4a0ab5e2ffe2f0baa3b4286f03ad069ba3e098e1725449ef08b7e154ba8
+  languageName: node
+  linkType: hard
+
+"@storybook/icons@npm:^1.2.12":
+  version: 1.2.12
+  resolution: "@storybook/icons@npm:1.2.12"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: a4c87cbfadfa1369680c4acc9d5ef90b9ff23e2ad603b6c0aba0dafe89780e5643c567160eb0544fe33f3b9f157adda2621ae45b4036ac001139a34926e00102
+  languageName: node
+  linkType: hard
+
+"@storybook/instrumenter@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/instrumenter@npm:8.4.6"
+  dependencies:
+    "@storybook/global": ^5.0.0
+    "@vitest/utils": ^2.1.1
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: faa8e6ec52a4e8ef0313601e477cc1a8097960774f5d98bc2e928539dc785eaf5c7e0659fe8013f0c18c09222de92fb68667e728219d73d3b39b3bafe3bb815c
+  languageName: node
+  linkType: hard
+
+"@storybook/manager-api@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/manager-api@npm:8.4.6"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: f6deb13cc36852681a54a0a7ec4fed17dab7ae496f07b667e5550950186fd5569b53a21ea0a1416997cda202d47710684bc2da251cb3ea495f59160199e52076
+  languageName: node
+  linkType: hard
+
+"@storybook/node-logger@npm:^8.0.0-alpha.10":
+  version: 8.4.5
+  resolution: "@storybook/node-logger@npm:8.4.5"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 5b7d49a799def4041d11d70c657bf91bff2d7cda7a6afbfe51d8da58f18c8167b636a99efc749246e1bf76eb29cf6b531ff0a671590e39e4d15fbe179e87287c
+  languageName: node
+  linkType: hard
+
+"@storybook/preset-react-webpack@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/preset-react-webpack@npm:8.4.6"
+  dependencies:
+    "@storybook/core-webpack": 8.4.6
+    "@storybook/react": 8.4.6
+    "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0
+    "@types/node": ^22.0.0
+    "@types/semver": ^7.3.4
+    find-up: ^5.0.0
+    magic-string: ^0.30.5
+    react-docgen: ^7.0.0
+    resolve: ^1.22.8
+    semver: ^7.3.7
+    tsconfig-paths: ^4.2.0
+    webpack: 5
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.4.6
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 90d2e9ce23354117442f8aec01ee4af819d94ec170befe25cf2477e11bdf480c2cbcb3736547f82b58f4261cc78fe47060d635eb1d5138ff317c4d684a00d534
+  languageName: node
+  linkType: hard
+
+"@storybook/preview-api@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/preview-api@npm:8.4.6"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 9771ea6d3e3a6d48ca926293d6521caeec370f7c51527400ec9d184c9b41c580567f00661a568d66eb5d34b9a7e8703e3c2cc9b1cf91be6acb324d134c7c9f02
+  languageName: node
+  linkType: hard
+
+"@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0":
+  version: 1.0.6--canary.9.0c3f3b7.0
+  resolution: "@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0"
+  dependencies:
+    debug: ^4.1.1
+    endent: ^2.0.1
+    find-cache-dir: ^3.3.1
+    flat-cache: ^3.0.4
+    micromatch: ^4.0.2
+    react-docgen-typescript: ^2.2.2
+    tslib: ^2.0.0
+  peerDependencies:
+    typescript: ">= 4.x"
+    webpack: ">= 4"
+  checksum: 38c59c1dd7f9cdf5533e5ffe1991034f563f8d33c59e3cd33fa86719c72f5fe922276fde50315dd24f23f225d1ad5f3a261ecf4c70e82522805d09782272faff
+  languageName: node
+  linkType: hard
+
+"@storybook/react-dom-shim@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/react-dom-shim@npm:8.4.6"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.4.6
+  checksum: d64daafa29ec8e1cfc29fbfd75ade6ae3287c69d28022cd1d7966bc2cbd75911237cf53db68e5c8c787452e69f36f7ba1aba2f981732684343d16b79cb3c5d07
+  languageName: node
+  linkType: hard
+
+"@storybook/react-webpack5@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/react-webpack5@npm:8.4.6"
+  dependencies:
+    "@storybook/builder-webpack5": 8.4.6
+    "@storybook/preset-react-webpack": 8.4.6
+    "@storybook/react": 8.4.6
+    "@types/node": ^22.0.0
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.4.6
+    typescript: ">= 4.2.x"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 2f030a55c57effc813e242349ce5317e5b425f422af1786d2b4eabc5d7175009223c14b43dced04e2ab9554cde5c886a5318fc4c68fcccdf2cdf5f5eaef24c62
+  languageName: node
+  linkType: hard
+
+"@storybook/react@npm:8.4.6, @storybook/react@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/react@npm:8.4.6"
+  dependencies:
+    "@storybook/components": 8.4.6
+    "@storybook/global": ^5.0.0
+    "@storybook/manager-api": 8.4.6
+    "@storybook/preview-api": 8.4.6
+    "@storybook/react-dom-shim": 8.4.6
+    "@storybook/theming": 8.4.6
+  peerDependencies:
+    "@storybook/test": 8.4.6
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+    storybook: ^8.4.6
+    typescript: ">= 4.2.x"
+  peerDependenciesMeta:
+    "@storybook/test":
+      optional: true
+    typescript:
+      optional: true
+  checksum: 43f9cf0d35a1a87c0295305f6eb43be135de86d70b16ba197e474ac854b53b3232c369f392f4023587ec83ce2e9055b0c93e42fd3851e1652f6c5614bafc4827
+  languageName: node
+  linkType: hard
+
+"@storybook/test@npm:8.4.6, @storybook/test@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/test@npm:8.4.6"
+  dependencies:
+    "@storybook/csf": ^0.1.11
+    "@storybook/global": ^5.0.0
+    "@storybook/instrumenter": 8.4.6
+    "@testing-library/dom": 10.4.0
+    "@testing-library/jest-dom": 6.5.0
+    "@testing-library/user-event": 14.5.2
+    "@vitest/expect": 2.0.5
+    "@vitest/spy": 2.0.5
+  peerDependencies:
+    storybook: ^8.4.6
+  checksum: 0d8f1c5cb2d15aa2a86e4beae596b8ce34a34ab09cb4470fcdb6cee7454f60f86166ad0c42a7b1889a29a144c11627a898cf3f838a1fde0c75818c59f7aa6b19
+  languageName: node
+  linkType: hard
+
+"@storybook/theming@npm:8.4.6":
+  version: 8.4.6
+  resolution: "@storybook/theming@npm:8.4.6"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 364c7c8d66f523d5dec020157ae5dd86ac976b988f1c61cff61ae141ed906d4c8693f2361eb3b1709409c62f246537e68a3ad6c8d7c7d5c39d7df5bd1c39a815
+  languageName: node
+  linkType: hard
+
 "@sucrase/webpack-loader@npm:^2.0.0":
   version: 2.0.0
   resolution: "@sucrase/webpack-loader@npm:2.0.0"
@@ -16451,57 +18261,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ast@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-ast@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-ast@npm:^1.0.0-alpha.10, @swagger-api/apidom-ast@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-ast@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-error": ^1.0.0-alpha.5
+    "@swagger-api/apidom-error": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
     unraw: ^3.0.0
-  checksum: c56354ed83a10f8f1770e93b7b284108440ec77dd7b79c63bccc6109ea8734a48b86c582676fb40e27995e231e821192eecf9893fea4c8c24568655e11f95ad6
+  checksum: c66835eb81f02bf2ec3a0c98888090857c4d13372711e0c5fdab2d8bef322f024cf73a0243fa2958baa32cc138259167b17af75d3b7b87d54aae61c6fda6a5b9
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-core@npm:>=1.0.0-alpha.5 <1.0.0-beta.0, @swagger-api/apidom-core@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-core@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-core@npm:>=1.0.0-alpha.9 <1.0.0-beta.0, @swagger-api/apidom-core@npm:^1.0.0-alpha.10, @swagger-api/apidom-core@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-core@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^1.0.0-alpha.5
-    "@swagger-api/apidom-error": ^1.0.0-alpha.5
+    "@swagger-api/apidom-ast": ^1.0.0-alpha.10
+    "@swagger-api/apidom-error": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     minim: ~0.23.8
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
     short-unique-id: ^5.0.2
     ts-mixer: ^6.0.3
-  checksum: 57e7fac92e6e0d636de2b964488491cfe6ebdafeed22b75a67e668477c0ab642364e2d1cd6ae7e9d4fc334b4f45b5e205ff9c0c9f09d20297ad200d2bc740c22
+  checksum: aa21d777be2871564946df5d5c9a07716a58e7fa864af8cc06c4a5cf4dba664c8aa949df1f2ba0a940dcec6fcc9c95307c2f19e212b5dcce5066cec4b401a627
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-error@npm:>=1.0.0-alpha.5 <1.0.0-beta.0, @swagger-api/apidom-error@npm:^1.0.0-alpha.1, @swagger-api/apidom-error@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-error@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-error@npm:>=1.0.0-alpha.9 <1.0.0-beta.0, @swagger-api/apidom-error@npm:^1.0.0-alpha.1, @swagger-api/apidom-error@npm:^1.0.0-alpha.10, @swagger-api/apidom-error@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-error@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-  checksum: c1a710786c0553a37aa7fbec5d233a86978a77fa91879cd7186139d939096d4ee15e8eb02ea8886e201d7c2a0602a699c0cb5ec8ef8f04da30841d5018edb489
+  checksum: 1a70b5186bc2dc7738ec91c6037676d358b5a134071758114b38f43286a431b83e0bea23f725b08633e66ce6a93d00bfb3221df69cbd197634851d99d6e5ab15
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-json-pointer@npm:>=1.0.0-alpha.5 <1.0.0-beta.0, @swagger-api/apidom-json-pointer@npm:^1.0.0-alpha.1, @swagger-api/apidom-json-pointer@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-json-pointer@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-json-pointer@npm:>=1.0.0-alpha.9 <1.0.0-beta.0, @swagger-api/apidom-json-pointer@npm:^1.0.0-alpha.1, @swagger-api/apidom-json-pointer@npm:^1.0.0-alpha.10":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-json-pointer@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^1.0.0-alpha.5
-    "@swagger-api/apidom-error": ^1.0.0-alpha.5
+    "@swagger-api/apidom-core": ^1.0.0-alpha.10
+    "@swagger-api/apidom-error": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
-  checksum: dc2a5215c9d7978a4b24f04fedcd9a95d0e043b6ef333e96aee0072071e4b2ed3ffcf1969bdfa07573916f968743f92124a315ab9cc75d26f0e8c9279b2ba9d9
+  checksum: 92e8b40921a739e257d84f8b1b1df4eb9954f16a4523350d5bf50611c12ecf9d2a75401c30a3bb91af9351a93002e7339042ea095a04a59097a53a1107944833
   languageName: node
   linkType: hard
 
@@ -16536,18 +18346,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-json-schema-draft-4@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-ns-json-schema-draft-4@npm:^1.0.0-alpha.10, @swagger-api/apidom-ns-json-schema-draft-4@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-ns-json-schema-draft-4@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^1.0.0-alpha.5
-    "@swagger-api/apidom-core": ^1.0.0-alpha.5
+    "@swagger-api/apidom-ast": ^1.0.0-alpha.10
+    "@swagger-api/apidom-core": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
     ts-mixer: ^6.0.4
-  checksum: f9bd2dfc9f17ffbcdd97502a2bfb2ae4da93382b09a93d145a463f73bb73f0d45d8333aa3cea5b5ec7f3cbc41764b70ff9d90b60e1ed1ff5c009573734e7a2f6
+  checksum: 162c3db6ded4ad458c4e8ec5e2c60fd5779096fd68929571396dabf6f1bf2d03c92d53ae45f62363360ea90448af90d224e32c67bc2288e86a60a0afba6f4c86
   languageName: node
   linkType: hard
 
@@ -16599,36 +18409,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-0@npm:^1.0.0-alpha.1, @swagger-api/apidom-ns-openapi-3-0@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-ns-openapi-3-0@npm:^1.0.0-alpha.1, @swagger-api/apidom-ns-openapi-3-0@npm:^1.0.0-alpha.10, @swagger-api/apidom-ns-openapi-3-0@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-ns-openapi-3-0@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^1.0.0-alpha.5
-    "@swagger-api/apidom-error": ^1.0.0-alpha.5
-    "@swagger-api/apidom-ns-json-schema-draft-4": ^1.0.0-alpha.5
+    "@swagger-api/apidom-core": ^1.0.0-alpha.10
+    "@swagger-api/apidom-error": ^1.0.0-alpha.10
+    "@swagger-api/apidom-ns-json-schema-draft-4": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
     ts-mixer: ^6.0.3
-  checksum: adcb1aa410800d6205460ce421cf8d70f171886a8812a04062a0d6af28a434394e0a1f5d10a02a89677f59a2323c7843ee34cbf022b9979c1d3ca07685b87916
+  checksum: cd4928005a9f2892c9af08d3900e6842c5980bc497ebe37c1276f479d5339ae5dcbfa64e43dc3ea8075291bae7c5d5e9a935a788ac41d90d08fc04356bdb4cb5
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-ns-openapi-3-1@npm:>=1.0.0-alpha.5 <1.0.0-beta.0, @swagger-api/apidom-ns-openapi-3-1@npm:^1.0.0-alpha.1, @swagger-api/apidom-ns-openapi-3-1@npm:^1.0.0-alpha.5":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-ns-openapi-3-1@npm:>=1.0.0-alpha.9 <1.0.0-beta.0, @swagger-api/apidom-ns-openapi-3-1@npm:^1.0.0-alpha.1, @swagger-api/apidom-ns-openapi-3-1@npm:^1.0.0-alpha.5":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-ns-openapi-3-1@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-ast": ^1.0.0-alpha.5
-    "@swagger-api/apidom-core": ^1.0.0-alpha.5
-    "@swagger-api/apidom-json-pointer": ^1.0.0-alpha.5
-    "@swagger-api/apidom-ns-openapi-3-0": ^1.0.0-alpha.5
+    "@swagger-api/apidom-ast": ^1.0.0-alpha.10
+    "@swagger-api/apidom-core": ^1.0.0-alpha.10
+    "@swagger-api/apidom-json-pointer": ^1.0.0-alpha.10
+    "@swagger-api/apidom-ns-openapi-3-0": ^1.0.0-alpha.10
     "@types/ramda": ~0.30.0
     ramda: ~0.30.0
     ramda-adjunct: ^5.0.0
     ts-mixer: ^6.0.3
-  checksum: 34dff7a4c8cd9fa78ec1efc927bfd1a5ca6f796e786359c7b0899d98ba4efaaa28b9c6f1a4abfcb708cd36a560fa12429c86c55aaa8594d94cb712bfc83cca74
+  checksum: e7587720a2aff8b887897591fe77bbecbfa6e67d4f1d1f29f96c74ccc8ef5793d74f3f517c38d5d9cbbf6e5ee855c1a0e97edebe41a54ac47d590a63e43ef196
   languageName: node
   linkType: hard
 
@@ -16865,12 +18675,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swagger-api/apidom-reference@npm:>=1.0.0-alpha.5 <1.0.0-beta.0":
-  version: 1.0.0-alpha.5
-  resolution: "@swagger-api/apidom-reference@npm:1.0.0-alpha.5"
+"@swagger-api/apidom-reference@npm:>=1.0.0-alpha.9 <1.0.0-beta.0":
+  version: 1.0.0-alpha.10
+  resolution: "@swagger-api/apidom-reference@npm:1.0.0-alpha.10"
   dependencies:
     "@babel/runtime-corejs3": ^7.20.7
-    "@swagger-api/apidom-core": ^1.0.0-alpha.5
+    "@swagger-api/apidom-core": ^1.0.0-alpha.10
     "@swagger-api/apidom-error": ^1.0.0-alpha.1
     "@swagger-api/apidom-json-pointer": ^1.0.0-alpha.1
     "@swagger-api/apidom-ns-asyncapi-2": ^1.0.0-alpha.1
@@ -16893,7 +18703,7 @@ __metadata:
     "@swagger-api/apidom-parser-adapter-workflows-yaml-1": ^1.0.0-alpha.1
     "@swagger-api/apidom-parser-adapter-yaml-1-2": ^1.0.0-alpha.1
     "@types/ramda": ~0.30.0
-    axios: ^1.4.0
+    axios: ^1.7.4
     minimatch: ^7.4.3
     process: ^0.11.10
     ramda: ~0.30.0
@@ -16941,96 +18751,96 @@ __metadata:
       optional: true
     "@swagger-api/apidom-parser-adapter-yaml-1-2":
       optional: true
-  checksum: abf5636636197780bad9a5f4b3397a03152fdf55d47d61d1b694ffc119f105606e06ffb757519fc459a7d9e00c2862b2e0844f1f64c713f290c3b8ff3470faf4
+  checksum: d30ea82a49489c011b7c741beef40bf6e9c4cc3e64a08c7bfbd80fde0572597b0be694cd7f40bde1abe2bd19c9ac5aa862692295347e65f2bfb93a8aae3fd66b
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-darwin-arm64@npm:1.7.36"
+"@swc/core-darwin-arm64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-darwin-arm64@npm:1.9.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-darwin-x64@npm:1.7.36"
+"@swc/core-darwin-x64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-darwin-x64@npm:1.9.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.36"
+"@swc/core-linux-arm-gnueabihf@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.9.3"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.36"
+"@swc/core-linux-arm64-gnu@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.9.3"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.36"
+"@swc/core-linux-arm64-musl@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-arm64-musl@npm:1.9.3"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.36"
+"@swc/core-linux-x64-gnu@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-x64-gnu@npm:1.9.3"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.36"
+"@swc/core-linux-x64-musl@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-linux-x64-musl@npm:1.9.3"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.36"
+"@swc/core-win32-arm64-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.36"
+"@swc/core-win32-ia32-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.36":
-  version: 1.7.36
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.36"
+"@swc/core-win32-x64-msvc@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@swc/core-win32-x64-msvc@npm:1.9.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.3.46":
-  version: 1.7.36
-  resolution: "@swc/core@npm:1.7.36"
+"@swc/core@npm:^1.3.46, @swc/core@npm:^1.7.3":
+  version: 1.9.3
+  resolution: "@swc/core@npm:1.9.3"
   dependencies:
-    "@swc/core-darwin-arm64": 1.7.36
-    "@swc/core-darwin-x64": 1.7.36
-    "@swc/core-linux-arm-gnueabihf": 1.7.36
-    "@swc/core-linux-arm64-gnu": 1.7.36
-    "@swc/core-linux-arm64-musl": 1.7.36
-    "@swc/core-linux-x64-gnu": 1.7.36
-    "@swc/core-linux-x64-musl": 1.7.36
-    "@swc/core-win32-arm64-msvc": 1.7.36
-    "@swc/core-win32-ia32-msvc": 1.7.36
-    "@swc/core-win32-x64-msvc": 1.7.36
+    "@swc/core-darwin-arm64": 1.9.3
+    "@swc/core-darwin-x64": 1.9.3
+    "@swc/core-linux-arm-gnueabihf": 1.9.3
+    "@swc/core-linux-arm64-gnu": 1.9.3
+    "@swc/core-linux-arm64-musl": 1.9.3
+    "@swc/core-linux-x64-gnu": 1.9.3
+    "@swc/core-linux-x64-musl": 1.9.3
+    "@swc/core-win32-arm64-msvc": 1.9.3
+    "@swc/core-win32-ia32-msvc": 1.9.3
+    "@swc/core-win32-x64-msvc": 1.9.3
     "@swc/counter": ^0.1.3
-    "@swc/types": ^0.1.13
+    "@swc/types": ^0.1.17
   peerDependencies:
     "@swc/helpers": "*"
   dependenciesMeta:
@@ -17057,7 +18867,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 848531930b7d179b2bb9ba38e0d39dd127d66b16cc5c9ee9ec318fd50156ada18bc1368f2d02e0ba745b8f43eec0f695eaf89b6a9f8e52a239c5ab3e4b07ee27
+  checksum: 4d83aee0b4d9c543f247d680796e5b9cb69997369dcd81642c2603e185312dfb1674328a7ceb1d352c21275155a71789f76dafe8853055d076b6241d5760bbed
   languageName: node
   linkType: hard
 
@@ -17069,33 +18879,33 @@ __metadata:
   linkType: hard
 
 "@swc/helpers@npm:^0.5.0, @swc/helpers@npm:^0.5.8":
-  version: 0.5.13
-  resolution: "@swc/helpers@npm:0.5.13"
+  version: 0.5.15
+  resolution: "@swc/helpers@npm:0.5.15"
   dependencies:
-    tslib: ^2.4.0
-  checksum: d50c2c10da6ef940af423c6b03ad9c3c94cf9de59314b1e921a7d1bcc081a6074481c9d67b655fc8fe66a73288f98b25950743792a63882bfb5793b362494fc0
+    tslib: ^2.8.0
+  checksum: 1a9e0dbb792b2d1e0c914d69c201dbc96af3a0e6e6e8cf5a7f7d6a5d7b0e8b762915cd4447acb6b040e2ecc1ed49822875a7239f99a2d63c96c3c3407fb6fccf
   languageName: node
   linkType: hard
 
 "@swc/jest@npm:^0.2.22":
-  version: 0.2.36
-  resolution: "@swc/jest@npm:0.2.36"
+  version: 0.2.37
+  resolution: "@swc/jest@npm:0.2.37"
   dependencies:
     "@jest/create-cache-key-function": ^29.7.0
     "@swc/counter": ^0.1.3
     jsonc-parser: ^3.2.0
   peerDependencies:
     "@swc/core": "*"
-  checksum: 14f2e696ac093e23dae1e2e57d894bbcde4de6fe80341a26c8d0d8cbae5aae31832f8fa32dc698529f128d19a76aeedf2227f59480de6dab5eb3f30bfdf9b71a
+  checksum: 8d9a16404068c7f7d0548bc62f9d1465592178affbc7fe105dd59d463975d82cdcab2e0582c2a542250e6d240c76828bdbc404c77c85dd4d81061eb720351c4a
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.13":
-  version: 0.1.13
-  resolution: "@swc/types@npm:0.1.13"
+"@swc/types@npm:^0.1.17":
+  version: 0.1.17
+  resolution: "@swc/types@npm:0.1.17"
   dependencies:
     "@swc/counter": ^0.1.3
-  checksum: 4d9ef0fba20e410bee38b20b60eeb284a1284c1cf6b5f84754b6f5e467e5e0621e2db67dc31e22c524a8d63f36d0a1d530126cd97752a85f140d91bf53553e01
+  checksum: 6cc87b8ddfb540096abdf40bc29742df0b7d068f97c1ce6c32cd1b7073cde263ed7bc3bae1fba7bf0e1a0f5d63336e9fa092e05a54f6d9b3570df956d2acaff6
   languageName: node
   linkType: hard
 
@@ -17130,7 +18940,7 @@ __metadata:
     "@types/commander": ^2.12.2
     "@types/fs-extra": ^11.0.0
     "@types/http-proxy": ^1.17.4
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     "@types/serve-handler": ^6.1.0
     "@types/webpack-env": ^1.15.3
     commander: ^12.0.0
@@ -17148,7 +18958,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@testing-library/dom@npm:^10.0.0":
+"@testing-library/dom@npm:10.4.0, @testing-library/dom@npm:^10.0.0":
   version: 10.4.0
   resolution: "@testing-library/dom@npm:10.4.0"
   dependencies:
@@ -17164,9 +18974,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.6.2
-  resolution: "@testing-library/jest-dom@npm:6.6.2"
+"@testing-library/jest-dom@npm:6.5.0":
+  version: 6.5.0
+  resolution: "@testing-library/jest-dom@npm:6.5.0"
   dependencies:
     "@adobe/css-tools": ^4.4.0
     aria-query: ^5.0.0
@@ -17175,7 +18985,22 @@ __metadata:
     dom-accessibility-api: ^0.6.3
     lodash: ^4.17.21
     redent: ^3.0.0
-  checksum: 23fc4de90035b7acaa13839adb8e31e5f5ad0306623f59be4907fe48050a5d148cd927ff6b6c13c49e392cc06bdd9f16e7d4766263dd7b42d5a342897e32bb6f
+  checksum: c2d14103ebe3358852ec527ff7512f64207a39932b2f7b6dff7e73ba91296b01a71bad9a9584b6ee010681380a906c1740af50470adc6db660e1c7585d012ebf
+  languageName: node
+  linkType: hard
+
+"@testing-library/jest-dom@npm:^6.0.0":
+  version: 6.6.3
+  resolution: "@testing-library/jest-dom@npm:6.6.3"
+  dependencies:
+    "@adobe/css-tools": ^4.4.0
+    aria-query: ^5.0.0
+    chalk: ^3.0.0
+    css.escape: ^1.5.1
+    dom-accessibility-api: ^0.6.3
+    lodash: ^4.17.21
+    redent: ^3.0.0
+  checksum: c1dc4260b05309a0084416639006cd105849acc5b102bef682a3b19bd6fce07ff6762085fc7f2599546c995a2fc66fdb1d70e50e22a634a0098524056cc9e511
   languageName: node
   linkType: hard
 
@@ -17221,7 +19046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/user-event@npm:^14.0.0":
+"@testing-library/user-event@npm:14.5.2, @testing-library/user-event@npm:^14.0.0":
   version: 14.5.2
   resolution: "@testing-library/user-event@npm:14.5.2"
   peerDependencies:
@@ -17277,27 +19102,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ts-morph/common@npm:~0.23.0":
-  version: 0.23.0
-  resolution: "@ts-morph/common@npm:0.23.0"
+"@ts-morph/common@npm:~0.25.0":
+  version: 0.25.0
+  resolution: "@ts-morph/common@npm:0.25.0"
   dependencies:
-    fast-glob: ^3.3.2
-    minimatch: ^9.0.3
-    mkdirp: ^3.0.1
-    path-browserify: ^1.0.1
-  checksum: 96463742ec1114900901ded8aecc2c9664b20119454a56c896042e6a5e5b153af1d986467362d737ed0130506aeac9655731922dc8c4e851a16f9c1a8a8099b4
-  languageName: node
-  linkType: hard
-
-"@ts-morph/common@npm:~0.24.0":
-  version: 0.24.0
-  resolution: "@ts-morph/common@npm:0.24.0"
-  dependencies:
-    fast-glob: ^3.3.2
     minimatch: ^9.0.4
-    mkdirp: ^3.0.1
     path-browserify: ^1.0.1
-  checksum: 793bc8a47c93ab55c6c036f94480d3b0e948661aef4bb7dbc29279b1dda2fc4fce809a88e221537867a313541842e12d1ecbd32b4769688abe1303807ec09db6
+    tinyglobby: ^0.2.9
+  checksum: b8177f7969b058a8da6c79e28dc71c326acc4431e1138b04d2311be98cf46d9506053064eb3304f49970a58daf1f4ea0c0760c0d3b50636179424a5d71b9c74f
   languageName: node
   linkType: hard
 
@@ -17330,20 +19142,20 @@ __metadata:
   linkType: hard
 
 "@types/ansi-regex@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@types/ansi-regex@npm:5.0.0"
+  version: 5.0.4
+  resolution: "@types/ansi-regex@npm:5.0.4"
   dependencies:
     ansi-regex: "*"
-  checksum: c0aa7a15e18c12c06fa06d49a77884797555c6114de9fd899acb996934b84c7a036a60c980aa3f9fd10abaf85ab427590a9f5ee7a321d733a7b7d7d9be57d0b8
+  checksum: 0860a94fbed9c56d53c92e16bcd16d8452952cff369c879d4da1dfe330c07d6971fef8b2fda628be8ce5dd542726bd55960cfdc0221595882d0c0c21346effa2
   languageName: node
   linkType: hard
 
 "@types/archiver@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "@types/archiver@npm:6.0.2"
+  version: 6.0.3
+  resolution: "@types/archiver@npm:6.0.3"
   dependencies:
     "@types/readdir-glob": "*"
-  checksum: 4bef71e5b95863be9880339275ad92c2513dd78d56587653614dc5a74af1d078f5f5926ec996de06e7071a1003e0c2764d0e9d2bb0893a2ffb14ab1718eaf5ca
+  checksum: d0c5683cc68b52faf0c38e861319dcfdf5180cb235dc12d7c7ff6d6771f98d34f75dbd4bc9808b5a5999359412c5e13dadba6e714a0e50cfb3a9db4fefc4dce1
   languageName: node
   linkType: hard
 
@@ -17377,7 +19189,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.5":
+"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.5":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
@@ -17409,12 +19221,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
-  version: 7.0.15
-  resolution: "@types/babel__traverse@npm:7.0.15"
+"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6, @types/babel__traverse@npm:^7.18.0":
+  version: 7.20.6
+  resolution: "@types/babel__traverse@npm:7.20.6"
   dependencies:
-    "@babel/types": ^7.3.0
-  checksum: 6a45519ebf58e6b1197a0177211099fc3ed613d2a435cf9470c39217af35f29013f7984e1f8c2e160a93b588767cfbbcf0d7f77eae399dfcca18d5257f04cbc2
+    "@babel/types": ^7.20.7
+  checksum: 2bdc65eb62232c2d5c1086adeb0c31e7980e6fd7e50a3483b4a724a1a1029c84d9cb59749cf8de612f9afa2bc14c85b8f50e64e21f8a4398fa77eb9059a4283c
   languageName: node
   linkType: hard
 
@@ -17474,6 +19286,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/cacheable-request@npm:^8.3.6":
+  version: 8.3.6
+  resolution: "@types/cacheable-request@npm:8.3.6"
+  dependencies:
+    cacheable-request: "*"
+  checksum: e6046beb3d74a21484f365052a740d000695548dc6d01923350a087bb1530f6361a8a2948cd16ea2176f5f4a3b907fc84a8aa3fd5ad9ea13e62ced28dc65693f
+  languageName: node
+  linkType: hard
+
 "@types/caseless@npm:*":
   version: 0.12.2
   resolution: "@types/caseless@npm:0.12.2"
@@ -17482,11 +19303,11 @@ __metadata:
   linkType: hard
 
 "@types/classnames@npm:^2.2.9":
-  version: 2.3.1
-  resolution: "@types/classnames@npm:2.3.1"
+  version: 2.3.0
+  resolution: "@types/classnames@npm:2.3.0"
   dependencies:
     classnames: "*"
-  checksum: 09a17ea08fcb83380921efdfdac94cfa162f87025cae0bf6f4ba508c2fa5f436459ce7612905a3f968fdddb68c03b8e6ff08e762ed2d0c110c5c4fceb244dc55
+  checksum: e1bd6de60fc5e4ead601838078b10f378d6a66ad21112922856de59a1f450b1361f597aa3ca34f2cc33bc030f950112872fddfde43c5189bec89737a8b237f24
   languageName: node
   linkType: hard
 
@@ -17516,11 +19337,11 @@ __metadata:
   linkType: hard
 
 "@types/commander@npm:^2.12.2":
-  version: 2.12.2
-  resolution: "@types/commander@npm:2.12.2"
+  version: 2.12.5
+  resolution: "@types/commander@npm:2.12.5"
   dependencies:
     commander: "*"
-  checksum: 8cfc1797b3a6cbff7d723590480c36f5569dc1a9f2810770178ce10de1ed65655ae2ef954c9051fa176760dcf87b1e5330be65ef2e77e58c904be0e299b8b08e
+  checksum: 5b70bf09366f778f54cd0b831417aa1f749cdd9e95e81016d0537b801ad14275973b04c34ff4dfaa344986aa93b4518c2df12647ecf8b499b636585335ae3edc
   languageName: node
   linkType: hard
 
@@ -17561,12 +19382,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/content-type@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "@types/content-type@npm:1.1.8"
+  checksum: 2dd15e51925db7208b0d989c3a93d805a0e5e0942aa9edd70a1c3520896b772526d8280e344a674ae68a96a24aa8fce290843a07512460176f36a3020d99c792
+  languageName: node
+  linkType: hard
+
 "@types/cookie-parser@npm:^1.4.2":
-  version: 1.4.7
-  resolution: "@types/cookie-parser@npm:1.4.7"
-  dependencies:
+  version: 1.4.8
+  resolution: "@types/cookie-parser@npm:1.4.8"
+  peerDependencies:
     "@types/express": "*"
-  checksum: 7b87c59420598e686a57e240be6e0db53967c3c8814be9326bf86609ee2fc39c4b3b9f2263e1deba43526090121d1df88684b64c19f7b494a80a4437caf3d40b
+  checksum: b26ace5560adce1a746c059a75f18227ee3e3614a49c70dd29b8af204696079ced22eaa9d6cb084e3433ec433bff845cb47ffb890ae9af96a4aab2ff85e40da7
   languageName: node
   linkType: hard
 
@@ -17692,26 +19520,24 @@ __metadata:
   linkType: hard
 
 "@types/dockerode@npm:^3.3.0, @types/dockerode@npm:^3.3.29":
-  version: 3.3.31
-  resolution: "@types/dockerode@npm:3.3.31"
+  version: 3.3.32
+  resolution: "@types/dockerode@npm:3.3.32"
   dependencies:
     "@types/docker-modem": "*"
     "@types/node": "*"
     "@types/ssh2": "*"
-  checksum: f634f18dc0633f8324faefcde53bcd3d8f3c4bd74d31078cbeb65d2e1597f9abcf12c2158abfaea13dc816bae0f5fa08d0bb570d4214ab0df1ded90db5ebabfe
+  checksum: 17bfa92511cdc6ab51a67cb4678931b43670feffd737ba593c3ff90a6f71673aa04f8a81524690dddc08b483628d657a338a176171ff131de9e0efba4c3ecc11
   languageName: node
   linkType: hard
 
-"@types/dompurify@npm:^2.1.0":
-  version: 2.4.0
-  resolution: "@types/dompurify@npm:2.4.0"
-  dependencies:
-    "@types/trusted-types": "*"
-  checksum: b48cd81e997794ebc390c7c5bef1a67ec14a6f2f0521973e07e06af186c7583abe114d94d24868c0632b9573f5bd77131a4b76f3fffdf089ba99a4e53dd46c39
+"@types/doctrine@npm:^0.0.9":
+  version: 0.0.9
+  resolution: "@types/doctrine@npm:0.0.9"
+  checksum: 3909eaca42e7386b2ab866f082b78da3e00718d2fa323597e254feb0556c678b41f2c490729067433630083ac9c806ec6ae1e146754f7f8ba7d3e43ed68d6500
   languageName: node
   linkType: hard
 
-"@types/dompurify@npm:^3.0.0":
+"@types/dompurify@npm:^3.0.0, @types/dompurify@npm:^3.0.5":
   version: 3.0.5
   resolution: "@types/dompurify@npm:3.0.5"
   dependencies:
@@ -17743,7 +19569,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:^8.56.10":
+"@types/eslint-scope@npm:^3.7.7":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
+  dependencies:
+    "@types/eslint": "*"
+    "@types/estree": "*"
+  checksum: e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
+  languageName: node
+  linkType: hard
+
+"@types/eslint@npm:*, @types/eslint@npm:^8.56.10":
   version: 8.56.12
   resolution: "@types/eslint@npm:8.56.12"
   dependencies:
@@ -17753,7 +19589,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5, @types/estree@npm:^1.0.6":
   version: 1.0.6
   resolution: "@types/estree@npm:1.0.6"
   checksum: 8825d6e729e16445d9a1dd2fb1db2edc5ed400799064cd4d028150701031af012ba30d6d03fe9df40f4d7a437d0de6d2b256020152b7b09bde9f2e420afdffd9
@@ -17799,11 +19635,11 @@ __metadata:
   linkType: hard
 
 "@types/express-session@npm:^1.17.2":
-  version: 1.18.0
-  resolution: "@types/express-session@npm:1.18.0"
+  version: 1.18.1
+  resolution: "@types/express-session@npm:1.18.1"
   dependencies:
     "@types/express": "*"
-  checksum: f624bc956d223eda618dc3ee5908cfc91d5cf67252aa83e667c1260b96c2d2ac302407d57d2a57b29728a21bf521f09c6409da5e727509c01a2b50d7a012f0a1
+  checksum: 380ddcbbc6a64686deafd4e2831c636d11a3252f051ebb4c49649abfab5ddf69c2b31e4ff97a2961cb02ef8c616feaa7ecaa4ad7b7f028c25d88fbfa437fb455
   languageName: node
   linkType: hard
 
@@ -17904,10 +19740,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/http-cache-semantics@npm:*":
-  version: 4.0.0
-  resolution: "@types/http-cache-semantics@npm:4.0.0"
-  checksum: c820774eb1d9d8d0c13077834e870cc1afd2500dc9d0ac1b67abc050c7c115aee4024f90fda65b50babc258de0464fc4459709e4fa12552f65094328e5a551c6
+"@types/http-cache-semantics@npm:*, @types/http-cache-semantics@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "@types/http-cache-semantics@npm:4.0.4"
+  checksum: 7f4dd832e618bc1e271be49717d7b4066d77c2d4eed5b81198eb987e532bb3e1c7e02f45d77918185bad936f884b700c10cebe06305f50400f382ab75055f9e8
   languageName: node
   linkType: hard
 
@@ -17986,21 +19822,21 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*, @types/jest@npm:^29.5.11":
-  version: 29.5.13
-  resolution: "@types/jest@npm:29.5.13"
+  version: 29.5.14
+  resolution: "@types/jest@npm:29.5.14"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: 875ac23c2398cdcf22aa56c6ba24560f11d2afda226d4fa23936322dde6202f9fdbd2b91602af51c27ecba223d9fc3c1e33c9df7e47b3bf0e2aefc6baf13ce53
+  checksum: 18dba4623f26661641d757c63da2db45e9524c9be96a29ef713c703a9a53792df9ecee9f7365a0858ddbd6440d98fe6b65ca67895ca5884b73cbc7ffc11f3838
   languageName: node
   linkType: hard
 
 "@types/jquery@npm:^3.3.34":
-  version: 3.5.31
-  resolution: "@types/jquery@npm:3.5.31"
+  version: 3.5.32
+  resolution: "@types/jquery@npm:3.5.32"
   dependencies:
     "@types/sizzle": "*"
-  checksum: 14a682a6a00e5b0bfe7afbb359ea2ada51b6fdbd962f8ba2b6077989935bd41f395b920581538d218d3ac81e6e3929acb86db9ccb8aa55a67066da9ed55db775
+  checksum: 7fe7251bda3fc9d80417ef7c88ad963ccb591706bca2fb84ea5d9600498a8f9911c32302f28fd1910bb212c34193f38f63818757a9833b70e1f46c3a98a17625
   languageName: node
   linkType: hard
 
@@ -18122,9 +19958,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.151":
-  version: 4.17.12
-  resolution: "@types/lodash@npm:4.17.12"
-  checksum: 7b564e4114f09ce5ae31a2e9493592baf20bb498507f3705c5d91cf838c2298b4f6a06f2d6c8dc608fcac63e210a2b7b13388c7a5e220e15688f813521030127
+  version: 4.17.13
+  resolution: "@types/lodash@npm:4.17.13"
+  checksum: d0bf8fbd950be71946e0076b30fd40d492293baea75f05931b6b5b906fd62583708c6229abdb95b30205ad24ce1ed2f48bc9d419364f682320edd03405cc0c7e
   languageName: node
   linkType: hard
 
@@ -18172,6 +20008,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/mdx@npm:^2.0.0":
+  version: 2.0.13
+  resolution: "@types/mdx@npm:2.0.13"
+  checksum: 195137b548e75a85f0558bb1ca5088aff1c01ae0fc64454da06085b7513a043356d0bb51ed559d3cbc7ad724ccd8cef2a7d07d014b89a47a74dff8875ceb3b15
+  languageName: node
+  linkType: hard
+
 "@types/memcached@npm:^2.2.6":
   version: 2.2.10
   resolution: "@types/memcached@npm:2.2.10"
@@ -18181,6 +20024,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/memjs@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@types/memjs@npm:1.3.3"
+  dependencies:
+    "@types/node": "*"
+  checksum: 23efd3196a6318b251ebbcebef03f737aa609ff467430348dad540aec5db58e49b291b40df743f19f9182bfbe7f06fb6244aaecc28513b4f27728ed2117a1b21
+  languageName: node
+  linkType: hard
+
 "@types/mime-types@npm:^2.1.0":
   version: 2.1.4
   resolution: "@types/mime-types@npm:2.1.4"
@@ -18241,15 +20093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mute-stream@npm:^0.0.4":
-  version: 0.0.4
-  resolution: "@types/mute-stream@npm:0.0.4"
-  dependencies:
-    "@types/node": "*"
-  checksum: af8d83ad7b68ea05d9357985daf81b6c9b73af4feacb2f5c2693c7fd3e13e5135ef1bd083ce8d5bdc8e97acd28563b61bb32dec4e4508a8067fcd31b8a098632
-  languageName: node
-  linkType: hard
-
 "@types/mysql@npm:2.15.26":
   version: 2.15.26
   resolution: "@types/mysql@npm:2.15.26"
@@ -18269,13 +20112,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.5.12, @types/node-fetch@npm:^2.6.4":
-  version: 2.6.11
-  resolution: "@types/node-fetch@npm:2.6.11"
+"@types/node-fetch@npm:^2.6.4, @types/node-fetch@npm:^2.6.9":
+  version: 2.6.12
+  resolution: "@types/node-fetch@npm:2.6.12"
   dependencies:
     "@types/node": "*"
     form-data: ^4.0.0
-  checksum: 180e4d44c432839bdf8a25251ef8c47d51e37355ddd78c64695225de8bc5dc2b50b7bb855956d471c026bb84bd7295688a0960085e7158cbbba803053492568b
+  checksum: 9647e68f9a125a090220c38d77b3c8e669c488658ae7506f1b4f9568214beba087624b1705bba1dc76649a65281ce3fd5b400e15266cbef8088027fb88777557
   languageName: node
   linkType: hard
 
@@ -18288,12 +20131,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=13.7.0":
-  version: 22.7.7
-  resolution: "@types/node@npm:22.7.7"
+"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^22.0.0":
+  version: 22.10.1
+  resolution: "@types/node@npm:22.10.1"
   dependencies:
-    undici-types: ~6.19.2
-  checksum: 70492e46d92bf00b537c8700322ad001c1f8d4fc65fc1627064a91c7edebb8ad18730b95a3c6bdff212dd0252a337a4b92e4cfcbc21c9f08616302e87ea855b8
+    undici-types: ~6.20.0
+  checksum: 5a9b81500f288a8fb757b61bd939f99f72b6cb59347a5bae52dd1c2c87100ebbaa9da4256ef3cb9add2090e8704cda1d9a1ffc14ccd5db47a6466c8bae10ebcb
   languageName: node
   linkType: hard
 
@@ -18311,13 +20154,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^16.11.26":
-  version: 16.18.114
-  resolution: "@types/node@npm:16.18.114"
-  checksum: 2922009367d1c9c1a42ec11b66fc315629589455c7c5c7be5212fcdfe5c01655881ef7d1b862fe6fdad006a6b34e4fce0565a74db0d6a38f869b5d87601f6339
-  languageName: node
-  linkType: hard
-
 "@types/node@npm:^17.0.36":
   version: 17.0.45
   resolution: "@types/node@npm:17.0.45"
@@ -18325,30 +20161,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.11.18, @types/node@npm:^18.11.9, @types/node@npm:^18.17.15, @types/node@npm:^18.17.8":
-  version: 18.19.57
-  resolution: "@types/node@npm:18.19.57"
+"@types/node@npm:^18.11.18, @types/node@npm:^18.11.9, @types/node@npm:^18.17.15":
+  version: 18.19.67
+  resolution: "@types/node@npm:18.19.67"
   dependencies:
     undici-types: ~5.26.4
-  checksum: d7be072513df5f6b14384dc284561ddf4e6393ce85b8fd3cc9ab0c0a7abd03bfdab6519548dab7c743ec9dfca9ce686dde2db0fbbf1d357e0822b4f99a54b193
+  checksum: 700f92c6a0b63352ce6327286392adab30bb17623c2a788811e9cf092c4dc2fb5e36ca4727247a981b3f44185fdceef20950a3b7a8ab72721e514ac037022a08
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.1.1, @types/node@npm:^20.11.16":
-  version: 20.16.13
-  resolution: "@types/node@npm:20.16.13"
+"@types/node@npm:^20.1.1, @types/node@npm:^20.16.0":
+  version: 20.17.9
+  resolution: "@types/node@npm:20.17.9"
   dependencies:
     undici-types: ~6.19.2
-  checksum: 2e998ac5ae133b1a4261dc89d0034e63834d285bb2124901b9d805e7b98c0f809fc2586fd1bf7ad9a0f0348bb503fac6c41612a3ca272334b943070a3e82227c
+  checksum: 2fc67ba937d2c4e7a52f0ccf71b8b4c616dcfa1ad6cd5a726582fd3cbf4f409c2eb44595592580f782c2ade05f8130df072dd04ac064fe150cfcd7849e643500
   languageName: node
   linkType: hard
 
 "@types/nodemailer@npm:^6.4.14":
-  version: 6.4.16
-  resolution: "@types/nodemailer@npm:6.4.16"
+  version: 6.4.17
+  resolution: "@types/nodemailer@npm:6.4.17"
   dependencies:
     "@types/node": "*"
-  checksum: ef34226b7b69a474a9b9b4681bcfb2461540aed92c54995b934f8072e28deff72aadd4c71522f6825938346048cfec077c69f18cfc2a3ec9f7432db11e5667a3
+  checksum: 498b702575111494a42cf9cdd3d399f0308c3b3b0244e7f53008924327955a16b39ba0bf99a5ccf17af9fd2bc50a61a76ae7e8a75498a426ea2f828a05202eab
   languageName: node
   linkType: hard
 
@@ -18455,11 +20291,11 @@ __metadata:
   linkType: hard
 
 "@types/passport@npm:*, @types/passport@npm:^1.0.16, @types/passport@npm:^1.0.3":
-  version: 1.0.16
-  resolution: "@types/passport@npm:1.0.16"
+  version: 1.0.17
+  resolution: "@types/passport@npm:1.0.17"
   dependencies:
     "@types/express": "*"
-  checksum: e4a02fa338536eb82694ea548689a7214b1ca98df6a896080daa2b6a8859db02a1e6244eeefaf6f3cc9c268239bb4a7912049a9ed86192144a65c10e55219f80
+  checksum: b131d5963576e759f972f038bb7461dcaaa1dc484a488eb093eac6a9f8d4f51c9b7adcd432ae84e3ecb68839dfba16f6d569f36664330b6af59d36ff3c4c64e2
   languageName: node
   linkType: hard
 
@@ -18522,14 +20358,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prop-types@npm:*, @types/prop-types@npm:^15.0.0, @types/prop-types@npm:^15.7.12, @types/prop-types@npm:^15.7.3":
-  version: 15.7.13
-  resolution: "@types/prop-types@npm:15.7.13"
-  checksum: 8935cad87c683c665d09a055919d617fe951cb3b2d5c00544e3a913f861a2bd8d2145b51c9aa6d2457d19f3107ab40784c40205e757232f6a80cc8b1c815513c
+"@types/prop-types@npm:*, @types/prop-types@npm:^15.0.0, @types/prop-types@npm:^15.7.12, @types/prop-types@npm:^15.7.13, @types/prop-types@npm:^15.7.3":
+  version: 15.7.14
+  resolution: "@types/prop-types@npm:15.7.14"
+  checksum: d0c5407b9ccc3dd5fae0ccf9b1007e7622ba5e6f1c18399b4f24dff33619d469da4b9fa918a374f19dc0d9fe6a013362aab0b844b606cfc10676efba3f5f736d
   languageName: node
   linkType: hard
 
-"@types/protocol-buffers-schema@npm:^3.4.1":
+"@types/protocol-buffers-schema@npm:^3.4.3":
   version: 3.4.3
   resolution: "@types/protocol-buffers-schema@npm:3.4.3"
   dependencies:
@@ -18539,9 +20375,9 @@ __metadata:
   linkType: hard
 
 "@types/qs@npm:*, @types/qs@npm:^6.9.11, @types/qs@npm:^6.9.6":
-  version: 6.9.16
-  resolution: "@types/qs@npm:6.9.16"
-  checksum: 2e8918150c12735630f7ee16b770c72949274938c30306025f68aaf977227f41fe0c698ed93db1099e04916d582ac5a1faf7e3c7061c8d885d9169f59a184b6c
+  version: 6.9.17
+  resolution: "@types/qs@npm:6.9.17"
+  checksum: fc3beda0be70e820ddabaa361e8dfec5e09b482b8f6cf1515615479a027dd06cd5ba0ffbd612b654c2605523f45f484c8905a475623d6cd0c4cadcf5d0c517f5
   languageName: node
   linkType: hard
 
@@ -18562,11 +20398,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18":
-  version: 18.3.1
-  resolution: "@types/react-dom@npm:18.3.1"
-  dependencies:
-    "@types/react": "*"
-  checksum: ad28ecce3915d30dc76adc2a1373fda1745ba429cea290e16c6628df9a05fd80b6403c8e87d78b45e6c60e51df7a67add389ab62b90070fbfdc9bda8307d9953
+  version: 18.3.3
+  resolution: "@types/react-dom@npm:18.3.3"
+  peerDependencies:
+    "@types/react": ^18.0.0
+  checksum: d9d78c5541a223d696ead4ae5fd7e20334723b2c0ee9f7455f96c9fdb95aeb876dd5b29519fa2c6686e5000624290c5d0dbd2f1005e478172e07a42343857e8d
   languageName: node
   linkType: hard
 
@@ -18664,12 +20500,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^18":
-  version: 18.3.11
-  resolution: "@types/react@npm:18.3.11"
+  version: 18.3.14
+  resolution: "@types/react@npm:18.3.14"
   dependencies:
     "@types/prop-types": "*"
     csstype: ^3.0.2
-  checksum: 6cbf36673b64e758dd61b16c24139d015f58530e0d476777de26ba83f24b55e142fbf64e3b8f6b3c7b05ed9ba548551b2a62d9ffb0f95743d0a368646a619163
+  checksum: 40e2112301d784106bdc713e3eb925c8c710e676a3a31ef65c76ca7df8529cdde3dda2db6e0f6f1878253a79bc6cf87a461aa114bd8364f453bdd2be52c175e5
   languageName: node
   linkType: hard
 
@@ -18710,6 +20546,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/resolve@npm:^1.20.2":
+  version: 1.20.6
+  resolution: "@types/resolve@npm:1.20.6"
+  checksum: dc35f5517606b6687cd971c0281ac58bdee2c50c051b030f04647d3991688be2259c304ee97e5b5d4b9936072c36767eb5933b54611a407d6557972bb6fea4f6
+  languageName: node
+  linkType: hard
+
 "@types/responselike@npm:*, @types/responselike@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/responselike@npm:1.0.0"
@@ -18758,7 +20601,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:7.5.8, @types/semver@npm:^7.1.0, @types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
+"@types/semver@npm:7.5.8, @types/semver@npm:^7.1.0, @types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
   checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
@@ -18901,6 +20744,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/stream-buffers@npm:^3.0.3":
+  version: 3.0.7
+  resolution: "@types/stream-buffers@npm:3.0.7"
+  dependencies:
+    "@types/node": "*"
+  checksum: b5cf12f69ba866035207e2313bd795166c30ca18329b8c07a96ec5e30d702a0c23b12fa789c7ebc3a08091ea01eca8db84203c93b6823e7477df016a49540f84
+  languageName: node
+  linkType: hard
+
 "@types/styled-jsx@npm:^2.2.8":
   version: 2.2.8
   resolution: "@types/styled-jsx@npm:2.2.8"
@@ -19042,7 +20894,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9.0.0":
+"@types/uuid@npm:^9.0.1":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
   checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
@@ -19088,19 +20940,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/wrap-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/wrap-ansi@npm:3.0.0"
-  checksum: 492f0610093b5802f45ca292777679bb9b381f1f32ae939956dd9e00bf81dba7cc99979687620a2817d9a7d8b59928207698166c47a0861c6a2e5c30d4aaf1e9
-  languageName: node
-  linkType: hard
-
-"@types/ws@npm:*, @types/ws@npm:^8.0.0, @types/ws@npm:^8.5.10, @types/ws@npm:^8.5.3":
-  version: 8.5.12
-  resolution: "@types/ws@npm:8.5.12"
+"@types/ws@npm:*, @types/ws@npm:^8.0.0, @types/ws@npm:^8.5.10, @types/ws@npm:^8.5.3, @types/ws@npm:^8.5.4":
+  version: 8.5.13
+  resolution: "@types/ws@npm:8.5.13"
   dependencies:
     "@types/node": "*"
-  checksum: ddefb6ad1671f70ce73b38a5f47f471d4d493864fca7c51f002a86e5993d031294201c5dced6d5018fb8905ad46888d65c7f20dd54fc165910b69f42fba9a6d0
+  checksum: f17023ce7b89c6124249c90211803a4aaa02886e12bc2d0d2cd47fa665eeb058db4d871ce4397d8e423f6beea97dd56835dd3fdbb921030fe4d887601e37d609
   languageName: node
   linkType: hard
 
@@ -19240,13 +21085,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.5.0"
+"@typescript-eslint/scope-manager@npm:8.16.0":
+  version: 8.16.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.16.0"
   dependencies:
-    "@typescript-eslint/types": 8.5.0
-    "@typescript-eslint/visitor-keys": 8.5.0
-  checksum: ee210599652cd21df39467c2b0eeecf97fceb13cf3402e2c11eb47ee4fe1ec9caacba7dedc0917a62febd607bd3517c6ff3a179074c7d2ac4db412d3ea7f392c
+    "@typescript-eslint/types": 8.16.0
+    "@typescript-eslint/visitor-keys": 8.16.0
+  checksum: 12427e2a95a8b0cb49259be1a8a9a23f734fd0dbabbc5cebf1ba56b48812e2ca7ba32b71ededf24efa1a9da07a13b20ced004e2eea6f4b8c07003438f664ce30
   languageName: node
   linkType: hard
 
@@ -19281,10 +21126,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/types@npm:8.5.0"
-  checksum: 74a7ec57f867f02e1c957763a0db3f0f29d41293abb0fc1e067f4de404c0c4e07d7126fff7a10a4e1ccb9ebd45351dd7709dad42367a9defaa9a411ed1b8e29d
+"@typescript-eslint/types@npm:8.16.0":
+  version: 8.16.0
+  resolution: "@typescript-eslint/types@npm:8.16.0"
+  checksum: 1ed10343dc65c7fd493cfe789639f547f4c730e6e04472007fa92a00ff1fb77b31fc8016a350a10e553d38b12485f78c331d91c071dc08f69476076f5bbef5cd
   languageName: node
   linkType: hard
 
@@ -19325,12 +21170,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.5.0"
+"@typescript-eslint/typescript-estree@npm:8.16.0":
+  version: 8.16.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.16.0"
   dependencies:
-    "@typescript-eslint/types": 8.5.0
-    "@typescript-eslint/visitor-keys": 8.5.0
+    "@typescript-eslint/types": 8.16.0
+    "@typescript-eslint/visitor-keys": 8.16.0
     debug: ^4.3.4
     fast-glob: ^3.3.2
     is-glob: ^4.0.3
@@ -19340,7 +21185,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: e8a4d2fc560ab9084c4cafa7933ce17ca9906c88610282507a54c509dea4c03c00182880e34396cfb3b643264d032620dfe14ceba7cc03022ad0fd4213c5548d
+  checksum: 047ae08a7774e4be4307409970d7b8b27d46d10e302ed236199b1b7648242d2aa10b7d1dbeae1fed0f55f683c863f9d399e50108c215e35370fb6a3851bda427
   languageName: node
   linkType: hard
 
@@ -19379,17 +21224,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/utils@npm:8.5.0"
+"@typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0, @typescript-eslint/utils@npm:^8.8.1":
+  version: 8.16.0
+  resolution: "@typescript-eslint/utils@npm:8.16.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.4.0
-    "@typescript-eslint/scope-manager": 8.5.0
-    "@typescript-eslint/types": 8.5.0
-    "@typescript-eslint/typescript-estree": 8.5.0
+    "@typescript-eslint/scope-manager": 8.16.0
+    "@typescript-eslint/types": 8.16.0
+    "@typescript-eslint/typescript-estree": 8.16.0
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-  checksum: d91d4f29aa3275e35734dbf84dfdb2e0e5557c2ed4181e760b3d9319379f19295a79d223b06f5f3583e4de80938dfe47814a11b7fd66a737b5ca6bbe6a555632
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 5e3c4b4d453bee6c38715f851d517ad3bbdb9335de5c2ef487e350eea97ae8b2e996046a1d8f3a93109e06a569d1e161b4ef8d33c530766931e4dbc43cb26ed7
   languageName: node
   linkType: hard
 
@@ -19413,19 +21261,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.5.0"
+"@typescript-eslint/visitor-keys@npm:8.16.0":
+  version: 8.16.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.16.0"
   dependencies:
-    "@typescript-eslint/types": 8.5.0
-    eslint-visitor-keys: ^3.4.3
-  checksum: dbba7071e9723d0e525d8b350834d95699037e9e7ba9cf2b3b4fb6cf3fd47072869874f665daca54bc084c910a4ae0acfd5670625a4cc62a173662b09f92e79e
+    "@typescript-eslint/types": 8.16.0
+    eslint-visitor-keys: ^4.2.0
+  checksum: e7444d3d57b4fcdebfa0d7effcdff9c928d77b6a6765da6980f0dbeb6438af707bd4c2c21e24e7ae1638f9c4a5697168f94027fff94ad663da57fa5f44f0983d
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.23.5":
-  version: 4.23.5
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.23.5"
+"@uiw/codemirror-extensions-basic-setup@npm:4.23.6":
+  version: 4.23.6
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.23.6"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -19442,19 +21290,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: 485fa922219c28dd31be529d8ef3a741659bc6cf3a5ab28d123dc5a8257d7c027c349c95e990a0cac0691aa1bcb8b3a3d56c5da8834984c7279fec2b41e16245
+  checksum: dc5a845d80c0659883f5299150034145d9b0d1879a926d5f6a9c21d839351715ea9b5dba0272cfb869e9139d40d49e86c5df12e504874cebc8cf6e9824ec4b98
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.23.5
-  resolution: "@uiw/react-codemirror@npm:4.23.5"
+  version: 4.23.6
+  resolution: "@uiw/react-codemirror@npm:4.23.6"
   dependencies:
     "@babel/runtime": ^7.18.6
     "@codemirror/commands": ^6.1.0
     "@codemirror/state": ^6.1.1
     "@codemirror/theme-one-dark": ^6.0.0
-    "@uiw/codemirror-extensions-basic-setup": 4.23.5
+    "@uiw/codemirror-extensions-basic-setup": 4.23.6
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -19464,7 +21312,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 0e93d4bf1da9cfd6ccec7f76c418aed58755301a2508b905877fe5ef9f12f8c647791c48f657cbac5325b985804b92cb3dffd904a76336a969861f72dae19927
+  checksum: 83ff09c6e5df919b3fef181798b138803a987efab4bebdaad09daae1701167cb4a734fa0b18adcc043d5a2fbd3a997bbda461d1a60972bfccdbbca21803e33fe
   languageName: node
   linkType: hard
 
@@ -19688,18 +21536,120 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-react@npm:^4.3.1":
-  version: 4.3.2
-  resolution: "@vitejs/plugin-react@npm:4.3.2"
+"@vanilla-extract/babel-plugin-debug-ids@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@vanilla-extract/babel-plugin-debug-ids@npm:1.1.0"
   dependencies:
-    "@babel/core": ^7.25.2
-    "@babel/plugin-transform-react-jsx-self": ^7.24.7
-    "@babel/plugin-transform-react-jsx-source": ^7.24.7
+    "@babel/core": ^7.23.9
+  checksum: b2feec9016ba2dd6740c2ce002d814123f38bf8fc01a6d771eff74ed8108abefdc9d6507e2045587d2a73d8a538ece867e4bfef8c5ccc2b13095a2c825160e7a
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/css@npm:^1.16.1":
+  version: 1.16.1
+  resolution: "@vanilla-extract/css@npm:1.16.1"
+  dependencies:
+    "@emotion/hash": ^0.9.0
+    "@vanilla-extract/private": ^1.0.6
+    css-what: ^6.1.0
+    cssesc: ^3.0.0
+    csstype: ^3.0.7
+    dedent: ^1.5.3
+    deep-object-diff: ^1.1.9
+    deepmerge: ^4.2.2
+    lru-cache: ^10.4.3
+    media-query-parser: ^2.0.2
+    modern-ahocorasick: ^1.0.0
+    picocolors: ^1.0.0
+  checksum: ff58f32778cbc15458aff951ad771ba46f772d78633ff99f849f590b83a22ce67e017af28351c68c32edcdaae4454146dd90f369842a627ee79dc9c3ab434e1e
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/integration@npm:^7.1.11":
+  version: 7.1.11
+  resolution: "@vanilla-extract/integration@npm:7.1.11"
+  dependencies:
+    "@babel/core": ^7.23.9
+    "@babel/plugin-syntax-typescript": ^7.23.3
+    "@vanilla-extract/babel-plugin-debug-ids": ^1.1.0
+    "@vanilla-extract/css": ^1.16.1
+    dedent: ^1.5.3
+    esbuild: "npm:esbuild@>=0.17.6 <0.24.0"
+    eval: 0.1.8
+    find-up: ^5.0.0
+    javascript-stringify: ^2.0.1
+    mlly: ^1.4.2
+    vite: ^5.0.11
+    vite-node: ^1.2.0
+  checksum: 23196f388045c0cdaa35bf26cf484ca4423e336026770b743017056aed7704c74c2134b425571eee9c6859ed1a1553a435e4d0c502ff5a78f8dc2c02db00707a
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/private@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@vanilla-extract/private@npm:1.0.6"
+  checksum: 2265b02af29d8cd40f6ddeeed197fb2df1a7695f5a9821d5e3597677179be8b83bcd8fe4df4a6178544f89123d745a3c6a13599d4fe4e5873b065a8ad329f690
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/rollup-plugin@npm:^1.3.10":
+  version: 1.3.11
+  resolution: "@vanilla-extract/rollup-plugin@npm:1.3.11"
+  dependencies:
+    "@vanilla-extract/integration": ^7.1.11
+  peerDependencies:
+    rollup: ^2.0.0 || ^3.0.0 || ^4.0.0
+  checksum: 2e38981d156f8db962dedfc64131adbe8bd5ec9236686dccec92f3418d43d658f2f3a5797456f67eeb43ce75dcc84f9593e4f073e0e42c6df31d4e3ba6a59785
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/sprinkles@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "@vanilla-extract/sprinkles@npm:1.6.3"
+  peerDependencies:
+    "@vanilla-extract/css": ^1.0.0
+  checksum: 7eb4fe0f1a6048bf5ffb5ffab964c2d127ff95244da79dca2e448af380b591c7af3b4f63ab243584baa8a42c7694d8fe9eeb366587a2da381a481fe1a9e02af8
+  languageName: node
+  linkType: hard
+
+"@vanilla-extract/webpack-plugin@npm:^2.3.14":
+  version: 2.3.15
+  resolution: "@vanilla-extract/webpack-plugin@npm:2.3.15"
+  dependencies:
+    "@vanilla-extract/integration": ^7.1.11
+    debug: ^4.3.1
+    loader-utils: ^2.0.0
+    picocolors: ^1.0.0
+  peerDependencies:
+    webpack: ^4.30.0 || ^5.20.2
+  checksum: 105540377d0eb19f8dafcd2cc2cf893471494d4b82012574d4b70c32351ef78b6107ffaecf188a7a6edc10e70bd2963c4fd13ff16954f8063bb785aab98070dd
+  languageName: node
+  linkType: hard
+
+"@vitejs/plugin-react@npm:^4.3.1":
+  version: 4.3.4
+  resolution: "@vitejs/plugin-react@npm:4.3.4"
+  dependencies:
+    "@babel/core": ^7.26.0
+    "@babel/plugin-transform-react-jsx-self": ^7.25.9
+    "@babel/plugin-transform-react-jsx-source": ^7.25.9
     "@types/babel__core": ^7.20.5
     react-refresh: ^0.14.2
   peerDependencies:
-    vite: ^4.2.0 || ^5.0.0
-  checksum: 6bd3f8ec4a5c1f9f2970217d6a7291fafb41b7760f7761b982b6835c8f9cd3874cea9eb3b6659aa75c511954fcec7707116ea32042854b1be47902ebbb781794
+    vite: ^4.2.0 || ^5.0.0 || ^6.0.0
+  checksum: d417f40d9259a1d5193152f7d9fee081d5bf41cbeef9662ae1123ccc1e26aa4b6b04bc82ebb8c4fbfde9516a746fb3af7da19fdd449819c30f0631daaa10a44b
+  languageName: node
+  linkType: hard
+
+"@vitest/expect@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@vitest/expect@npm:2.0.5"
+  dependencies:
+    "@vitest/spy": 2.0.5
+    "@vitest/utils": 2.0.5
+    chai: ^5.1.1
+    tinyrainbow: ^1.2.0
+  checksum: 0c65eb24c2fd9ef5735d1e65dc8fee59936e6cab1d6ab24a95e014b8337be5598242fceae4e8ec2974e2ae70a30c1906ad41208bf6de6cdf2043594cdb65e627
   languageName: node
   linkType: hard
 
@@ -19715,6 +21665,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/pretty-format@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@vitest/pretty-format@npm:2.0.5"
+  dependencies:
+    tinyrainbow: ^1.2.0
+  checksum: d60346001180e5bb3c53be4b4d0b6d9352648b066641d5aba7b97d7c97a8e252dc934204d58818330262a65f07127455fc5f3b5f7e3647c60f6ff302a725733b
+  languageName: node
+  linkType: hard
+
 "@vitest/pretty-format@npm:2.1.3":
   version: 2.1.3
   resolution: "@vitest/pretty-format@npm:2.1.3"
@@ -19724,6 +21683,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/pretty-format@npm:2.1.6":
+  version: 2.1.6
+  resolution: "@vitest/pretty-format@npm:2.1.6"
+  dependencies:
+    tinyrainbow: ^1.2.0
+  checksum: 4cab9152ac97fa190db85bbe7e1ae8f1b5d2312fa3ccf7e813119933b2aaf4c763c6156a6d91cb186d3ed4be81f5bb70da2c731fde2d12457fe0871087d2be74
+  languageName: node
+  linkType: hard
+
+"@vitest/spy@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@vitest/spy@npm:2.0.5"
+  dependencies:
+    tinyspy: ^3.0.0
+  checksum: a010dec99146832a2586c639fccf533b194482f6f25ffb2d64367598a4e77d094aedd3d82cdb55fc1a3971649577a039513ccf8dc1571492e5982482c530c7b9
+  languageName: node
+  linkType: hard
+
 "@vitest/spy@npm:2.1.3":
   version: 2.1.3
   resolution: "@vitest/spy@npm:2.1.3"
@@ -19733,6 +21710,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/utils@npm:2.0.5":
+  version: 2.0.5
+  resolution: "@vitest/utils@npm:2.0.5"
+  dependencies:
+    "@vitest/pretty-format": 2.0.5
+    estree-walker: ^3.0.3
+    loupe: ^3.1.1
+    tinyrainbow: ^1.2.0
+  checksum: 6867556dd7e376437e454b96c7e596ec16e141fb00b002b6ce435611ab3d9d1e3f38ebf48b1fc49f4c97f9754ed37abb602de8bf122f4ac0de621a4dbe0a314e
+  languageName: node
+  linkType: hard
+
 "@vitest/utils@npm:2.1.3":
   version: 2.1.3
   resolution: "@vitest/utils@npm:2.1.3"
@@ -19744,6 +21733,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitest/utils@npm:^2.1.1":
+  version: 2.1.6
+  resolution: "@vitest/utils@npm:2.1.6"
+  dependencies:
+    "@vitest/pretty-format": 2.1.6
+    loupe: ^3.1.2
+    tinyrainbow: ^1.2.0
+  checksum: 8b9c994eccb724d76128e875e8438d519bfae0126e7431e8682e7f07d9faeff929db1afa2742b188883e42508d4cdcb2326f9ae27c1b53b5f746d283a9e75462
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
   version: 1.12.1
   resolution: "@webassemblyjs/ast@npm:1.12.1"
@@ -20558,7 +22558,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6":
+"abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
   checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
@@ -20595,7 +22595,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"accepts@npm:^1.3.5, accepts@npm:^1.3.7, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
+"accepts@npm:^1.3.5, accepts@npm:^1.3.7, accepts@npm:~1.3.4, accepts@npm:~1.3.8":
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
   dependencies:
@@ -20656,12 +22656,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
+"acorn@npm:^8.14.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.14.0
+  resolution: "acorn@npm:8.14.0"
   bin:
     acorn: bin/acorn
-  checksum: 76d8e7d559512566b43ab4aadc374f11f563f0a9e21626dd59cb2888444e9445923ae9f3699972767f18af61df89cd89f5eaaf772d1327b055b45cb829b4a88c
+  checksum: 8755074ba55fff94e84e81c72f1013c2d9c78e973c31231c8ae505a5f966859baf654bddd75046bffd73ce816b149298977fff5077a3033dedba0ae2aad152d4
   languageName: node
   linkType: hard
 
@@ -20688,12 +22688,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "agent-base@npm:7.1.0"
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
   dependencies:
     debug: ^4.3.4
-  checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
+  checksum: 51c158769c5c051482f9ca2e6e1ec085ac72b5a418a9b31b4e82fe6c0a6699adb94c1c42d246699a587b3335215037091c79e0de512c516f73b6ea844202f037
   languageName: node
   linkType: hard
 
@@ -20718,16 +22718,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aggregate-error@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "aggregate-error@npm:4.0.1"
-  dependencies:
-    clean-stack: ^4.0.0
-    indent-string: ^5.0.0
-  checksum: bb3ffdfd13447800fff237c2cba752c59868ee669104bb995dfbbe0b8320e967d679e683dabb640feb32e4882d60258165cde0baafc4cd467cc7d275a13ad6b5
-  languageName: node
-  linkType: hard
-
 "ajv-draft-04@npm:^1.0.0, ajv-draft-04@npm:~1.0.0":
   version: 1.0.0
   resolution: "ajv-draft-04@npm:1.0.0"
@@ -20932,7 +22922,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-html-community@npm:^0.0.8":
+"ansi-html-community@npm:0.0.8, ansi-html-community@npm:^0.0.8":
   version: 0.0.8
   resolution: "ansi-html-community@npm:0.0.8"
   bin:
@@ -21160,7 +23150,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.3.0, aria-query@npm:^5.0.0":
+"aria-query@npm:5.3.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
@@ -21169,16 +23159,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:~5.1.3":
-  version: 5.1.3
-  resolution: "aria-query@npm:5.1.3"
-  dependencies:
-    deep-equal: ^2.0.5
-  checksum: 929ff95f02857b650fb4cbcd2f41072eee2f46159a6605ea03bf63aa572e35ffdff43d69e815ddc462e16e07de8faba3978afc2813650b4448ee18c9895d982b
+"aria-query@npm:^5.0.0, aria-query@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "aria-query@npm:5.3.2"
+  checksum: d971175c85c10df0f6d14adfe6f1292409196114ab3c62f238e208b53103686f46cc70695a4f775b73bc65f6a09b6a092fd963c4f3a5a7d690c8fc5094925717
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1":
+"array-buffer-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
@@ -21628,7 +23616,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.7.7, axios@npm:^1.0.0, axios@npm:^1.4.0, axios@npm:^1.6.0, axios@npm:^1.7.4, axios@npm:^1.7.7":
+"axios@npm:1.7.7":
   version: 1.7.7
   resolution: "axios@npm:1.7.7"
   dependencies:
@@ -21639,6 +23627,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^1.0.0, axios@npm:^1.6.0, axios@npm:^1.7.4, axios@npm:^1.7.7":
+  version: 1.7.9
+  resolution: "axios@npm:1.7.9"
+  dependencies:
+    follow-redirects: ^1.15.6
+    form-data: ^4.0.0
+    proxy-from-env: ^1.1.0
+  checksum: cb8ce291818effda09240cb60f114d5625909b345e10f389a945320e06acf0bc949d0f8422d25720f5dd421362abee302c99f5e97edec4c156c8939814b23d19
+  languageName: node
+  linkType: hard
+
 "axobject-query@npm:^4.1.0":
   version: 4.1.0
   resolution: "axobject-query@npm:4.1.0"
@@ -21968,6 +23967,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"better-opn@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "better-opn@npm:3.0.2"
+  dependencies:
+    open: ^8.0.4
+  checksum: 1471552fa7f733561e7f49e812be074b421153006ca744de985fb6d38939807959fc5fe9cb819cf09f864782e294704fd3b31711ea14c115baf3330a2f1135de
+  languageName: node
+  linkType: hard
+
 "better-path-resolve@npm:1.0.0":
   version: 1.0.0
   resolution: "better-path-resolve@npm:1.0.0"
@@ -21978,13 +23986,13 @@ __metadata:
   linkType: hard
 
 "better-sqlite3@npm:^11.0.0":
-  version: 11.4.0
-  resolution: "better-sqlite3@npm:11.4.0"
+  version: 11.6.0
+  resolution: "better-sqlite3@npm:11.6.0"
   dependencies:
     bindings: ^1.5.0
     node-gyp: latest
     prebuild-install: ^7.1.1
-  checksum: d681ba16aae43e367ed9ab74fec3319a29bdffb6ca9f4aa7ac1e65304de395356f515e42f8259eed52aa667df9228c3b19bc6bef441cd5f21889d49042ab5f27
+  checksum: 4570559e8b62da295060b086cfe7902648670863790993be1a43e73867f3d9767598aa52fb8332cf3eb16aa30f3037c3705ce5a195db59c076006067e43eea98
   languageName: node
   linkType: hard
 
@@ -22221,6 +24229,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browser-assert@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "browser-assert@npm:1.2.1"
+  checksum: 8b2407cd04c1ed592cf892dec35942b7d72635829221e0788c9a16c4d2afa8b7156bc9705b1c4b32c30d88136c576fda3cbcb8f494d6f865264c706ea8798d92
+  languageName: node
+  linkType: hard
+
 "browser-headers@npm:^0.4.1":
   version: 0.4.1
   resolution: "browser-headers@npm:0.4.1"
@@ -22317,17 +24332,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.23.1":
-  version: 4.23.3
-  resolution: "browserslist@npm:4.23.3"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.24.0":
+  version: 4.24.2
+  resolution: "browserslist@npm:4.24.2"
   dependencies:
-    caniuse-lite: ^1.0.30001646
-    electron-to-chromium: ^1.5.4
+    caniuse-lite: ^1.0.30001669
+    electron-to-chromium: ^1.5.41
     node-releases: ^2.0.18
-    update-browserslist-db: ^1.1.0
+    update-browserslist-db: ^1.1.1
   bin:
     browserslist: cli.js
-  checksum: 7906064f9970aeb941310b2fcb8b4ace4a1b50aa657c986677c6f1553a8cabcc94ee9c5922f715baffbedaa0e6cf0831b6fed7b059dde6873a4bfadcbe069c7e
+  checksum: cf64085f12132d38638f38937a255edb82c7551b164a98577b055dd79719187a816112f7b97b9739e400c4954cd66479c0d7a843cb816e346f4795dc24fd5d97
   languageName: node
   linkType: hard
 
@@ -22492,6 +24507,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cac@npm:^6.7.14":
+  version: 6.7.14
+  resolution: "cac@npm:6.7.14"
+  checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a
+  languageName: node
+  linkType: hard
+
 "cacache@npm:^15.0.3, cacache@npm:^15.0.5, cacache@npm:^15.2.0":
   version: 15.3.0
   resolution: "cacache@npm:15.3.0"
@@ -22588,6 +24610,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cacheable-request@npm:*":
+  version: 13.0.2
+  resolution: "cacheable-request@npm:13.0.2"
+  dependencies:
+    "@types/http-cache-semantics": ^4.0.4
+    get-stream: ^9.0.1
+    http-cache-semantics: ^4.1.1
+    keyv: ^5.2.1
+    mimic-response: ^4.0.0
+    normalize-url: ^8.0.1
+    responselike: ^3.0.0
+  checksum: b019639ddbd617eced8933882c4a15d3de8a51ab2f90fddae860812951c5f5271f293696bd4cf37f6605e73239fca37cff1c8a32d01aa28a27fd685a66aa590a
+  languageName: node
+  linkType: hard
+
 "cacheable-request@npm:^6.0.0":
   version: 6.1.0
   resolution: "cacheable-request@npm:6.1.0"
@@ -22695,22 +24732,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001616, caniuse-lite@npm:^1.0.30001646":
-  version: 1.0.30001668
-  resolution: "caniuse-lite@npm:1.0.30001668"
-  checksum: ce6996901b5883454a8ddb3040f82342277b6a6275876dfefcdecb11f7e472e29877f34cae47c2b674f08f2e71971dd4a2acb9bc01adfe8421b7148a7e9e8297
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001616, caniuse-lite@npm:^1.0.30001669":
+  version: 1.0.30001684
+  resolution: "caniuse-lite@npm:1.0.30001684"
+  checksum: 5ee7aca9c29067d2e4c88cd05cbc062599d86389cd99e26e4d4bf84de8fad3f9ed2be9d3d909dfb65f50e77a17192175cb132eca7f0988ab0f3e8c4aa0dccd38
   languageName: node
   linkType: hard
 
-"canvas@npm:^2.10.2":
-  version: 2.11.2
-  resolution: "canvas@npm:2.11.2"
-  dependencies:
-    "@mapbox/node-pre-gyp": ^1.0.0
-    nan: ^2.17.0
-    node-gyp: latest
-    simple-get: ^3.0.3
-  checksum: 61e554aef80022841dc836964534082ec21435928498032562089dfb7736215f039c7d99ee546b0cf10780232d9bf310950f8b4d489dc394e0fb6f6adfc97994
+"case-sensitive-paths-webpack-plugin@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
+  checksum: bcf469446eeee9ac0046e30860074ebb9aa4803aab9140e6bb72b600b23b1d70635690754be4504ce35cd99cdf05226bee8d894ba362a3f5485d5f6310fc6d02
   languageName: node
   linkType: hard
 
@@ -22889,6 +24921,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chownr@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "chownr@npm:3.0.0"
+  checksum: fd73a4bab48b79e66903fe1cafbdc208956f41ea4f856df883d0c7277b7ab29fd33ee65f93b2ec9192fc0169238f2f8307b7735d27c155821d886b84aa97aa8d
+  languageName: node
+  linkType: hard
+
+"chromatic@npm:^11.15.0":
+  version: 11.19.0
+  resolution: "chromatic@npm:11.19.0"
+  peerDependencies:
+    "@chromatic-com/cypress": ^0.*.* || ^1.0.0
+    "@chromatic-com/playwright": ^0.*.* || ^1.0.0
+  peerDependenciesMeta:
+    "@chromatic-com/cypress":
+      optional: true
+    "@chromatic-com/playwright":
+      optional: true
+  bin:
+    chroma: dist/bin.js
+    chromatic: dist/bin.js
+    chromatic-cli: dist/bin.js
+  checksum: 6ce615e73fd713bb41e813c311dcbfd0c4427a3f48aa11e4108854a9de8157ef191a23dd4179ec5568ec612ea8dc60b026ed74f993a76e163cbb765980e9c075
+  languageName: node
+  linkType: hard
+
 "chrome-trace-event@npm:^1.0.2":
   version: 1.0.2
   resolution: "chrome-trace-event@npm:1.0.2"
@@ -22938,10 +24996,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.2.2":
-  version: 1.3.1
-  resolution: "cjs-module-lexer@npm:1.3.1"
-  checksum: 75f20ac264a397ea5c63f9c2343a51ab878043666468f275e94862f7180ec1d764a400ec0c09085dcf0db3193c74a8b571519abd2bf4be0d2be510d1377c8d4b
+"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.2.2, cjs-module-lexer@npm:^1.2.3":
+  version: 1.4.1
+  resolution: "cjs-module-lexer@npm:1.4.1"
+  checksum: 2556807a99aec1f9daac60741af96cd613a707f343174ae7967da46402c91dced411bf830d209f2e93be4cecea46fc75cecf1f17c799d7d8a9e1dd6204bfcd22
   languageName: node
   linkType: hard
 
@@ -22975,15 +25033,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clean-stack@npm:^4.0.0":
-  version: 4.2.0
-  resolution: "clean-stack@npm:4.2.0"
-  dependencies:
-    escape-string-regexp: 5.0.0
-  checksum: 373f656a31face5c615c0839213b9b542a0a48057abfb1df66900eab4dc2a5c6097628e4a0b5aa559cdfc4e66f8a14ea47be9681773165a44470ef5fb8ccc172
-  languageName: node
-  linkType: hard
-
 "cli-boxes@npm:^2.2.0, cli-boxes@npm:^2.2.1":
   version: 2.2.1
   resolution: "cli-boxes@npm:2.2.1"
@@ -23022,7 +25071,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-spinners@npm:^2.5.0, cli-spinners@npm:^2.9.2":
+"cli-spinners@npm:^2.5.0":
   version: 2.9.2
   resolution: "cli-spinners@npm:2.9.2"
   checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c
@@ -23197,10 +25246,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cluster-key-slot@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "cluster-key-slot@npm:1.1.0"
-  checksum: fc953c75209b1ef9088081bab4e40a0b2586491c974ab93460569c014515ca5a2e31c043f185285e177007162fc353d07836d98f570c171dbe055775430e495b
+"cluster-key-slot@npm:1.1.2, cluster-key-slot@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "cluster-key-slot@npm:1.1.2"
+  checksum: be0ad2d262502adc998597e83f9ded1b80f827f0452127c5a37b22dfca36bab8edf393f7b25bb626006fb9fb2436106939ede6d2d6ecf4229b96a47f27edd681
   languageName: node
   linkType: hard
 
@@ -23227,10 +25276,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-block-writer@npm:^13.0.1":
-  version: 13.0.1
-  resolution: "code-block-writer@npm:13.0.1"
-  checksum: 678b740d1723c7cc3c5addcbc1a91d9a7a3f033510eb8e0639154fcaae456c80630dbd40d16aefdffaf3edb5ffb352d7d46f195f69c8be692c4d7debb1dc7933
+"code-block-writer@npm:^13.0.3":
+  version: 13.0.3
+  resolution: "code-block-writer@npm:13.0.3"
+  checksum: 8e234f0ec2db9625d5efb9f05bdae79da6559bb4d9df94a6aa79a89a7b5ae25093b70d309fc5122840c9c07995cb14b4dd3f98a30f8878e3a3372e177df79454
   languageName: node
   linkType: hard
 
@@ -23538,7 +25587,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compressible@npm:~2.0.16":
+"compressible@npm:~2.0.18":
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
   dependencies:
@@ -23548,17 +25597,17 @@ __metadata:
   linkType: hard
 
 "compression@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "compression@npm:1.7.4"
+  version: 1.7.5
+  resolution: "compression@npm:1.7.5"
   dependencies:
-    accepts: ~1.3.5
-    bytes: 3.0.0
-    compressible: ~2.0.16
+    bytes: 3.1.2
+    compressible: ~2.0.18
     debug: 2.6.9
+    negotiator: ~0.6.4
     on-headers: ~1.0.2
-    safe-buffer: 5.1.2
+    safe-buffer: 5.2.1
     vary: ~1.1.2
-  checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b
+  checksum: d624b5562492518eee82c4f1381ea36f69f1f10b4283bfc2dcafd7d4d7eeed17c3f0e8f2951798594b7064db7ac5a6198df34816bde2d56bb7c75ce1570880e9
   languageName: node
   linkType: hard
 
@@ -23661,6 +25710,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"confbox@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "confbox@npm:0.1.8"
+  checksum: 5c7718ab22cf9e35a31c21ef124156076ae8c9dc65e6463d54961caf5a1d529284485a0fdf83fd23b27329f3b75b0c8c07d2e36c699f5151a2efe903343f976a
+  languageName: node
+  linkType: hard
+
 "configstore@npm:^5.0.1":
   version: 5.0.1
   resolution: "configstore@npm:5.0.1"
@@ -23823,7 +25879,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.7.2, cookie@npm:^0.7.0":
+"cookie@npm:0.7.2, cookie@npm:^0.7.0, cookie@npm:^0.7.2, cookie@npm:~0.7.2":
   version: 0.7.2
   resolution: "cookie@npm:0.7.2"
   checksum: 9bf8555e33530affd571ea37b615ccad9b9a34febbf2c950c86787088eb00a8973690833b0f8ebd6b69b753c62669ea60cec89178c1fb007bf0749abed74f93e
@@ -23837,20 +25893,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180
-  languageName: node
-  linkType: hard
-
-"cookie@npm:~0.6.0":
-  version: 0.6.0
-  resolution: "cookie@npm:0.6.0"
-  checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410
-  languageName: node
-  linkType: hard
-
 "cookiejar@npm:^2.1.4":
   version: 2.1.4
   resolution: "cookiejar@npm:2.1.4"
@@ -23901,9 +25943,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.6.5":
-  version: 3.38.1
-  resolution: "core-js@npm:3.38.1"
-  checksum: 55703c2f6fcd537e47a5cc83e9dc9884efef61861bbefb4a96a8c95e87956db980ce314628465dd49f14e626c5e633b9e3433f3e4a1f628404a14da420eb2556
+  version: 3.39.0
+  resolution: "core-js@npm:3.39.0"
+  checksum: 7a3670e9a2a89e0a049daa288d742d09f6e16d27a8945c5e2ef6fc45dc57e5c4bc5db589da05947486f54ae978d14cf27bd3fb1db0b9907000a611e8af37355b
   languageName: node
   linkType: hard
 
@@ -24085,21 +26127,21 @@ __metadata:
   linkType: hard
 
 "cron@npm:^3.0.0":
-  version: 3.1.7
-  resolution: "cron@npm:3.1.7"
+  version: 3.2.1
+  resolution: "cron@npm:3.2.1"
   dependencies:
     "@types/luxon": ~3.4.0
-    luxon: ~3.4.0
-  checksum: d98ee5297543c138221d96dd49270bf6576db80134e6041f4ce4a3c0cb6060863d76910209b34fee66fbf134461449ec3bd283d6a76d1c50da220cde7fc10c65
+    luxon: ~3.5.0
+  checksum: 349419d702385e9a6ad08d2b571d544df97009be37cde6a4c4e5b31118ca806d9501d784d74e84236a49233c7469e322c3d2c14867009a7a3b2e644b7ade0a0e
   languageName: node
   linkType: hard
 
 "cronstrue@npm:^2.2.0, cronstrue@npm:^2.32.0":
-  version: 2.50.0
-  resolution: "cronstrue@npm:2.50.0"
+  version: 2.51.0
+  resolution: "cronstrue@npm:2.51.0"
   bin:
     cronstrue: bin/cli.js
-  checksum: bf6e51c4b9ab28d7ba928a392a76b7d97bd3c3dc8da5618db8424480dc6213cafed658ea835925675767fe5497931d1325e51634eeb8e2556f0630a62eb29cc3
+  checksum: 7487eeb7bdb9bc8882ede5d3f1cadf73dec44f1da8d29b8ebb0312f85413cd300842ce0c6c49beb66e549917d48f699dfd8b9585d00050c5571c3f8cbf091ac6
   languageName: node
   linkType: hard
 
@@ -24142,7 +26184,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+"cross-spawn@npm:7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
   dependencies:
@@ -24153,17 +26195,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "cross-spawn@npm:5.1.0"
-  dependencies:
-    lru-cache: ^4.0.1
-    shebang-command: ^1.2.0
-    which: ^1.2.9
-  checksum: 726939c9954fc70c20e538923feaaa33bebc253247d13021737c3c7f68cdc3e0a57f720c0fe75057c0387995349f3f12e20e9bfdbf12274db28019c7ea4ec166
-  languageName: node
-  linkType: hard
-
 "cross-spawn@npm:^6.0.0":
   version: 6.0.5
   resolution: "cross-spawn@npm:6.0.5"
@@ -24177,6 +26208,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.5":
+  version: 7.0.6
+  resolution: "cross-spawn@npm:7.0.6"
+  dependencies:
+    path-key: ^3.1.0
+    shebang-command: ^2.0.0
+    which: ^2.0.1
+  checksum: 8d306efacaf6f3f60e0224c287664093fa9185680b2d195852ba9a863f85d02dcc737094c6e512175f8ee0161f9b87c73c6826034c2422e39de7d6569cf4503b
+  languageName: node
+  linkType: hard
+
 "crosspath@npm:^2.0.0":
   version: 2.0.0
   resolution: "crosspath@npm:2.0.0"
@@ -24248,7 +26290,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:^6.5.1":
+"css-loader@npm:^6.7.1":
   version: 6.11.0
   resolution: "css-loader@npm:6.11.0"
   dependencies:
@@ -24272,6 +26314,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-loader@npm:^7.0.0":
+  version: 7.1.2
+  resolution: "css-loader@npm:7.1.2"
+  dependencies:
+    icss-utils: ^5.1.0
+    postcss: ^8.4.33
+    postcss-modules-extract-imports: ^3.1.0
+    postcss-modules-local-by-default: ^4.0.5
+    postcss-modules-scope: ^3.2.0
+    postcss-modules-values: ^4.0.0
+    postcss-value-parser: ^4.2.0
+    semver: ^7.5.4
+  peerDependencies:
+    "@rspack/core": 0.x || 1.x
+    webpack: ^5.27.0
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 15bfd90d778ddab90ee1d04c8c8bcc13ea6c0791d01b52b09d1b1c753b3410f7a7788a510d93726a9878e70b7c1a140f21efdf5c96e1857872107551d3897822
+  languageName: node
+  linkType: hard
+
 "css-select@npm:^4.1.3, css-select@npm:^4.2.1":
   version: 4.3.0
   resolution: "css-select@npm:4.3.0"
@@ -24423,13 +26489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "cssom@npm:0.4.4"
-  checksum: e3bc1076e7ee4213d4fef05e7ae03bfa83dc05f32611d8edc341f4ecc3d9647b89c8245474c7dd2cdcdb797a27c462e99da7ad00a34399694559f763478ff53f
-  languageName: node
-  linkType: hard
-
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
@@ -24453,6 +26512,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssstyle@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "cssstyle@npm:4.1.0"
+  dependencies:
+    rrweb-cssom: ^0.7.1
+  checksum: a8f5746430c42347e76dc830548f3a296882e42a90af188ae44e4c1a4131aec246b0b6c8562e3e6e4fa0ff14aeee5cd14a0e2fe5a7105dcf39f98eb70d16b634
+  languageName: node
+  linkType: hard
+
 "csstype@npm:^2.5.2, csstype@npm:^2.6.7":
   version: 2.6.21
   resolution: "csstype@npm:2.6.21"
@@ -24460,7 +26528,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.0.2, csstype@npm:^3.1.2, csstype@npm:^3.1.3":
+"csstype@npm:^3.0.2, csstype@npm:^3.0.7, csstype@npm:^3.1.2, csstype@npm:^3.1.3":
   version: 3.0.9
   resolution: "csstype@npm:3.0.9"
   checksum: 199f9af7e673f9f188525c3102a329d637ff46c52f6385a4427ff5cb17adcb736189150170a7af7c5701d18d7704bdad130273f4aa7e44c6c4f9967e6115dc93
@@ -24615,17 +26683,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "data-urls@npm:2.0.0"
-  dependencies:
-    abab: ^2.0.3
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.0.0
-  checksum: 97caf828aac25e25e04ba6869db0f99c75e6859bb5b424ada28d3e7841941ebf08ddff3c1b1bb4585986bd507a5d54c2a716853ea6cb98af877400e637393e71
-  languageName: node
-  linkType: hard
-
 "data-urls@npm:^3.0.2":
   version: 3.0.2
   resolution: "data-urls@npm:3.0.2"
@@ -24637,6 +26694,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-urls@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "data-urls@npm:5.0.0"
+  dependencies:
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+  checksum: 5c40568c31b02641a70204ff233bc4e42d33717485d074244a98661e5f2a1e80e38fe05a5755dfaf2ee549f2ab509d6a3af2a85f4b2ad2c984e5d176695eaf46
+  languageName: node
+  linkType: hard
+
 "data-view-buffer@npm:^1.0.1":
   version: 1.0.1
   resolution: "data-view-buffer@npm:1.0.1"
@@ -24671,9 +26738,9 @@ __metadata:
   linkType: hard
 
 "dataloader@npm:^2.0.0, dataloader@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "dataloader@npm:2.2.2"
-  checksum: 4dabd247089c29f194e94d5434d504f99156c5c214a03463c20f3f17f40398d7e179edee69a27c16e315519ac8739042a810090087ae26449a0e685156a02c65
+  version: 2.2.3
+  resolution: "dataloader@npm:2.2.3"
+  checksum: cc272181f6cad0ea20511c0a0d270cbc1df960a3526ab24941bbeb2cb7120499a598fe2cd41b4818527367acf7bc1be0723b6e5034637db4759a396c904b78a6
   languageName: node
   linkType: hard
 
@@ -24779,10 +26846,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.2.1, decimal.js@npm:^10.3.1":
-  version: 10.4.1
-  resolution: "decimal.js@npm:10.4.1"
-  checksum: 5da6dc74af5b73d954741b24d404ef6da07841794d9e51412a2708ec384dd7b4bced3365fb178f4cd119b7ef45f0b34344014a4dc0494c8374c5e746df3cb410
+"decimal.js@npm:^10.3.1, decimal.js@npm:^10.4.3":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
   languageName: node
   linkType: hard
 
@@ -24811,15 +26878,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decompress-response@npm:^4.2.0":
-  version: 4.2.1
-  resolution: "decompress-response@npm:4.2.1"
-  dependencies:
-    mimic-response: ^2.0.0
-  checksum: 4e783ca4dfe9417354d61349750fe05236f565a4415a6ca20983a311be2371debaedd9104c0b0e7b36e5f167aeaae04f84f1a0b3f8be4162f1d7d15598b8fdba
-  languageName: node
-  linkType: hard
-
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -24829,15 +26887,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dedent@npm:^1.0.0":
-  version: 1.5.1
-  resolution: "dedent@npm:1.5.1"
+"dedent@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "dedent@npm:0.7.0"
+  checksum: 87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
+  languageName: node
+  linkType: hard
+
+"dedent@npm:^1.0.0, dedent@npm:^1.5.3":
+  version: 1.5.3
+  resolution: "dedent@npm:1.5.3"
   peerDependencies:
     babel-plugin-macros: ^3.1.0
   peerDependenciesMeta:
     babel-plugin-macros:
       optional: true
-  checksum: c3c300a14edf1bdf5a873f9e4b22e839d62490bc5c8d6169c1f15858a1a76733d06a9a56930e963d677a2ceeca4b6b0894cc5ea2f501aa382ca5b92af3413c2a
+  checksum: 045b595557b2a8ea2eb9b0b4623d764e9a87326486fe2b61191b4342ed93dc01245644d8a09f3108a50c0ee7965f1eedd92e4a3a503ed89ea8e810566ea27f9a
   languageName: node
   linkType: hard
 
@@ -24848,32 +26913,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal@npm:^2.0.5":
-  version: 2.2.3
-  resolution: "deep-equal@npm:2.2.3"
-  dependencies:
-    array-buffer-byte-length: ^1.0.0
-    call-bind: ^1.0.5
-    es-get-iterator: ^1.1.3
-    get-intrinsic: ^1.2.2
-    is-arguments: ^1.1.1
-    is-array-buffer: ^3.0.2
-    is-date-object: ^1.0.5
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
-    isarray: ^2.0.5
-    object-is: ^1.1.5
-    object-keys: ^1.1.1
-    object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.5.1
-    side-channel: ^1.0.4
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.13
-  checksum: ee8852f23e4d20a5626c13b02f415ba443a1b30b4b3d39eaf366d59c4a85e6545d7ec917db44d476a85ae5a86064f7e5f7af7479f38f113995ba869f3a1ddc53
-  languageName: node
-  linkType: hard
-
 "deep-equal@npm:~1.0.1":
   version: 1.0.1
   resolution: "deep-equal@npm:1.0.1"
@@ -24895,6 +26934,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-object-diff@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "deep-object-diff@npm:1.1.9"
+  checksum: ecd42455e4773f653595d28070295e7aaa8402db5f8ab21d0bec115a7cb4de5e207a5665514767da5f025c96597f1d3a0a4888aeb4dd49e03c996871a3aa05ef
+  languageName: node
+  linkType: hard
+
 "deepmerge@npm:^4.2.2, deepmerge@npm:^4.3.1, deepmerge@npm:~4.3.0":
   version: 4.3.1
   resolution: "deepmerge@npm:4.3.1"
@@ -24998,19 +27044,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"del@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "del@npm:7.1.0"
+"del@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "del@npm:8.0.0"
   dependencies:
-    globby: ^13.1.2
-    graceful-fs: ^4.2.10
+    globby: ^14.0.2
     is-glob: ^4.0.3
     is-path-cwd: ^3.0.0
     is-path-inside: ^4.0.0
-    p-map: ^5.5.0
-    rimraf: ^3.0.2
-    slash: ^4.0.0
-  checksum: 93527e78e95125809ff20a112814b00648ed64af204be1a565862698060c9ec8f5c5fe1a4866725acfde9b0da6423f4b7a7642c1d38cd4b05cbeb643a7b089e3
+    p-map: ^7.0.2
+    slash: ^5.1.0
+  checksum: 502dea7a846f989e1d921733f5d41ae4ae9b3eff168d335bfc050c9ce938ddc46198180be133814269268c4b0aed441a82fbace948c0ec5eed4ed086a4ad3b0e
   languageName: node
   linkType: hard
 
@@ -25070,7 +27114,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dequal@npm:^2.0.0, dequal@npm:^2.0.3":
+"dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
   checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
@@ -25388,15 +27432,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domexception@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "domexception@npm:2.0.1"
-  dependencies:
-    webidl-conversions: ^5.0.0
-  checksum: d638e9cb05c52999f1b2eb87c374b03311ea5b1d69c2f875bc92da73e17db60c12142b45c950228642ff7f845c536b65305483350d080df59003a653da80b691
-  languageName: node
-  linkType: hard
-
 "domexception@npm:^4.0.0":
   version: 4.0.0
   resolution: "domexception@npm:4.0.0"
@@ -25424,21 +27459,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:=3.1.4":
-  version: 3.1.4
-  resolution: "dompurify@npm:3.1.4"
-  checksum: 7b8d55d6e091c69cccfef73d066bd1bc82de32c81bc050b2c396b502afda0c853152760553aeb4d7ef86e7cf46bf49720fcb0c42a49ce939125cf40d7720ebb8
+"dompurify@npm:=3.1.6":
+  version: 3.1.6
+  resolution: "dompurify@npm:3.1.6"
+  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
   languageName: node
   linkType: hard
 
-"dompurify@npm:^2.2.7":
-  version: 2.5.7
-  resolution: "dompurify@npm:2.5.7"
-  checksum: 9652139743130b5ebaf5278fadec06d9b3920019b80c205565b9b8d52cd0cea90ff690c1994c5c0da5bc9d57a94dc19236cdf1ccabdc1c6cff7c255e1e597031
-  languageName: node
-  linkType: hard
-
-"dompurify@npm:^3.0.0":
+"dompurify@npm:^3.0.0, dompurify@npm:^3.1.7":
   version: 3.1.7
   resolution: "dompurify@npm:3.1.7"
   checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
@@ -25580,7 +27608,7 @@ __metadata:
     "@backstage/create-app": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@types/fs-extra": ^11.0.0
-    "@types/node": ^18.17.8
+    "@types/node": ^20.16.0
     chalk: ^4.0.0
     commander: ^12.0.0
     cross-fetch: ^4.0.0
@@ -25674,8 +27702,8 @@ __metadata:
   linkType: hard
 
 "elastic-builder@npm:^2.16.0":
-  version: 2.29.0
-  resolution: "elastic-builder@npm:2.29.0"
+  version: 2.30.0
+  resolution: "elastic-builder@npm:2.30.0"
   dependencies:
     lodash.has: ^4.5.2
     lodash.hasin: ^4.5.2
@@ -25685,20 +27713,20 @@ __metadata:
     lodash.isobject: ^3.0.2
     lodash.isstring: ^4.0.1
     lodash.omit: ^4.5.0
-  checksum: 9fe71c5e5f24d09f08d9bfd66afd8e0e3f212e8e54ca5906607a109ace293adaa2c820f626608532dff28fc211a2ee414faf29f397b87b86b6af33c57428de2e
+  checksum: 242d8873d49e8095ec14d5bf33bba55d6dc37c86d2ff91b159195cc97ce4f575287f29e276084035a88e907afa30fe76c53ec6272cb805055a36c0c521480ea4
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.5.4":
-  version: 1.5.13
-  resolution: "electron-to-chromium@npm:1.5.13"
-  checksum: f18ac84dd3bf9a200654a6a9292b9ec4bced0cf9bd26cec9941b775f4470c581c9d043e70b37a124d9752dcc0f47fc96613d52b2defd8e59632852730cb418b9
+"electron-to-chromium@npm:^1.5.41":
+  version: 1.5.65
+  resolution: "electron-to-chromium@npm:1.5.65"
+  checksum: 4a112a038771c415f77e88fb3e3d929ceac4600b4612c55eb5d955a37c24842725f00c14f0f6838fd46edd832351c702b24c592c544d2e1e630d084f9df9f275
   languageName: node
   linkType: hard
 
 "elliptic@npm:^6.0.0, elliptic@npm:^6.5.4":
-  version: 6.5.7
-  resolution: "elliptic@npm:6.5.7"
+  version: 6.6.0
+  resolution: "elliptic@npm:6.6.0"
   dependencies:
     bn.js: ^4.11.9
     brorand: ^1.1.0
@@ -25707,7 +27735,7 @@ __metadata:
     inherits: ^2.0.4
     minimalistic-assert: ^1.0.1
     minimalistic-crypto-utils: ^1.0.1
-  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
+  checksum: e912349b883e694bfe65005214237a470c9a098a6ba36fd24396d0ab07feb399920c0738aeed1aed6cf5dca9c64fd479e212faed3a75c9d81453671ef0de5157
   languageName: node
   linkType: hard
 
@@ -25785,6 +27813,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"endent@npm:^2.0.1":
+  version: 2.1.0
+  resolution: "endent@npm:2.1.0"
+  dependencies:
+    dedent: ^0.7.0
+    fast-json-parse: ^1.0.3
+    objectorarray: ^1.0.5
+  checksum: c352831088fce745a39ddbd5f87a17e073ea6556e7e96e9010d945a3f3020f836b9a84657123fa01e897db9216f4b080d950b5ded9bf3a8227f14a34efaaaf7c
+  languageName: node
+  linkType: hard
+
 "enhanced-resolve@npm:^5.17.1":
   version: 5.17.1
   resolution: "enhanced-resolve@npm:5.17.1"
@@ -25812,10 +27851,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.2.0, entities@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "entities@npm:4.4.0"
-  checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
+"entities@npm:^4.2.0, entities@npm:^4.4.0, entities@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
   languageName: node
   linkType: hard
 
@@ -25957,26 +27996,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
-    has-symbols: ^1.0.3
-    is-arguments: ^1.1.1
-    is-map: ^2.0.2
-    is-set: ^2.0.2
-    is-string: ^1.0.7
-    isarray: ^2.0.5
-    stop-iteration-iterator: ^1.0.0
-  checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d
-  languageName: node
-  linkType: hard
-
-"es-iterator-helpers@npm:^1.0.19":
-  version: 1.0.19
-  resolution: "es-iterator-helpers@npm:1.0.19"
+"es-iterator-helpers@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "es-iterator-helpers@npm:1.1.0"
   dependencies:
     call-bind: ^1.0.7
     define-properties: ^1.2.1
@@ -25985,21 +28007,21 @@ __metadata:
     es-set-tostringtag: ^2.0.3
     function-bind: ^1.1.2
     get-intrinsic: ^1.2.4
-    globalthis: ^1.0.3
+    globalthis: ^1.0.4
     has-property-descriptors: ^1.0.2
     has-proto: ^1.0.3
     has-symbols: ^1.0.3
     internal-slot: ^1.0.7
-    iterator.prototype: ^1.1.2
+    iterator.prototype: ^1.1.3
     safe-array-concat: ^1.1.2
-  checksum: 7ae112b88359fbaf4b9d7d1d1358ae57c5138768c57ba3a8fb930393662653b0512bfd7917c15890d1471577fb012fee8b73b4465e59b331739e6ee94f961683
+  checksum: 4ba3a32ab7ba05b85f0ae30604feeb8ffd801fe762e9df9577bd220a96b9eaa2e90af8e6bdc498e523051f293955e2f7d2bddd34de71e1428a1b8ff3fd961016
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.3.1":
-  version: 1.4.1
-  resolution: "es-module-lexer@npm:1.4.1"
-  checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
+"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.3.1, es-module-lexer@npm:^1.5.0":
+  version: 1.5.4
+  resolution: "es-module-lexer@npm:1.5.4"
+  checksum: a0cf04fb92d052647ac7d818d1913b98d3d3d0f5b9d88f0eafb993436e4c3e2c958599db68839d57f2dfa281fdf0f60e18d448eb78fc292c33c0f25635b6854f
   languageName: node
   linkType: hard
 
@@ -26109,87 +28131,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.21.0, esbuild@npm:^0.21.3":
-  version: 0.21.5
-  resolution: "esbuild@npm:0.21.5"
+"esbuild-register@npm:^3.5.0":
+  version: 3.6.0
+  resolution: "esbuild-register@npm:3.6.0"
   dependencies:
-    "@esbuild/aix-ppc64": 0.21.5
-    "@esbuild/android-arm": 0.21.5
-    "@esbuild/android-arm64": 0.21.5
-    "@esbuild/android-x64": 0.21.5
-    "@esbuild/darwin-arm64": 0.21.5
-    "@esbuild/darwin-x64": 0.21.5
-    "@esbuild/freebsd-arm64": 0.21.5
-    "@esbuild/freebsd-x64": 0.21.5
-    "@esbuild/linux-arm": 0.21.5
-    "@esbuild/linux-arm64": 0.21.5
-    "@esbuild/linux-ia32": 0.21.5
-    "@esbuild/linux-loong64": 0.21.5
-    "@esbuild/linux-mips64el": 0.21.5
-    "@esbuild/linux-ppc64": 0.21.5
-    "@esbuild/linux-riscv64": 0.21.5
-    "@esbuild/linux-s390x": 0.21.5
-    "@esbuild/linux-x64": 0.21.5
-    "@esbuild/netbsd-x64": 0.21.5
-    "@esbuild/openbsd-x64": 0.21.5
-    "@esbuild/sunos-x64": 0.21.5
-    "@esbuild/win32-arm64": 0.21.5
-    "@esbuild/win32-ia32": 0.21.5
-    "@esbuild/win32-x64": 0.21.5
-  dependenciesMeta:
-    "@esbuild/aix-ppc64":
-      optional: true
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 2911c7b50b23a9df59a7d6d4cdd3a4f85855787f374dce751148dbb13305e0ce7e880dde1608c2ab7a927fc6cec3587b80995f7fc87a64b455f8b70b55fd8ec1
+    debug: ^4.3.4
+  peerDependencies:
+    esbuild: ">=0.12 <1"
+  checksum: 9221e26dde3366398a43183b600d8e9252b8003516cd766983a06c321eb07cf1b6b236948a21e4d1728c17a341c0fa52b49409c951d89fc7bf65d07d43c31a05
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.24.0":
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0, esbuild@npm:^0.24.0":
   version: 0.24.0
   resolution: "esbuild@npm:0.24.0"
   dependencies:
@@ -26272,6 +28225,86 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.21.0, esbuild@npm:^0.21.3":
+  version: 0.21.5
+  resolution: "esbuild@npm:0.21.5"
+  dependencies:
+    "@esbuild/aix-ppc64": 0.21.5
+    "@esbuild/android-arm": 0.21.5
+    "@esbuild/android-arm64": 0.21.5
+    "@esbuild/android-x64": 0.21.5
+    "@esbuild/darwin-arm64": 0.21.5
+    "@esbuild/darwin-x64": 0.21.5
+    "@esbuild/freebsd-arm64": 0.21.5
+    "@esbuild/freebsd-x64": 0.21.5
+    "@esbuild/linux-arm": 0.21.5
+    "@esbuild/linux-arm64": 0.21.5
+    "@esbuild/linux-ia32": 0.21.5
+    "@esbuild/linux-loong64": 0.21.5
+    "@esbuild/linux-mips64el": 0.21.5
+    "@esbuild/linux-ppc64": 0.21.5
+    "@esbuild/linux-riscv64": 0.21.5
+    "@esbuild/linux-s390x": 0.21.5
+    "@esbuild/linux-x64": 0.21.5
+    "@esbuild/netbsd-x64": 0.21.5
+    "@esbuild/openbsd-x64": 0.21.5
+    "@esbuild/sunos-x64": 0.21.5
+    "@esbuild/win32-arm64": 0.21.5
+    "@esbuild/win32-ia32": 0.21.5
+    "@esbuild/win32-x64": 0.21.5
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 2911c7b50b23a9df59a7d6d4cdd3a4f85855787f374dce751148dbb13305e0ce7e880dde1608c2ab7a927fc6cec3587b80995f7fc87a64b455f8b70b55fd8ec1
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:esbuild-wasm@^0.15.15":
   version: 0.15.18
   resolution: "esbuild-wasm@npm:0.15.18"
@@ -26281,10 +28314,93 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1, escalade@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "escalade@npm:3.1.2"
-  checksum: 1ec0977aa2772075493002bdbd549d595ff6e9393b1cb0d7d6fcaf78c750da0c158f180938365486f75cb69fba20294351caddfce1b46552a7b6c3cde52eaa02
+"esbuild@npm:esbuild@>=0.17.6 <0.24.0":
+  version: 0.23.1
+  resolution: "esbuild@npm:0.23.1"
+  dependencies:
+    "@esbuild/aix-ppc64": 0.23.1
+    "@esbuild/android-arm": 0.23.1
+    "@esbuild/android-arm64": 0.23.1
+    "@esbuild/android-x64": 0.23.1
+    "@esbuild/darwin-arm64": 0.23.1
+    "@esbuild/darwin-x64": 0.23.1
+    "@esbuild/freebsd-arm64": 0.23.1
+    "@esbuild/freebsd-x64": 0.23.1
+    "@esbuild/linux-arm": 0.23.1
+    "@esbuild/linux-arm64": 0.23.1
+    "@esbuild/linux-ia32": 0.23.1
+    "@esbuild/linux-loong64": 0.23.1
+    "@esbuild/linux-mips64el": 0.23.1
+    "@esbuild/linux-ppc64": 0.23.1
+    "@esbuild/linux-riscv64": 0.23.1
+    "@esbuild/linux-s390x": 0.23.1
+    "@esbuild/linux-x64": 0.23.1
+    "@esbuild/netbsd-x64": 0.23.1
+    "@esbuild/openbsd-arm64": 0.23.1
+    "@esbuild/openbsd-x64": 0.23.1
+    "@esbuild/sunos-x64": 0.23.1
+    "@esbuild/win32-arm64": 0.23.1
+    "@esbuild/win32-ia32": 0.23.1
+    "@esbuild/win32-x64": 0.23.1
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-arm64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 0413c3b9257327fb598427688b7186ea335bf1693746fe5713cc93c95854d6388b8ed4ad643fddf5b5ace093f7dcd9038dd58e087bf2da1f04dfb4c5571660af
+  languageName: node
+  linkType: hard
+
+"escalade@npm:^3.1.1, escalade@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "escalade@npm:3.2.0"
+  checksum: 47b029c83de01b0d17ad99ed766347b974b0d628e848de404018f3abee728e987da0d2d370ad4574aa3d5b5bfc368754fd085d69a30f8e75903486ec4b5b709e
   languageName: node
   linkType: hard
 
@@ -26302,13 +28418,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:5.0.0, escape-string-regexp@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "escape-string-regexp@npm:5.0.0"
-  checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
-  languageName: node
-  linkType: hard
-
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
@@ -26330,6 +28439,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escape-string-regexp@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "escape-string-regexp@npm:5.0.0"
+  checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
+  languageName: node
+  linkType: hard
+
 "escodegen@npm:^1.8.1":
   version: 1.14.3
   resolution: "escodegen@npm:1.14.3"
@@ -26458,8 +28574,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jest@npm:^28.0.0":
-  version: 28.8.3
-  resolution: "eslint-plugin-jest@npm:28.8.3"
+  version: 28.9.0
+  resolution: "eslint-plugin-jest@npm:28.9.0"
   dependencies:
     "@typescript-eslint/utils": ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependencies:
@@ -26471,15 +28587,15 @@ __metadata:
       optional: true
     jest:
       optional: true
-  checksum: e371fcbe2127a403824b6c23b66f6b2e2cc54074c3c70a9965d48bdcdfb461670965a7d7cdddab68f09e703d3a09a281d05591b1cb4315f5246d27fd8baa84ac
+  checksum: 90863fab5f3f2f033d98042b13769dc82504c489506872ae9926a1d2b6bcc25c5dc41105e28643f5eb81943aff1aa1cd4d44ada5c1add0a43f1c7a619adbc3d2
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsx-a11y@npm:^6.5.1":
-  version: 6.10.0
-  resolution: "eslint-plugin-jsx-a11y@npm:6.10.0"
+  version: 6.10.2
+  resolution: "eslint-plugin-jsx-a11y@npm:6.10.2"
   dependencies:
-    aria-query: ~5.1.3
+    aria-query: ^5.3.2
     array-includes: ^3.1.8
     array.prototype.flatmap: ^1.3.2
     ast-types-flow: ^0.0.8
@@ -26487,17 +28603,16 @@ __metadata:
     axobject-query: ^4.1.0
     damerau-levenshtein: ^1.0.8
     emoji-regex: ^9.2.2
-    es-iterator-helpers: ^1.0.19
     hasown: ^2.0.2
     jsx-ast-utils: ^3.3.5
     language-tags: ^1.0.9
     minimatch: ^3.1.2
     object.fromentries: ^2.0.8
     safe-regex-test: ^1.0.3
-    string.prototype.includes: ^2.0.0
+    string.prototype.includes: ^2.0.1
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
-  checksum: 1009deca12ddbe3624586bc5fc3534ca98d00a5841a2563cb6abd9339b984f0a99075dc2a703a517f4087eb84d659c87e60beda17645883de2ba1d86f2b20c96
+  checksum: 0cc861398fa26ada61ed5703eef5b335495fcb96253263dcd5e399488ff019a2636372021baacc040e3560d1a34bfcd5d5ad9f1754f44cd0509c956f7df94050
   languageName: node
   linkType: hard
 
@@ -26524,15 +28639,15 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.28.0":
-  version: 7.36.1
-  resolution: "eslint-plugin-react@npm:7.36.1"
+  version: 7.37.2
+  resolution: "eslint-plugin-react@npm:7.37.2"
   dependencies:
     array-includes: ^3.1.8
     array.prototype.findlast: ^1.2.5
     array.prototype.flatmap: ^1.3.2
     array.prototype.tosorted: ^1.1.4
     doctrine: ^2.1.0
-    es-iterator-helpers: ^1.0.19
+    es-iterator-helpers: ^1.1.0
     estraverse: ^5.3.0
     hasown: ^2.0.2
     jsx-ast-utils: ^2.4.1 || ^3.0.0
@@ -26547,18 +28662,31 @@ __metadata:
     string.prototype.repeat: ^1.0.0
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
-  checksum: bf3be414f3d639200a7d91feeaa6beec3397feed93ab22eaecef44dda37ecbd01812ed1720c72a9861fb276d3543cea69a834a66f64de3d878796fef4f4bf129
+  checksum: 7f5203afee7fbe3702b27fdd2b9a3c0ccbbb47d0672f58311b9d8a08dea819c9da4a87c15e8bd508f2562f327a9d29ee8bd9cd189bf758d8dc903de5648b0bfa
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-storybook@npm:^0.11.1":
+  version: 0.11.1
+  resolution: "eslint-plugin-storybook@npm:0.11.1"
+  dependencies:
+    "@storybook/csf": ^0.1.11
+    "@typescript-eslint/utils": ^8.8.1
+    ts-dedent: ^2.2.0
+  peerDependencies:
+    eslint: ">=6"
+  checksum: 8b8eb30b598f3c44c2bbf921e318215338f1159c1fba2d2f6cd5bc0b2ec14515655cf1760b5e11355baddabc2ac8446d4dc18ee6df6d2252555b126ff649a421
   languageName: node
   linkType: hard
 
 "eslint-plugin-testing-library@npm:^6.0.0":
-  version: 6.4.0
-  resolution: "eslint-plugin-testing-library@npm:6.4.0"
+  version: 6.5.0
+  resolution: "eslint-plugin-testing-library@npm:6.5.0"
   dependencies:
     "@typescript-eslint/utils": ^5.62.0
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0 || ^9.0.0
-  checksum: cfaaf0582375efb15821d3bcc2d571ffcb7d23c4f66677b9fc921cf853ec0b2a38bae9e31b566db2c55952444ad8064ef2996ca82a3312bc7e2d79537be56b19
+  checksum: 1ac544314b448541a3a3ecf73b21341e0a8b7b0566f3966f22e3de16de67d5ae830c43f5ccbf0d3ed5ffdaaccd7215487da930d7d87fac35cb671a875bfe4051
   languageName: node
   linkType: hard
 
@@ -26611,6 +28739,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "eslint-visitor-keys@npm:4.2.0"
+  checksum: 779c604672b570bb4da84cef32f6abb085ac78379779c1122d7879eade8bb38ae715645324597cf23232d03cef06032c9844d25c73625bc282a5bfd30247e5b5
+  languageName: node
+  linkType: hard
+
 "eslint-webpack-plugin@npm:^4.0.0":
   version: 4.2.0
   resolution: "eslint-webpack-plugin@npm:4.2.0"
@@ -26771,6 +28906,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "estree-walker@npm:3.0.3"
+  dependencies:
+    "@types/estree": ^1.0.0
+  checksum: a65728d5727b71de172c5df323385755a16c0fdab8234dc756c3854cfee343261ddfbb72a809a5660fac8c75d960bb3e21aa898c2d7e9b19bb298482ca58a3af
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
@@ -26785,6 +28929,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eval@npm:0.1.8":
+  version: 0.1.8
+  resolution: "eval@npm:0.1.8"
+  dependencies:
+    "@types/node": "*"
+    require-like: ">= 0.1.1"
+  checksum: d005567f394cfbe60948e34982e4637d2665030f9aa7dcac581ea6f9ec6eceb87133ed3dc0ae21764aa362485c242a731dbb6371f1f1a86807c58676431e9d1a
+  languageName: node
+  linkType: hard
+
 "event-emitter@npm:^0.3.5":
   version: 0.3.5
   resolution: "event-emitter@npm:0.3.5"
@@ -27010,7 +29164,6 @@ __metadata:
     "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "workspace:^"
     "@backstage/plugin-catalog-backend-module-unprocessed": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
-    "@backstage/plugin-devtools-backend": "workspace:^"
     "@backstage/plugin-events-backend": "workspace:^"
     "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-kubernetes-backend": "workspace:^"
@@ -27091,9 +29244,9 @@ __metadata:
     "@backstage/plugin-search-backend-node": "workspace:^"
     "@backstage/plugin-signals-backend": "workspace:^"
     "@backstage/plugin-techdocs-backend": "workspace:^"
-    "@opentelemetry/auto-instrumentations-node": ^0.51.0
-    "@opentelemetry/exporter-prometheus": ^0.53.0
-    "@opentelemetry/sdk-node": ^0.53.0
+    "@opentelemetry/auto-instrumentations-node": ^0.54.0
+    "@opentelemetry/exporter-prometheus": ^0.54.0
+    "@opentelemetry/sdk-node": ^0.54.0
     example-app: "link:../app"
   languageName: unknown
   linkType: soft
@@ -27214,8 +29367,8 @@ __metadata:
   linkType: hard
 
 "express-openapi-validator@npm:^5.0.4":
-  version: 5.3.7
-  resolution: "express-openapi-validator@npm:5.3.7"
+  version: 5.3.9
+  resolution: "express-openapi-validator@npm:5.3.9"
   dependencies:
     "@apidevtools/json-schema-ref-parser": ^11.7.0
     "@types/multer": ^1.4.12
@@ -27232,7 +29385,7 @@ __metadata:
     path-to-regexp: ^8.1.0
   peerDependencies:
     express: "*"
-  checksum: 28be61484f68bbad3f2ec8304bf310e1c962ceefd21b9feea5e52187670715257a30e1d87173c773e36b1a182a10760ca16987f16649bf0b91f4bcca0b58cfbd
+  checksum: 0469b383b769f070dfad9c9148b18857c5aaa9aa14c596e1ada155dac63e1c355e455d42f3c81af62c4aefd3db4ad8b892d34a432e170e4eb7af73d7dbd2f644
   languageName: node
   linkType: hard
 
@@ -27284,8 +29437,8 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.14.0, express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2":
-  version: 4.21.1
-  resolution: "express@npm:4.21.1"
+  version: 4.21.2
+  resolution: "express@npm:4.21.2"
   dependencies:
     accepts: ~1.3.8
     array-flatten: 1.1.1
@@ -27306,7 +29459,7 @@ __metadata:
     methods: ~1.1.2
     on-finished: 2.4.1
     parseurl: ~1.3.3
-    path-to-regexp: 0.1.10
+    path-to-regexp: 0.1.12
     proxy-addr: ~2.0.7
     qs: 6.13.0
     range-parser: ~1.2.1
@@ -27318,7 +29471,7 @@ __metadata:
     type-is: ~1.6.18
     utils-merge: 1.0.1
     vary: ~1.1.2
-  checksum: 5ac2b26d8aeddda5564fc0907227d29c100f90c0ead2ead9d474dc5108e8fb306c2de2083c4e3ba326e0906466f2b73417dbac16961f4075ff9f03785fd940fe
+  checksum: 3aef1d355622732e20b8f3a7c112d4391d44e2131f4f449e1f273a309752a41abfad714e881f177645517cbe29b3ccdc10b35e7e25c13506114244a5b72f549d
   languageName: node
   linkType: hard
 
@@ -27584,6 +29737,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fdir@npm:^6.4.2":
+  version: 6.4.2
+  resolution: "fdir@npm:6.4.2"
+  peerDependencies:
+    picomatch: ^3 || ^4
+  peerDependenciesMeta:
+    picomatch:
+      optional: true
+  checksum: 517ad31c495f1c0778238eef574a7818788efaaf2ce1969ffa18c70793e2951a9763dfa2e6720b8fcef615e602a3cbb47f9b8aea9da0b02147579ab36043f22f
+  languageName: node
+  linkType: hard
+
 "fecha@npm:^4.2.0":
   version: 4.2.0
   resolution: "fecha@npm:4.2.0"
@@ -27598,7 +29763,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"figures@npm:^3.0.0, figures@npm:^3.2.0":
+"figures@npm:^3.0.0":
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
   dependencies:
@@ -27650,6 +29815,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filesize@npm:^10.0.12":
+  version: 10.1.6
+  resolution: "filesize@npm:10.1.6"
+  checksum: a797a9d41c8f27a9ae334d23f99fc5d903eac5d03c82190dc163901205435b56626fe1260c779ba3e87a2a34d426f19ff264c3f7d956e00f2d3ac69760b52e33
+  languageName: node
+  linkType: hard
+
 "filesize@npm:^8.0.6":
   version: 8.0.6
   resolution: "filesize@npm:8.0.6"
@@ -27714,6 +29886,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-cache-dir@npm:^3.3.1":
+  version: 3.3.2
+  resolution: "find-cache-dir@npm:3.3.2"
+  dependencies:
+    commondir: ^1.0.1
+    make-dir: ^3.0.2
+    pkg-dir: ^4.1.0
+  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
+  languageName: node
+  linkType: hard
+
 "find-file-up@npm:^2.0.1":
   version: 2.0.1
   resolution: "find-file-up@npm:2.0.1"
@@ -27833,6 +30016,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flat@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "flat@npm:5.0.2"
+  bin:
+    flat: cli.js
+  checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
+  languageName: node
+  linkType: hard
+
 "flatstr@npm:^1.0.12":
   version: 1.0.12
   resolution: "flatstr@npm:1.0.12"
@@ -27840,10 +30032,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flatted@npm:3.3.1, flatted@npm:^3.1.0, flatted@npm:^3.2.7":
-  version: 3.3.1
-  resolution: "flatted@npm:3.3.1"
-  checksum: 85ae7181650bb728c221e7644cbc9f4bf28bc556f2fc89bb21266962bdf0ce1029cc7acc44bb646cd469d9baac7c317f64e841c4c4c00516afa97320cdac7f94
+"flatted@npm:3.3.2, flatted@npm:^3.1.0, flatted@npm:^3.2.7":
+  version: 3.3.2
+  resolution: "flatted@npm:3.3.2"
+  checksum: ac3c159742e01d0e860a861164bcfd35bb567ccbebb8a0dd041e61cf3c64a435b917dd1e7ed1c380c2ebca85735fb16644485ec33665bc6aafc3b316aa1eed44
   languageName: node
   linkType: hard
 
@@ -27947,6 +30139,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fork-ts-checker-webpack-plugin@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "fork-ts-checker-webpack-plugin@npm:8.0.0"
+  dependencies:
+    "@babel/code-frame": ^7.16.7
+    chalk: ^4.1.2
+    chokidar: ^3.5.3
+    cosmiconfig: ^7.0.1
+    deepmerge: ^4.2.2
+    fs-extra: ^10.0.0
+    memfs: ^3.4.1
+    minimatch: ^3.0.4
+    node-abort-controller: ^3.0.1
+    schema-utils: ^3.1.1
+    semver: ^7.3.5
+    tapable: ^2.2.1
+  peerDependencies:
+    typescript: ">3.6.0"
+    webpack: ^5.11.0
+  checksum: aad4cbc5b802e6281a2700a379837697c93ad95288468f9595219d91d9c26674736d37852bb4c4341e9122f26181e9e05fc1a362e8d029fdd88e99de7816037b
+  languageName: node
+  linkType: hard
+
 "fork-ts-checker-webpack-plugin@npm:^9.0.0":
   version: 9.0.2
   resolution: "fork-ts-checker-webpack-plugin@npm:9.0.2"
@@ -27988,17 +30203,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "form-data@npm:3.0.0"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: 60ec3fe7e23154949ab6fef31baedf5afbfb8d6441ea8d19b211b43a5d0448be2918c9bba6218cade56a7cbd43f670d6e75f41f626f8d397d56bf8c60f4a829d
-  languageName: node
-  linkType: hard
-
 "form-data@npm:^4.0.0":
   version: 4.0.0
   resolution: "form-data@npm:4.0.0"
@@ -28049,6 +30253,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"forwarded-parse@npm:2.1.2":
+  version: 2.1.2
+  resolution: "forwarded-parse@npm:2.1.2"
+  checksum: fca4df8898248d123d9d29a9fdf48005dd757366c2c17c1e195e8311a9aa89caf9f5e592f58f7d3d635087675ff39e85c32c6205838510f6f1fa4109de519930
+  languageName: node
+  linkType: hard
+
 "forwarded@npm:0.2.0":
   version: 0.2.0
   resolution: "forwarded@npm:0.2.0"
@@ -28310,15 +30521,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gaxios@npm:^6.0.0, gaxios@npm:^6.0.2, gaxios@npm:^6.1.1":
-  version: 6.3.0
-  resolution: "gaxios@npm:6.3.0"
+"gaxios@npm:^6.0.0, gaxios@npm:^6.0.2, gaxios@npm:^6.0.3, gaxios@npm:^6.1.1":
+  version: 6.7.1
+  resolution: "gaxios@npm:6.7.1"
   dependencies:
     extend: ^3.0.2
     https-proxy-agent: ^7.0.1
     is-stream: ^2.0.0
     node-fetch: ^2.6.9
-  checksum: 4d4a8db32d833f8012435e2016cb0c919cac288e821bf81f877504e4284ef12b444cd903448e738c4031cd5219adf1e8d68e7df2b3dba774db9fde27f71109d4
+    uuid: ^9.0.1
+  checksum: ed5952655339918e0868c6f4e079d6e9e55b20a242ddb1be25076cdfb0dd1ca5a2cb233da7352baa972c19f898a78fa6ba67e7d848717c9ca9877c269b5b02f7
   languageName: node
   linkType: hard
 
@@ -28350,6 +30562,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"generic-pool@npm:3.9.0":
+  version: 3.9.0
+  resolution: "generic-pool@npm:3.9.0"
+  checksum: 3d89e9b2018d2e3bbf44fec78c76b2b7d56d6a484237aa9daf6ff6eedb14b0899dadd703b5d810219baab2eb28e5128fb18b29e91e602deb2eccac14492d8ca8
+  languageName: node
+  linkType: hard
+
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
@@ -28371,7 +30590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -28444,6 +30663,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-stream@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "get-stream@npm:9.0.1"
+  dependencies:
+    "@sec-ant/readable-stream": ^0.4.1
+    is-stream: ^4.0.1
+  checksum: 631df71d7bd60a7f373094d3c352e2ce412b82d30b1b0ec562e5a4aced976173a4cc0dabef019050e1aceaffb1f0e086349ab3d14377b0b7280510bd75bd3e1e
+  languageName: node
+  linkType: hard
+
 "get-symbol-description@npm:^1.0.2":
   version: 1.0.2
   resolution: "get-symbol-description@npm:1.0.2"
@@ -28706,12 +30935,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "globalthis@npm:1.0.3"
+"globals@npm:^15.11.0":
+  version: 15.12.0
+  resolution: "globals@npm:15.12.0"
+  checksum: 2a134cc876dd73192489561e3c85be348dc1408fef043ebef605cdc437f64cd2fc922268db02e3348683d05d06bed10fb1c3653b3d4399a204a7ecd59e742a07
+  languageName: node
+  linkType: hard
+
+"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3, globalthis@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "globalthis@npm:1.0.4"
   dependencies:
-    define-properties: ^1.1.3
-  checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998
+    define-properties: ^1.2.1
+    gopd: ^1.0.1
+  checksum: 39ad667ad9f01476474633a1834a70842041f70a55571e8dcef5fb957980a92da5022db5430fca8aecc5d47704ae30618c0bc877a579c70710c904e9ef06108a
   languageName: node
   linkType: hard
 
@@ -28736,16 +30973,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^13.1.2":
-  version: 13.1.3
-  resolution: "globby@npm:13.1.3"
+"globby@npm:^14.0.2":
+  version: 14.0.2
+  resolution: "globby@npm:14.0.2"
   dependencies:
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.11
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^4.0.0
-  checksum: 93f06e02002cdf368f7e3d55bd59e7b00784c7cc8fe92c7ee5082cc7171ff6109fda45e1c97a80bb48bc811dedaf7843c7c9186f5f84bde4883ab630e13c43df
+    "@sindresorhus/merge-streams": ^2.1.0
+    fast-glob: ^3.3.2
+    ignore: ^5.2.4
+    path-type: ^5.0.0
+    slash: ^5.1.0
+    unicorn-magic: ^0.1.0
+  checksum: 2cee79efefca4383a825fc2fcbdb37e5706728f2d39d4b63851927c128fff62e6334ef7d4d467949d411409ad62767dc2d214e0f837a0f6d4b7290b6711d485c
   languageName: node
   linkType: hard
 
@@ -28765,9 +31003,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-auth-library@npm:^9.0.0, google-auth-library@npm:^9.3.0, google-auth-library@npm:^9.6.3":
-  version: 9.14.2
-  resolution: "google-auth-library@npm:9.14.2"
+"google-auth-library@npm:^9.0.0, google-auth-library@npm:^9.2.0, google-auth-library@npm:^9.3.0, google-auth-library@npm:^9.6.3, google-auth-library@npm:^9.7.0":
+  version: 9.15.0
+  resolution: "google-auth-library@npm:9.15.0"
   dependencies:
     base64-js: ^1.3.0
     ecdsa-sig-formatter: ^1.0.11
@@ -28775,7 +31013,7 @@ __metadata:
     gcp-metadata: ^6.1.0
     gtoken: ^7.0.0
     jws: ^4.0.0
-  checksum: 64b3a6c1b1b14f1c891dbcfb850bc4db63dc8fae17e70197636244d00c83b539ac3da8688aae0bd1f09c884fc538d203945ae751edbabf666b41066385d86e30
+  checksum: 7ff63ff755ce43601a1780cfbe6d8b523792bfd2b653a27180e41735b9f0ba5689668eb8b079c915300041e412ec00b7635b5c26e0f2139fecacb346b6f9f12f
   languageName: node
   linkType: hard
 
@@ -28806,6 +31044,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"googleapis-common@npm:^7.0.0":
+  version: 7.2.0
+  resolution: "googleapis-common@npm:7.2.0"
+  dependencies:
+    extend: ^3.0.2
+    gaxios: ^6.0.3
+    google-auth-library: ^9.7.0
+    qs: ^6.7.0
+    url-template: ^2.0.8
+    uuid: ^9.0.0
+  checksum: 58f520134c9d6f439ef81919471689f0278ef0ffdbd50c693a59282d95141be74df3a5614c25347c140fc44201e0ef998300389f4cbf51502f2351e67c758ab6
+  languageName: node
+  linkType: hard
+
 "gopd@npm:^1.0.1":
   version: 1.0.1
   resolution: "gopd@npm:1.0.1"
@@ -29353,15 +31605,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "html-encoding-sniffer@npm:2.0.1"
-  dependencies:
-    whatwg-encoding: ^1.0.5
-  checksum: bf30cce461015ed7e365736fcd6a3063c7bc016a91f74398ef6158886970a96333938f7c02417ab3c12aa82e3e53b40822145facccb9ddfbcdc15a879ae4d7ba
-  languageName: node
-  linkType: hard
-
 "html-encoding-sniffer@npm:^3.0.0":
   version: 3.0.0
   resolution: "html-encoding-sniffer@npm:3.0.0"
@@ -29371,6 +31614,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "html-encoding-sniffer@npm:4.0.0"
+  dependencies:
+    whatwg-encoding: ^3.1.1
+  checksum: 3339b71dab2723f3159a56acf541ae90a408ce2d11169f00fe7e0c4663d31d6398c8a4408b504b4eec157444e47b084df09b3cb039c816660f0dd04846b8957d
+  languageName: node
+  linkType: hard
+
 "html-entities@npm:^2.1.0, html-entities@npm:^2.4.0, html-entities@npm:^2.5.2":
   version: 2.5.2
   resolution: "html-entities@npm:2.5.2"
@@ -29402,9 +31654,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:^5.3.1":
-  version: 5.6.2
-  resolution: "html-webpack-plugin@npm:5.6.2"
+"html-webpack-plugin@npm:^5.5.0, html-webpack-plugin@npm:^5.6.3":
+  version: 5.6.3
+  resolution: "html-webpack-plugin@npm:5.6.3"
   dependencies:
     "@types/html-minifier-terser": ^6.0.0
     html-minifier-terser: ^6.0.2
@@ -29419,7 +31671,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: c579ce8b34ef1cd903829402aa6a62a6c92fe1cdfcd81d17ebc87f39eaab1381438b9d805a63457b255238db8f2865d71f48cd382375aa28718881e3ab2d2f9a
+  checksum: 59e7d971b0cfd9ba34c7acaa3c161e43c62596474dd8cd35d7b690498ff5891f21296de0aa1d2e7810348caa657e938461267155dda47913b5eeca7124406270
   languageName: node
   linkType: hard
 
@@ -29548,7 +31800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^7.0.0":
+"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.1, http-proxy-agent@npm:^7.0.2":
   version: 7.0.2
   resolution: "http-proxy-agent@npm:7.0.2"
   dependencies:
@@ -29646,16 +31898,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:7.0.5, https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
-  version: 7.0.5
-  resolution: "https-proxy-agent@npm:7.0.5"
-  dependencies:
-    agent-base: ^7.0.2
-    debug: 4
-  checksum: 2e1a28960f13b041a50702ee74f240add8e75146a5c37fc98f1960f0496710f6918b3a9fe1e5aba41e50f58e6df48d107edd9c405c5f0d73ac260dabf2210857
-  languageName: node
-  linkType: hard
-
 "https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
@@ -29666,6 +31908,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.3, https-proxy-agent@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: 4
+  checksum: 2e1a28960f13b041a50702ee74f240add8e75146a5c37fc98f1960f0496710f6918b3a9fe1e5aba41e50f58e6df48d107edd9c405c5f0d73ac260dabf2210857
+  languageName: node
+  linkType: hard
+
 "human-id@npm:^1.0.2":
   version: 1.0.2
   resolution: "human-id@npm:1.0.2"
@@ -29704,11 +31956,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.0":
-  version: 9.1.6
-  resolution: "husky@npm:9.1.6"
+  version: 9.1.7
+  resolution: "husky@npm:9.1.7"
   bin:
     husky: bin.js
-  checksum: 421ccd8850378231aaefd70dbe9e4f1549b84ffe3a6897f93a202242bbc04e48bd498169aef43849411105d9fcf7c192b757d42661e28d06b934a609a4eb8771
+  checksum: c2412753f15695db369634ba70f50f5c0b7e5cb13b673d0826c411ec1bd9ddef08c1dad89ea154f57da2521d2605bd64308af748749b27d08c5f563bcd89975f
   languageName: node
   linkType: hard
 
@@ -29762,10 +32014,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"idb-keyval@npm:5.0.2":
-  version: 5.0.2
-  resolution: "idb-keyval@npm:5.0.2"
-  checksum: 64ce4049fcfa9ffc8ddd23897a59278bd60420bcaff88ca653c63b725f8d6228a956bd7f474cea21befedd5abdb1bc8058ca1db5a12c4145605291dadadedbf1
+"idb-keyval@npm:5.1.5":
+  version: 5.1.5
+  resolution: "idb-keyval@npm:5.1.5"
+  dependencies:
+    safari-14-idb-fix: ^1.0.6
+  checksum: 6d71d975c5392ddce934a3617b169c25d3b3204f5203d2ffa182c253515922c787292d61eb738aa25ab80fa390e541a416376a6d62a0a2fe7cf112a758f2d8d9
   languageName: node
   linkType: hard
 
@@ -29918,13 +32172,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"indent-string@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "indent-string@npm:5.0.0"
-  checksum: e466c27b6373440e6d84fbc19e750219ce25865cb82d578e41a6053d727e5520dc5725217d6eb1cc76005a1bb1696a0f106d84ce7ebda3033b963a38583fb3b3
-  languageName: node
-  linkType: hard
-
 "infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
@@ -30066,7 +32313,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7":
+"internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
   dependencies:
@@ -30127,6 +32374,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: 1.1.0
+    sprintf-js: ^1.1.3
+  checksum: aa15f12cfd0ef5e38349744e3654bae649a34c3b10c77a674a167e99925d1549486c5b14730eebce9fea26f6db9d5e42097b00aa4f9f612e68c79121c71652dc
+  languageName: node
+  linkType: hard
+
 "ip-regex@npm:^4.1.0":
   version: 4.3.0
   resolution: "ip-regex@npm:4.3.0"
@@ -30134,20 +32391,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^1.1.8":
-  version: 1.1.9
-  resolution: "ip@npm:1.1.9"
-  checksum: b6d91fd45a856e3bd6d4f601ea0619d90f3517638f6918ebd079f959a8a6308568d8db5ef4fdf037e0d9cfdcf264f46833dfeea81ca31309cf0a7eb4b1307b84
-  languageName: node
-  linkType: hard
-
-"ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
-  languageName: node
-  linkType: hard
-
 "ipaddr.js@npm:1.9.1":
   version: 1.9.1
   resolution: "ipaddr.js@npm:1.9.1"
@@ -30212,7 +32455,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+"is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
@@ -30222,7 +32465,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.2, is-array-buffer@npm:^3.0.4":
+"is-array-buffer@npm:^3.0.4":
   version: 3.0.4
   resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
@@ -30506,7 +32749,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+"is-map@npm:^2.0.1":
   version: 2.0.3
   resolution: "is-map@npm:2.0.3"
   checksum: e6ce5f6380f32b141b3153e6ba9074892bbbbd655e92e7ba5ff195239777e767a976dcd4e22f864accaf30e53ebf961ab1995424aef91af68788f0591b7396cc
@@ -30709,7 +32952,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+"is-set@npm:^2.0.1":
   version: 2.0.3
   resolution: "is-set@npm:2.0.3"
   checksum: 36e3f8c44bdbe9496c9689762cc4110f6a6a12b767c5d74c0398176aa2678d4467e3bf07595556f2dba897751bde1422480212b97d973c7b08a343100b0c0dfe
@@ -30755,6 +32998,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-stream@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "is-stream@npm:4.0.1"
+  checksum: cbea3f1fc271b21ceb228819d0c12a0965a02b57f39423925f99530b4eb86935235f258f06310b67cd02b2d10b49e9a0998f5ececf110ab7d3760bae4055ad23
+  languageName: node
+  linkType: hard
+
 "is-string@npm:^1.0.5, is-string@npm:^1.0.7":
   version: 1.0.7
   resolution: "is-string@npm:1.0.7"
@@ -30899,9 +33149,9 @@ __metadata:
   linkType: hard
 
 "isbinaryfile@npm:^5.0.0":
-  version: 5.0.3
-  resolution: "isbinaryfile@npm:5.0.3"
-  checksum: 950820d813a664a5c17dcb52e9a10454da4f51918369388be428de47a33f51de38637df2cff91a95f212551170c8045c2156c99bab23a042ab3ef1a775bee1b9
+  version: 5.0.4
+  resolution: "isbinaryfile@npm:5.0.4"
+  checksum: d88982a889369d83a5937b4b4d2288ed3b3dbbcee8fc74db40058f3c089a2c7beb9e5305b7177e82d87ff38fb62be8d60960f7a2d669ca08240ef31c1435b884
   languageName: node
   linkType: hard
 
@@ -30926,24 +33176,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isolated-vm@npm:^4.5.0":
-  version: 4.7.2
-  resolution: "isolated-vm@npm:4.7.2"
+"isolated-vm@npm:^5.0.1":
+  version: 5.0.2
+  resolution: "isolated-vm@npm:5.0.2"
   dependencies:
     node-gyp: latest
-    prebuild-install: ^7.1.1
-  checksum: 16f43f6413623dc7009a8bb9fa567fb30ffc151e21e9a7ae616f25626e750ba823527fb24e2e17408943c6bbbcc7235db89f41262d43a8d8155ad99e888b0760
+    prebuild-install: ^7.1.2
+  checksum: 065f19ecb2e43393e6833321105bfa5911d82d0165e25beeb779bb6a262e1401dd387c900bcc3ad706eb7e73f5c5d57ca16ef7e2ee710e62e86b2a5ef39ce76b
   languageName: node
   linkType: hard
 
-"isomorphic-dompurify@npm:^0.13.0":
-  version: 0.13.0
-  resolution: "isomorphic-dompurify@npm:0.13.0"
+"isomorphic-dompurify@npm:^2.14.0":
+  version: 2.16.0
+  resolution: "isomorphic-dompurify@npm:2.16.0"
   dependencies:
-    "@types/dompurify": ^2.1.0
-    dompurify: ^2.2.7
-    jsdom: ^16.5.2
-  checksum: 144069c00c5ec2c8a9b5bca0abc8d1f5f091bb791564d5e8495cb7d45a4b23899fb7fda4fb91cbb80e3651f300df29a7b3225c0ae22071a56ac6e5362e8afbe3
+    "@types/dompurify": ^3.0.5
+    dompurify: ^3.1.7
+    jsdom: ^25.0.1
+  checksum: cd175e8603f12bab14f3f2dbc511ede2b9ed6461e796aa971377b7f6df5cf5861e899513969a96e8e99631afeb4c95ac837f1c17b2d220b81a6f32c603f56ffc
   languageName: node
   linkType: hard
 
@@ -30957,8 +33207,8 @@ __metadata:
   linkType: hard
 
 "isomorphic-git@npm:^1.23.0":
-  version: 1.27.1
-  resolution: "isomorphic-git@npm:1.27.1"
+  version: 1.27.2
+  resolution: "isomorphic-git@npm:1.27.2"
   dependencies:
     async-lock: ^1.4.1
     clean-git-ref: ^2.0.1
@@ -30967,13 +33217,21 @@ __metadata:
     ignore: ^5.1.4
     minimisted: ^2.0.0
     pako: ^1.0.10
+    path-browserify: ^1.0.1
     pify: ^4.0.1
     readable-stream: ^3.4.0
     sha.js: ^2.4.9
     simple-get: ^4.0.1
   bin:
     isogit: cli.cjs
-  checksum: ba6f3c10b3160dac74185881f1da1c5a9b6cbd32d5f273ebce7291055566e5c58f466f89be9039e9c83ededd86a69e367bc4050262bbfbc6b785eea211a7f923
+  checksum: 93077ba9192a67a9c2ebc3d4d00d7647cc6a20c546bd2c4fce6716cc5c2ce7772eb16b5493ab77fe3331eddb8b43d6f58855293a1dd5536130e7c6a60d9d4125
+  languageName: node
+  linkType: hard
+
+"isomorphic-rslog@npm:0.0.6":
+  version: 0.0.6
+  resolution: "isomorphic-rslog@npm:0.0.6"
+  checksum: 20ee7ebedecf32a5504b733dd7065780e98434aa64c5ba5d330ae1b5769bb26601f9cb4b70b195e17eaf62c40264396b5431ef371cd32eb2c0c83a5474d59eea
   languageName: node
   linkType: hard
 
@@ -31088,16 +33346,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iterator.prototype@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "iterator.prototype@npm:1.1.2"
+"iterator.prototype@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "iterator.prototype@npm:1.1.3"
   dependencies:
     define-properties: ^1.2.1
     get-intrinsic: ^1.2.1
     has-symbols: ^1.0.3
     reflect.getprototypeof: ^1.0.4
     set-function-name: ^2.0.1
-  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+  checksum: 7d2a1f8bcbba7b76f72e956faaf7b25405f4de54430c9d099992e6fb9d571717c3044604e8cdfb8e624cb881337d648030ee8b1541d544af8b338835e3f47ebe
   languageName: node
   linkType: hard
 
@@ -31128,6 +33386,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"javascript-stringify@npm:^2.0.1":
+  version: 2.1.0
+  resolution: "javascript-stringify@npm:2.1.0"
+  checksum: 009981ec84299da88795fc764221ed213e3d52251cc93a396430a7a02ae09f1163a9be36a36808689681a8e6113cf00fe97ec2eea2552df48111f79be59e9358
+  languageName: node
+  linkType: hard
+
 "jest-changed-files@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-changed-files@npm:29.7.0"
@@ -31650,12 +33915,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^2.0.0, jiti@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "jiti@npm:2.3.3"
+"jiti@npm:^2.0.0, jiti@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "jiti@npm:2.4.0"
   bin:
     jiti: lib/jiti-cli.mjs
-  checksum: f1a2b87d937569c966f00a8c9153c8f3e02445b31e034fdaed1b9639a4ecfae3c4df24c7644d5b4764c566f8dee09132a5b55cd049b48e618024accd31d8e6b3
+  checksum: b7d8c441214e48f6c1be2952a83f40e2b1eb6e94fe81b1fd89370d11a7e322c61eb3fbd9a8d47029e14338414091ebbb575e1a92c645ab30fea6240c5c4957c7
   languageName: node
   linkType: hard
 
@@ -31764,6 +34029,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 944f924f2bd67ad533b3850eee47603eed0f6ae425fd1ee8c760f477e8c34a05f144c1bd4f5a5dd1963141dc79a2c55f89ccc5ab77d039e7077f3ad196b64965
+  languageName: node
+  linkType: hard
+
 "jsbn@npm:~0.1.0":
   version: 0.1.1
   resolution: "jsbn@npm:0.1.1"
@@ -31826,43 +34098,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^16.5.2":
-  version: 16.7.0
-  resolution: "jsdom@npm:16.7.0"
-  dependencies:
-    abab: ^2.0.5
-    acorn: ^8.2.4
-    acorn-globals: ^6.0.0
-    cssom: ^0.4.4
-    cssstyle: ^2.3.0
-    data-urls: ^2.0.0
-    decimal.js: ^10.2.1
-    domexception: ^2.0.1
-    escodegen: ^2.0.0
-    form-data: ^3.0.0
-    html-encoding-sniffer: ^2.0.1
-    http-proxy-agent: ^4.0.1
-    https-proxy-agent: ^5.0.0
-    is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.0
-    parse5: 6.0.1
-    saxes: ^5.0.1
-    symbol-tree: ^3.2.4
-    tough-cookie: ^4.0.0
-    w3c-hr-time: ^1.0.2
-    w3c-xmlserializer: ^2.0.0
-    webidl-conversions: ^6.1.0
-    whatwg-encoding: ^1.0.5
-    whatwg-mimetype: ^2.3.0
-    whatwg-url: ^8.5.0
-    ws: ^7.4.6
-    xml-name-validator: ^3.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 454b83371857000763ed31130a049acd1b113e3b927e6dcd75c67ddc30cdd242d7ebcac5c2294b7a1a6428155cb1398709c573b3c6d809218692ea68edd93370
+"jsdoc-type-pratt-parser@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "jsdoc-type-pratt-parser@npm:4.1.0"
+  checksum: e7642a508b090b1bdf17775383000ed71013c38e1231c1e576e5374636e8baf7c3fae8bf0252f5e1d3397d95efd56e8c8a5dd1a0de76d05d1499cbcb3c325bc3
   languageName: node
   linkType: hard
 
@@ -31906,19 +34145,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsep@npm:^1.1.2, jsep@npm:^1.2.0":
-  version: 1.3.8
-  resolution: "jsep@npm:1.3.8"
-  checksum: d6de7f3bc3aa93e71b6a8fd5436db87efd11d7081230bf072c3359c5f9ff1e36dd01e4e09b09f10cacf35d5dbaf2f32ea5cf98ffe41717ea7bd489d580bbab83
+"jsdom@npm:^25.0.1":
+  version: 25.0.1
+  resolution: "jsdom@npm:25.0.1"
+  dependencies:
+    cssstyle: ^4.1.0
+    data-urls: ^5.0.0
+    decimal.js: ^10.4.3
+    form-data: ^4.0.0
+    html-encoding-sniffer: ^4.0.0
+    http-proxy-agent: ^7.0.2
+    https-proxy-agent: ^7.0.5
+    is-potential-custom-element-name: ^1.0.1
+    nwsapi: ^2.2.12
+    parse5: ^7.1.2
+    rrweb-cssom: ^0.7.1
+    saxes: ^6.0.0
+    symbol-tree: ^3.2.4
+    tough-cookie: ^5.0.0
+    w3c-xmlserializer: ^5.0.0
+    webidl-conversions: ^7.0.0
+    whatwg-encoding: ^3.1.1
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+    ws: ^8.18.0
+    xml-name-validator: ^5.0.0
+  peerDependencies:
+    canvas: ^2.11.2
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: b637d28445d570014195b3c77d06e54ef69d1f807eaf61388cb470e4d9227244e7fe2e0c32b6df03ac4fe35f746d7c721672d9136ecebb49d2e61a04ab9628e0
   languageName: node
   linkType: hard
 
-"jsesc@npm:^2.5.1":
-  version: 2.5.2
-  resolution: "jsesc@npm:2.5.2"
+"jsep@npm:^1.2.0, jsep@npm:^1.3.6, jsep@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "jsep@npm:1.4.0"
+  checksum: 8e7af5ecb91483b227092b87a3e85b5df3e848dbe6f201b19efcb18047567530d21dfeecb0978e09d1f66554fcfaed84176819eeacdfc86f61dc05c40c18f824
+  languageName: node
+  linkType: hard
+
+"jsesc@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "jsesc@npm:3.0.2"
   bin:
     jsesc: bin/jsesc
-  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
+  checksum: a36d3ca40574a974d9c2063bf68c2b6141c20da8f2a36bd3279fc802563f35f0527a6c828801295bdfb2803952cf2cf387786c2c90ed564f88d5782475abfe3c
   languageName: node
   linkType: hard
 
@@ -32076,12 +34349,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json11@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "json11@npm:1.1.2"
+"json11@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "json11@npm:2.0.0"
   bin:
     json11: dist/cli.mjs
-  checksum: 5f447f6d5cba0c4ae739c3da46c86921e2dc862db0106b3960e1c79f178e53c94ac54e61f401518fa55cdcff4b264a03f2234a33a591b8b4eb281aba44afd056
+  checksum: 5cfed82fed39dc34ce25280f4b50d057b2a72685583fee0f617cb1b9d22f045b1263ae970efc4604e0f465b36b6315aa897e28259e942bd87250f106f46259c7
   languageName: node
   linkType: hard
 
@@ -32096,7 +34369,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.1.3, json5@npm:^2.2.3":
+"json5@npm:^2.1.2, json5@npm:^2.1.3, json5@npm:^2.2.2, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -32131,7 +34404,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^6.0.1":
+"jsonfile@npm:^6.0.1, jsonfile@npm:^6.1.0":
   version: 6.1.0
   resolution: "jsonfile@npm:6.1.0"
   dependencies:
@@ -32158,17 +34431,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonpath-plus@npm:7.1.0":
-  version: 7.1.0
-  resolution: "jsonpath-plus@npm:7.1.0"
-  checksum: a4005dc860c6b7e339229842537ceb6eb839d87a3447f989792b9c64f2564bbbd40663515f9481fb5a1b6cb0f988afba5b0b150e0285c463b794a45ed1aaf555
-  languageName: node
-  linkType: hard
-
-"jsonpath-plus@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "jsonpath-plus@npm:6.0.1"
-  checksum: bddec34b742249c5b38077dfcd8eb479fab4e077943253017326503ce4f527ef66938288c728712fd923907493d6eaba69a43015dc3dd9fdf48d89028ae7f466
+"jsonpath-plus@npm:10.2.0, jsonpath-plus@npm:^10.0.0, jsonpath-plus@npm:^6.0.1 || ^10.1.0":
+  version: 10.2.0
+  resolution: "jsonpath-plus@npm:10.2.0"
+  dependencies:
+    "@jsep-plugin/assignment": ^1.3.0
+    "@jsep-plugin/regex": ^1.0.4
+    jsep: ^1.4.0
+  bin:
+    jsonpath: bin/jsonpath-cli.js
+    jsonpath-plus: bin/jsonpath-cli.js
+  checksum: 862a96a0179f342fa6c012065fa78458d4ae4835f18a6ef580d18807101d8c2c3509dc20c9857474503205bff8f06c309e17d7420b68196262d15ad1e4f22146
   languageName: node
   linkType: hard
 
@@ -32410,12 +34683,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:*, keyv@npm:^4.0.0, keyv@npm:^4.5.2":
-  version: 4.5.4
-  resolution: "keyv@npm:4.5.4"
+"keyv@npm:*, keyv@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "keyv@npm:5.2.1"
   dependencies:
-    json-buffer: 3.0.1
-  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
+    "@keyv/serialize": "*"
+  checksum: 92f02ce8a61d3f832c72bc305a0a3408ab3ba322702175c8f23ddb7b317cdef6525fa084135ca4218f40afe17397f2b5b0f38fb1f0758fb47e8cd5d2699963d2
   languageName: node
   linkType: hard
 
@@ -32428,6 +34701,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"keyv@npm:^4.0.0, keyv@npm:^4.5.2":
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
+  dependencies:
+    json-buffer: 3.0.1
+  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
+  languageName: node
+  linkType: hard
+
 "kind-of@npm:^6.0.2":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
@@ -32489,21 +34771,21 @@ __metadata:
   linkType: hard
 
 "knip@npm:^5.0.0":
-  version: 5.33.3
-  resolution: "knip@npm:5.33.3"
+  version: 5.38.2
+  resolution: "knip@npm:5.38.2"
   dependencies:
     "@nodelib/fs.walk": 1.2.8
     "@snyk/github-codeowners": 1.1.0
     easy-table: 1.2.0
     enhanced-resolve: ^5.17.1
     fast-glob: ^3.3.2
-    jiti: ^2.3.3
+    jiti: ^2.4.0
     js-yaml: ^4.1.0
     minimist: ^1.2.8
-    picocolors: ^1.0.0
+    picocolors: ^1.1.0
     picomatch: ^4.0.1
     pretty-ms: ^9.0.0
-    smol-toml: ^1.3.0
+    smol-toml: ^1.3.1
     strip-json-comments: 5.0.1
     summary: 2.1.0
     zod: ^3.22.4
@@ -32514,7 +34796,7 @@ __metadata:
   bin:
     knip: bin/knip.js
     knip-bun: bin/knip-bun.js
-  checksum: 636e26fde892c590a65326d370fc19f1d73575ac014fb84d55d67a71dc05ea0ba2114ae587ba0192232b4ac1094710ee7d9582cf3bbe0773f6c667c0bba9b3e4
+  checksum: dd2b9dd20f1e940e07057f60d04c39da12130e3c2246bc600500af3fe7fa8251ef170d63cd492e4b70bd946beef44ef797afe103b6805b355430ea4057d7cba3
   languageName: node
   linkType: hard
 
@@ -32567,14 +34849,14 @@ __metadata:
   linkType: hard
 
 "kubernetes-models@npm:^4.1.0, kubernetes-models@npm:^4.3.1":
-  version: 4.4.0
-  resolution: "kubernetes-models@npm:4.4.0"
+  version: 4.4.2
+  resolution: "kubernetes-models@npm:4.4.2"
   dependencies:
-    "@kubernetes-models/apimachinery": ^2.0.0
-    "@kubernetes-models/base": ^5.0.0
+    "@kubernetes-models/apimachinery": ^2.0.2
+    "@kubernetes-models/base": ^5.0.1
     "@kubernetes-models/validate": ^4.0.0
     "@swc/helpers": ^0.5.8
-  checksum: 9884c56c35415fe4b44a676a8b628e91fab17eb9a5ef5de08b7b9652d74afeb843d4a139d52bb19e1aaaeba44545542e92cef737b845a2cff5139aa62f820ced
+  checksum: 7c449f69cdda44b177e02185305489dbf492a264c8d71debac0d051831bef76936ed1ec6669fa2090ceb5a20ab9a82b4698d72cac6447c636fdeb6c1960bba9c
   languageName: node
   linkType: hard
 
@@ -33114,7 +35396,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.21, lodash@npm:^4.15.0, lodash@npm:^4.16.4, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0, lodash@npm:~4.17.15, lodash@npm:~4.17.21":
+"lodash@npm:4.17.21, lodash@npm:^4.15.0, lodash@npm:^4.16.4, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:~4.17.15, lodash@npm:~4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -33243,7 +35525,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0, loupe@npm:^3.1.1":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.1, loupe@npm:^3.1.2":
   version: 3.1.2
   resolution: "loupe@npm:3.1.2"
   checksum: 4a75bbe8877a1ced3603e08b1095cd6f4c987c50fe63719fdc3009029560f91e07a915e7f6eff1322bb62bfb2a2beeef06b13ccb3c12f81bda9f3674434dcab9
@@ -33273,6 +35555,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lowercase-keys@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "lowercase-keys@npm:3.0.0"
+  checksum: 67a3f81409af969bc0c4ca0e76cd7d16adb1e25aa1c197229587eaf8671275c8c067cd421795dbca4c81be0098e4c426a086a05e30de8a9c587b7a13c0c7ccc5
+  languageName: node
+  linkType: hard
+
 "lowlight@npm:^1.17.0":
   version: 1.20.0
   resolution: "lowlight@npm:1.20.0"
@@ -33283,23 +35572,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0, lru-cache@npm:^10.4.3":
   version: 10.4.3
   resolution: "lru-cache@npm:10.4.3"
   checksum: 6476138d2125387a6d20f100608c2583d415a4f64a0fecf30c9e2dda976614f09cad4baa0842447bd37dd459a7bd27f57d9d8f8ce558805abd487c583f3d774a
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^4.0.1":
-  version: 4.1.5
-  resolution: "lru-cache@npm:4.1.5"
-  dependencies:
-    pseudomap: ^1.0.2
-    yallist: ^2.1.2
-  checksum: 4bb4b58a36cd7dc4dcec74cbe6a8f766a38b7426f1ff59d4cf7d82a2aa9b9565cd1cb98f6ff60ce5cd174524868d7bc9b7b1c294371851356066ca9ac4cf135a
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^5.1.1":
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
@@ -33355,20 +35634,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.4.3, luxon@npm:^3.5.0":
+"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.4.3, luxon@npm:^3.5.0, luxon@npm:~3.5.0":
   version: 3.5.0
   resolution: "luxon@npm:3.5.0"
   checksum: f290fe5788c8e51e748744f05092160d4be12150dca70f9fadc0d233e53d60ce86acd82e7d909a114730a136a77e56f0d3ebac6141bbb82fd310969a4704825b
   languageName: node
   linkType: hard
 
-"luxon@npm:~3.4.0":
-  version: 3.4.4
-  resolution: "luxon@npm:3.4.4"
-  checksum: 36c1f99c4796ee4bfddf7dc94fa87815add43ebc44c8934c924946260a58512f0fd2743a629302885df7f35ccbd2d13f178c15df046d0e3b6eb71db178f1c60c
-  languageName: node
-  linkType: hard
-
 "lz-string@npm:^1.5.0":
   version: 1.5.0
   resolution: "lz-string@npm:1.5.0"
@@ -33387,12 +35659,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.30.10, magic-string@npm:^0.30.3":
-  version: 0.30.10
-  resolution: "magic-string@npm:0.30.10"
+"magic-string@npm:^0.30.10, magic-string@npm:^0.30.3, magic-string@npm:^0.30.5":
+  version: 0.30.14
+  resolution: "magic-string@npm:0.30.14"
   dependencies:
-    "@jridgewell/sourcemap-codec": ^1.4.15
-  checksum: 456fd47c39b296c47dff967e1965121ace35417eab7f45a99e681e725b8661b48e1573c366ee67a27715025b3740773c46b088f115421c7365ea4ea6fa10d399
+    "@jridgewell/sourcemap-codec": ^1.5.0
+  checksum: 67b3b2d817a7c4e94cb63e2dcaffbeee3b76ff0798eeaee8159a6ff4faee30db824375b2cadbf43807b56c6802fe6373b40d02567d489593017012d74ec0b719
   languageName: node
   linkType: hard
 
@@ -33406,7 +35678,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-dir@npm:^3.0.0, make-dir@npm:^3.1.0":
+"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
   version: 3.1.0
   resolution: "make-dir@npm:3.1.0"
   dependencies:
@@ -33507,6 +35779,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-or-similar@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "map-or-similar@npm:1.5.0"
+  checksum: f65c0d420e272d0fce4e24db35f6a08109218480bca1d61eaa442cbe6cf46270b840218d3b5e94e4bfcc2595f1d0a1fa5885df750b52aac9ab1d437b29dcce38
+  languageName: node
+  linkType: hard
+
 "markdown-escape@npm:^2.0.0":
   version: 2.0.0
   resolution: "markdown-escape@npm:2.0.0"
@@ -33785,6 +36064,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"media-query-parser@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "media-query-parser@npm:2.0.2"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+  checksum: 8ef956d9e63fe6f4041988beda69843b3a6bb48228ea2923a066f6e7c8f7c5dba75fae357318c48a97ed5beae840b8425cb7e727fc1bb77acc65f2005f8945ab
+  languageName: node
+  linkType: hard
+
 "media-typer@npm:0.3.0":
   version: 0.3.0
   resolution: "media-typer@npm:0.3.0"
@@ -33834,7 +36122,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memfs@npm:^3.1.2, memfs@npm:^3.4.1":
+"memfs@npm:^3.1.2, memfs@npm:^3.4.1, memfs@npm:^3.4.12":
   version: 3.5.3
   resolution: "memfs@npm:3.5.3"
   dependencies:
@@ -33852,10 +36140,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memjs@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "memjs@npm:1.3.1"
-  checksum: cb70879055151f15292e95ab57765e745c84d2fedd363b453afc3e2f48bf185e3771eecf9544f95009a3a374e810e34c1e18948134e814d791c2f0f35359ddeb
+"memjs@npm:^1.3.1, memjs@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "memjs@npm:1.3.2"
+  checksum: f92c2a43725b70af69832f807d02b87a07609a1c1f2c8c37670dff5bae6ac5f0d767cc8b3a6a59626703538f96c0bd4f03f9d00ea3b28aeb33270d24e8782233
   languageName: node
   linkType: hard
 
@@ -33882,6 +36170,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"memoizerific@npm:^1.11.3":
+  version: 1.11.3
+  resolution: "memoizerific@npm:1.11.3"
+  dependencies:
+    map-or-similar: ^1.5.0
+  checksum: d51bdc3ed8c39b4b73845c90eb62d243ddf21899914352d0c303f5e1d477abcb192f4c605e008caa4a31d823225eeb22a99ba5ee825fb88d0c33382db3aee95a
+  languageName: node
+  linkType: hard
+
 "merge-descriptors@npm:1.0.3, merge-descriptors@npm:^1.0.1":
   version: 1.0.3
   resolution: "merge-descriptors@npm:1.0.3"
@@ -34375,13 +36672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-response@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "mimic-response@npm:2.1.0"
-  checksum: 014fad6ab936657e5f2f48bd87af62a8e928ebe84472aaf9e14fec4fcb31257a5edff77324d8ac13ddc6685ba5135cf16e381efac324e5f174fb4ddbf902bf07
-  languageName: node
-  linkType: hard
-
 "mimic-response@npm:^3.1.0":
   version: 3.1.0
   resolution: "mimic-response@npm:3.1.0"
@@ -34389,22 +36679,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"min-indent@npm:^1.0.0":
+"mimic-response@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mimic-response@npm:4.0.0"
+  checksum: 33b804cc961efe206efdb1fca6a22540decdcfce6c14eb5c0c50e5ae9022267ab22ce8f5568b1f7247ba67500fe20d523d81e0e9f009b321ccd9d472e78d1850
+  languageName: node
+  linkType: hard
+
+"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
   checksum: bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:^2.4.2":
-  version: 2.9.1
-  resolution: "mini-css-extract-plugin@npm:2.9.1"
+"mini-css-extract-plugin@npm:^2.4.2, mini-css-extract-plugin@npm:^2.9.2":
+  version: 2.9.2
+  resolution: "mini-css-extract-plugin@npm:2.9.2"
   dependencies:
     schema-utils: ^4.0.0
     tapable: ^2.2.1
   peerDependencies:
     webpack: ^5.0.0
-  checksum: 036b0fbb207cf9a56e2f5f5dce5e35100cbd255e5b5a920a5357ec99215af16a77136020729b2d004a041d04ebb0a544b2f442535cbb982704dcd50297014c9e
+  checksum: 67a1f75359371a7776108999d472ae0942ccd904401e364e3a2c710d4b6fec61c4f53288594fcac35891f009e6df8825a00dfd3bfe4bcec0f862081d1f7cad50
   languageName: node
   linkType: hard
 
@@ -34476,7 +36773,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.0, minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
+"minimatch@npm:^9.0.0, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
   dependencies:
@@ -34624,7 +36921,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
   version: 7.1.2
   resolution: "minipass@npm:7.1.2"
   checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3
@@ -34641,6 +36938,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minizlib@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "minizlib@npm:3.0.1"
+  dependencies:
+    minipass: ^7.0.4
+    rimraf: ^5.0.5
+  checksum: da0a53899252380475240c587e52c824f8998d9720982ba5c4693c68e89230718884a209858c156c6e08d51aad35700a3589987e540593c36f6713fe30cd7338
+  languageName: node
+  linkType: hard
+
 "mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3":
   version: 0.5.3
   resolution: "mkdirp-classic@npm:0.5.3"
@@ -34688,6 +36995,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mlly@npm:^1.4.2, mlly@npm:^1.7.2":
+  version: 1.7.3
+  resolution: "mlly@npm:1.7.3"
+  dependencies:
+    acorn: ^8.14.0
+    pathe: ^1.1.2
+    pkg-types: ^1.2.1
+    ufo: ^1.5.4
+  checksum: 60d309c7ce2ac162224a087fcd683a891260511f57011b2f436b54dfef146b8aae7473013958a58d5b6039f2a8692c32a2599c8390c5b307d1119ad0d917b414
+  languageName: node
+  linkType: hard
+
 "mock-socket@npm:^9.3.0":
   version: 9.3.1
   resolution: "mock-socket@npm:9.3.1"
@@ -34745,8 +37064,8 @@ __metadata:
   linkType: hard
 
 "mockttp@npm:^3.13.0":
-  version: 3.15.3
-  resolution: "mockttp@npm:3.15.3"
+  version: 3.15.5
+  resolution: "mockttp@npm:3.15.5"
   dependencies:
     "@graphql-tools/schema": ^8.5.0
     "@graphql-tools/utils": ^8.8.0
@@ -34792,7 +37111,14 @@ __metadata:
     ws: ^8.8.0
   bin:
     mockttp: dist/admin/admin-bin.js
-  checksum: cce4001d771d7baccf966467e2b71fcd0505b0cc9c2c0f2492d58b298cfe47f558eb138dbaa9daad3e4c2d7f7f8fda208920a867e2b494d333644867df6842d8
+  checksum: 410d8b39cddb7975aeb2289a1735d8d65b28bf032e8b0e8990ce78ddbaa4c7c96108c54714a36a745b4784cf2bf129ddafa93a5458deacce2ca56a4adfd524e9
+  languageName: node
+  linkType: hard
+
+"modern-ahocorasick@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "modern-ahocorasick@npm:1.1.0"
+  checksum: 78b99840c9af086c1e36a594ee85bebd8c19d48e2ef31a67d1bad0e673ac12fc931e5961abb5b16daaf820af4923e700f76b1793b7413e18782230162866a0af
   languageName: node
   linkType: hard
 
@@ -34859,8 +37185,8 @@ __metadata:
   linkType: hard
 
 "msw@npm:^1.0.0, msw@npm:^1.2.1, msw@npm:^1.3.0, msw@npm:^1.3.1":
-  version: 1.3.4
-  resolution: "msw@npm:1.3.4"
+  version: 1.3.5
+  resolution: "msw@npm:1.3.5"
   dependencies:
     "@mswjs/cookies": ^0.2.2
     "@mswjs/interceptors": ^0.17.10
@@ -34877,7 +37203,7 @@ __metadata:
     js-levenshtein: ^1.1.6
     node-fetch: ^2.6.7
     outvariant: ^1.4.0
-    path-to-regexp: ^6.2.0
+    path-to-regexp: ^6.3.0
     strict-event-emitter: ^0.4.3
     type-fest: ^2.19.0
     yargs: ^17.3.1
@@ -34888,19 +37214,20 @@ __metadata:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: 57646ecb831e98f00387e60bad4d535e426d406ae2645340e59500c219059be225f1f02a5ff21aee9daeb7a8bdde922a00fb82930781d27e3f3fdaf6b292c25f
+  checksum: 5e1d96d63c0ce07db94373b2315739abecb76dac32dcc6ce116c902ced3e61ef2b1c7ff87eed3627c93fe0588002717edab9c745ebdee29437ed0da4b3beb561
   languageName: node
   linkType: hard
 
 "msw@npm:^2.0.0, msw@npm:^2.0.8":
-  version: 2.4.11
-  resolution: "msw@npm:2.4.11"
+  version: 2.6.8
+  resolution: "msw@npm:2.6.8"
   dependencies:
-    "@bundled-es-modules/cookie": ^2.0.0
+    "@bundled-es-modules/cookie": ^2.0.1
     "@bundled-es-modules/statuses": ^1.0.1
     "@bundled-es-modules/tough-cookie": ^0.1.6
-    "@inquirer/confirm": ^3.0.0
-    "@mswjs/interceptors": ^0.35.8
+    "@inquirer/confirm": ^5.0.0
+    "@mswjs/interceptors": ^0.37.0
+    "@open-draft/deferred-promise": ^2.2.0
     "@open-draft/until": ^2.1.0
     "@types/cookie": ^0.6.0
     "@types/statuses": ^2.0.4
@@ -34920,7 +37247,7 @@ __metadata:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: f58634f5b7e7c1b69fd7d4f0d6ca09169719b8829e01f6bf5c4517b9c3159738d4a0cbd1b8c8b080fced82bf692edf72a064b419feb863f2d7e82ec852cf694b
+  checksum: 5847c78a19413647edfc215452479b389ecaca155581726ac63c82e61bc388f2dd69f4efce9f9b867fb18405a1d748ecaf6ceab00cca26e743673baa20015a79
   languageName: node
   linkType: hard
 
@@ -34971,16 +37298,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mute-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "mute-stream@npm:1.0.0"
-  checksum: 36fc968b0e9c9c63029d4f9dc63911950a3bdf55c9a87f58d3a266289b67180201cade911e7699f8b2fa596b34c9db43dad37649e3f7fdd13c3bb9edb0017ee7
+"mute-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mute-stream@npm:2.0.0"
+  checksum: d2e4fd2f5aa342b89b98134a8d899d8ef9b0a6d69274c4af9df46faa2d97aeb1f2ce83d867880d6de63643c52386579b99139801e24e7526c3b9b0a6d1e18d6c
   languageName: node
   linkType: hard
 
 "mysql2@npm:^3.0.0":
-  version: 3.11.3
-  resolution: "mysql2@npm:3.11.3"
+  version: 3.11.5
+  resolution: "mysql2@npm:3.11.5"
   dependencies:
     aws-ssl-profiles: ^1.1.1
     denque: ^2.1.0
@@ -34991,7 +37318,7 @@ __metadata:
     named-placeholders: ^1.1.3
     seq-queue: ^0.0.5
     sqlstring: ^2.3.2
-  checksum: ae62b5b997da429a33f0762158db965d22daece0030e75ac8e822b0b342ad082fa5f1ead87d922d0ba93595e9d5491036916ef91457c762517f25f41afa6e2d9
+  checksum: 19b184b5b9aafb5d0fd8a8e37f74f20b13631ad888669d6e563060f77b0293fdc80e72459b4090dbbb6307327c243c03dfe5e3760fd5b896fc4fd8f89551bc06
   languageName: node
   linkType: hard
 
@@ -35105,13 +37432,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"negotiator@npm:0.6.3, negotiator@npm:^0.6.2, negotiator@npm:^0.6.3":
+"negotiator@npm:0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
   checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
   languageName: node
   linkType: hard
 
+"negotiator@npm:^0.6.2, negotiator@npm:^0.6.3, negotiator@npm:~0.6.4":
+  version: 0.6.4
+  resolution: "negotiator@npm:0.6.4"
+  checksum: 7ded10aa02a0707d1d12a9973fdb5954f98547ca7beb60e31cb3a403cc6e8f11138db7a3b0128425cf836fc85d145ec4ce983b2bdf83dca436af879c2d683510
+  languageName: node
+  linkType: hard
+
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
@@ -35119,6 +37453,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"neotraverse@npm:=0.6.18":
+  version: 0.6.18
+  resolution: "neotraverse@npm:0.6.18"
+  checksum: 6ec0855db8d484a33672ba4533617bab4944167c881a6ab35a987bf3b92f12159eac5c19ad9cc203c193b279cc1a09f0bd7c7fb7752f9950625cbd866071ef72
+  languageName: node
+  linkType: hard
+
 "netmask@npm:^2.0.2":
   version: 2.0.2
   resolution: "netmask@npm:2.0.2"
@@ -35140,22 +37481,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nimma@npm:0.2.2":
-  version: 0.2.2
-  resolution: "nimma@npm:0.2.2"
+"nimma@npm:0.2.3":
+  version: 0.2.3
+  resolution: "nimma@npm:0.2.3"
   dependencies:
     "@jsep-plugin/regex": ^1.0.1
     "@jsep-plugin/ternary": ^1.0.2
     astring: ^1.8.1
     jsep: ^1.2.0
-    jsonpath-plus: ^6.0.1
+    jsonpath-plus: ^6.0.1 || ^10.1.0
     lodash.topath: ^4.5.2
   dependenciesMeta:
     jsonpath-plus:
       optional: true
     lodash.topath:
       optional: true
-  checksum: 09369253a962e6cdddd37c4994d414a5fa00abc955c4d91946140b45b57465749a9f05663a64812ad5ac70caacb7ca22a8fc7c8db002032d0768c83dbba7b3ad
+  checksum: cafa172f78fca7c0f8e7126659dd47f39bbe09d69b7ef60a7363b65d990934dd57e769afe1fac6a89affc30d47e25a725290025b13e452d3d23e7d3cdab972fb
   languageName: node
   linkType: hard
 
@@ -35479,9 +37820,9 @@ __metadata:
   linkType: hard
 
 "nodemailer@npm:^6.9.13":
-  version: 6.9.15
-  resolution: "nodemailer@npm:6.9.15"
-  checksum: 2d975f5c60f84acde52d79d43287c70197fe94bde4a731682f306e9636a148c49de29a5dd92ce7dc5aac068a148cd91da3401ede80f8f52b9f2bc00439f36ced
+  version: 6.9.16
+  resolution: "nodemailer@npm:6.9.16"
+  checksum: a031d243914ab5a3bb48c75e1fab02d25fb45c2b5b9bc15569cce45ec851235bc970087de99477ca6e7ee88fab2cb6a590a714af310f58532dbcc31396f68b1c
   languageName: node
   linkType: hard
 
@@ -35568,6 +37909,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"normalize-url@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "normalize-url@npm:8.0.1"
+  checksum: 43ea9ef0d6d135dd1556ab67aa4b74820f0d9d15aa504b59fa35647c729f1147dfce48d3ad504998fd1010f089cfb82c86c6d9126eb5c5bd2e9bd25f3a97749b
+  languageName: node
+  linkType: hard
+
 "notistack@npm:^3.0.1":
   version: 3.0.1
   resolution: "notistack@npm:3.0.1"
@@ -35772,10 +38120,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.0":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
+"nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.12":
+  version: 2.2.13
+  resolution: "nwsapi@npm:2.2.13"
+  checksum: d34fb7838517c3c7e8cc824e443275b08b57f6a025a860693d18c56ddcfd176e32df9bf0ae7f5a95c7a32981501caa1f9fda31b59f28aa72a4b9d01f573a8e6b
   languageName: node
   linkType: hard
 
@@ -35902,6 +38250,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"objectorarray@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "objectorarray@npm:1.0.5"
+  checksum: 8fd776aa495d113e217837f4adc1d53e63f656498237094d25f84c3e2c038b34b71d6fd85c4b60c7ae5f558790e5042426a400fae3eac35f297e11be12643a78
+  languageName: node
+  linkType: hard
+
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
@@ -36041,7 +38396,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"open@npm:^8.0.0, open@npm:^8.4.0":
+"open@npm:^8.0.0, open@npm:^8.0.4, open@npm:^8.4.0":
   version: 8.4.2
   resolution: "open@npm:8.4.2"
   dependencies:
@@ -36129,15 +38484,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openid-client@npm:^5.2.1, openid-client@npm:^5.3.0, openid-client@npm:^5.4.3, openid-client@npm:^5.5.0":
-  version: 5.7.0
-  resolution: "openid-client@npm:5.7.0"
+"openid-client@npm:^5.2.1, openid-client@npm:^5.3.0, openid-client@npm:^5.4.3, openid-client@npm:^5.5.0, openid-client@npm:^5.6.5":
+  version: 5.7.1
+  resolution: "openid-client@npm:5.7.1"
   dependencies:
     jose: ^4.15.9
     lru-cache: ^6.0.0
     object-hash: ^2.2.0
     oidc-token-hash: ^5.0.3
-  checksum: 63fc76918fc12f3d6e1456a0b170f417defccf6820acb4581ffc226cb8c9a18d50f76f0982d7a00cce2896c732eb2a6361ad6ea04b127b2603e56408b680ef9c
+  checksum: 497aad2c8a022cef112ade19ed88fba6c8ca0e79607ebe5efdcf75c4095d7924ca479085c1c94f689f6dbc9442c61aab3c2443eb347bcbc6ef51df68827c7c47
   languageName: node
   linkType: hard
 
@@ -36328,12 +38683,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-map@npm:^5.5.0":
-  version: 5.5.0
-  resolution: "p-map@npm:5.5.0"
-  dependencies:
-    aggregate-error: ^4.0.0
-  checksum: 065cb6fca6b78afbd070dd9224ff160dc23eea96e57863c09a0c8ea7ce921043f76854be7ee0abc295cff1ac9adcf700e79a1fbe3b80b625081087be58e7effb
+"p-map@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "p-map@npm:7.0.2"
+  checksum: bc128c2b244ef5d4619392b2247d718a3fe471d5fa4a73834fd96182a237f460ec7e0ad0f95139ef7103a6b50ed164228c62e2f8e41ba2b15360fe1c20d13563
   languageName: node
   linkType: hard
 
@@ -36375,6 +38728,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-throttle@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "p-throttle@npm:5.1.0"
+  checksum: c412429cbb759a0772a083200a556e5866d4a7cb5383a9cc85880f47f07f4b1787fc33d2c824ab659fff0fc4a34a56e1d0712e88808f0c0ae0ffbe93b54f46c1
+  languageName: node
+  linkType: hard
+
 "p-timeout@npm:^3.2.0":
   version: 3.2.0
   resolution: "p-timeout@npm:3.2.0"
@@ -36401,30 +38761,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pac-proxy-agent@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "pac-proxy-agent@npm:7.0.1"
+"pac-proxy-agent@npm:^7.0.0, pac-proxy-agent@npm:^7.0.1":
+  version: 7.0.2
+  resolution: "pac-proxy-agent@npm:7.0.2"
   dependencies:
     "@tootallnate/quickjs-emscripten": ^0.23.0
     agent-base: ^7.0.2
     debug: ^4.3.4
     get-uri: ^6.0.1
     http-proxy-agent: ^7.0.0
-    https-proxy-agent: ^7.0.2
-    pac-resolver: ^7.0.0
-    socks-proxy-agent: ^8.0.2
-  checksum: 3d4aa48ec1c19db10158ecc1c4c9a9f77792294412d225ceb3dfa45d5a06950dca9755e2db0d9b69f12769119bea0adf2b24390d9c73c8d81df75e28245ae451
+    https-proxy-agent: ^7.0.5
+    pac-resolver: ^7.0.1
+    socks-proxy-agent: ^8.0.4
+  checksum: 82772aaa489a4ad6f598b75d56daf609e7ba294a05a91cfe3101b004e2df494f0a269c98452cb47aaa4a513428e248308a156e26fee67eb78a76a58e9346921e
   languageName: node
   linkType: hard
 
-"pac-resolver@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "pac-resolver@npm:7.0.0"
+"pac-resolver@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "pac-resolver@npm:7.0.1"
   dependencies:
     degenerator: ^5.0.0
-    ip: ^1.1.8
     netmask: ^2.0.2
-  checksum: fa3a898c09848e93e35f5e23443fea36ddb393a851c76a23664a5bf3fcbe58ff77a0bcdae1e4f01b9ea87ea493c52e14d97a0fe39f92474d14cd45559c6e3cde
+  checksum: 839134328781b80d49f9684eae1f5c74f50a1d4482076d44c84fc2f3ca93da66fa11245a4725a057231e06b311c20c989fd0681e662a0792d17f644d8fe62a5e
   languageName: node
   linkType: hard
 
@@ -36612,19 +38971,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:6.0.1":
-  version: 6.0.1
-  resolution: "parse5@npm:6.0.1"
-  checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
-  languageName: node
-  linkType: hard
-
-"parse5@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "parse5@npm:7.1.1"
+"parse5@npm:^7.0.0, parse5@npm:^7.1.2":
+  version: 7.2.0
+  resolution: "parse5@npm:7.2.0"
   dependencies:
-    entities: ^4.4.0
-  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
+    entities: ^4.5.0
+  checksum: 78a3286521d5ae09837ed3112a3c817cc718ee444951aced617c46a229b9872b10b7b20941d4d0ca7176c7f37f13dbf013206abe2e5e533563d635d36a9a3dc6
   languageName: node
   linkType: hard
 
@@ -36868,10 +39220,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:0.1.10":
-  version: 0.1.10
-  resolution: "path-to-regexp@npm:0.1.10"
-  checksum: ab7a3b7a0b914476d44030340b0a65d69851af2a0f33427df1476100ccb87d409c39e2182837a96b98fb38c4ef2ba6b87bdad62bb70a2c153876b8061760583c
+"path-to-regexp@npm:0.1.12":
+  version: 0.1.12
+  resolution: "path-to-regexp@npm:0.1.12"
+  checksum: ab237858bee7b25ecd885189f175ab5b5161e7b712b360d44f5c4516b8d271da3e4bf7bf0a7b9153ecb04c7d90ce8ff5158614e1208819cf62bac2b08452722e
   languageName: node
   linkType: hard
 
@@ -36882,7 +39234,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.3.0":
+"path-to-regexp@npm:^6.3.0":
   version: 6.3.0
   resolution: "path-to-regexp@npm:6.3.0"
   checksum: eca78602e6434a1b6799d511d375ec044e8d7e28f5a48aa5c28d57d8152fb52f3fc62fb1cfc5dfa2198e1f041c2a82ed14043d75740a2fe60e91b5089a153250
@@ -36903,6 +39255,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-type@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-type@npm:5.0.0"
+  checksum: 15ec24050e8932c2c98d085b72cfa0d6b4eeb4cbde151a0a05726d8afae85784fc5544f733d8dfc68536587d5143d29c0bd793623fad03d7e61cc00067291cd5
+  languageName: node
+  linkType: hard
+
 "pathe@npm:^0.2.0":
   version: 0.2.0
   resolution: "pathe@npm:0.2.0"
@@ -36910,6 +39269,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pathe@npm:^1.1.1, pathe@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "pathe@npm:1.1.2"
+  checksum: ec5f778d9790e7b9ffc3e4c1df39a5bb1ce94657a4e3ad830c1276491ca9d79f189f47609884671db173400256b005f4955f7952f52a2aeb5834ad5fb4faf134
+  languageName: node
+  linkType: hard
+
 "pathval@npm:^2.0.0":
   version: 2.0.0
   resolution: "pathval@npm:2.0.0"
@@ -37052,8 +39418,8 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.11.3, pg@npm:^8.9.0":
-  version: 8.13.0
-  resolution: "pg@npm:8.13.0"
+  version: 8.13.1
+  resolution: "pg@npm:8.13.1"
   dependencies:
     pg-cloudflare: ^1.1.1
     pg-connection-string: ^2.7.0
@@ -37069,7 +39435,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 81560755ff4ee62b71bf1204dd696f66451574d1db56cbd5aa514ce91c6474030ee8078461b3cb85cce8d2f185be5846e0a7a707a818f5e2e3fb198a7ea795ea
+  checksum: 22cb97fcbee3348d5ee0b195071cc572f9c88eb40cbb61fe6726af68d55d5962121b2d630509bb907703e1c8bdc33de775462029c5399e2a841fa9e6c9da0242
   languageName: node
   linkType: hard
 
@@ -37103,10 +39469,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "picocolors@npm:1.1.0"
-  checksum: a64d653d3a188119ff45781dfcdaeedd7625583f45280aea33fcb032c7a0d3959f2368f9b192ad5e8aade75b74dbd954ffe3106c158509a45e4c18ab379a2acd
+"picocolors@npm:^1.0.0, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "picocolors@npm:1.1.1"
+  checksum: e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045
   languageName: node
   linkType: hard
 
@@ -37124,7 +39490,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picomatch@npm:^4.0.1":
+"picomatch@npm:^4.0.1, picomatch@npm:^4.0.2":
   version: 4.0.2
   resolution: "picomatch@npm:4.0.2"
   checksum: a7a5188c954f82c6585720e9143297ccd0e35ad8072231608086ca950bee672d51b0ef676254af0788205e59bd4e4deb4e7708769226bed725bf13370a7d1464
@@ -37226,7 +39592,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^4.2.0":
+"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
   version: 4.2.0
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
@@ -37244,6 +39610,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-types@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "pkg-types@npm:1.2.1"
+  dependencies:
+    confbox: ^0.1.8
+    mlly: ^1.7.2
+    pathe: ^1.1.2
+  checksum: d2e3ad7aef36cc92b17403e61c04db521bf0beb175ccb4d432c284239f00ec32ff37feb072a260613e9ff727911cff1127a083fd52f91b9bec6b62970f385702
+  languageName: node
+  linkType: hard
+
 "pkg-up@npm:^3.1.0":
   version: 3.1.0
   resolution: "pkg-up@npm:3.1.0"
@@ -37267,27 +39644,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.48.1":
-  version: 1.48.1
-  resolution: "playwright-core@npm:1.48.1"
+"playwright-core@npm:1.49.0":
+  version: 1.49.0
+  resolution: "playwright-core@npm:1.49.0"
   bin:
     playwright-core: cli.js
-  checksum: adf5b43e054e49bcc712d70e71dedab92c362ea76a45a767bdf3d928d3c810a42f6f1c49382f3d44ed005986048001f75cb568605031215dc89a3e56d99d2976
+  checksum: d8423ad0cab2e672856529bf6b98b406e7e605da098b847b9b54ee8ebd8d716ed8880a9afff4b38f0a2e3f59b95661c74589116ce3ff2b5e0ae3561507086c94
   languageName: node
   linkType: hard
 
-"playwright@npm:1.48.1":
-  version: 1.48.1
-  resolution: "playwright@npm:1.48.1"
+"playwright@npm:1.49.0":
+  version: 1.49.0
+  resolution: "playwright@npm:1.49.0"
   dependencies:
     fsevents: 2.3.2
-    playwright-core: 1.48.1
+    playwright-core: 1.49.0
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 81ca13392ad5e5ca87a226d0f5ff2da958c4e06a01dd6b56b4e4e5b4fec45ef8a8f7f0563ef0f4c725814265b931984d0c841e8524362b24480bcd527aa0c054
+  checksum: f1bfb2fff65cad2ce996edab74ec231dfd21aeb5961554b765ce1eaec27efb87eaba37b00e91ecd27727b82861e5d8c230abe4960e93f6ada8be5ad1020df306
   languageName: node
   linkType: hard
 
@@ -37298,7 +39675,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pony-cause@npm:^1.0.0":
+"polished@npm:^4.2.2":
+  version: 4.3.1
+  resolution: "polished@npm:4.3.1"
+  dependencies:
+    "@babel/runtime": ^7.17.8
+  checksum: a6f863c23f1d2f3f5cda3427b5885c9fb9e83b036d681e24820b143c7df40d2685bebb01c0939767120a28e1183671ae17c93db82ac30b3c20942180bb153bc7
+  languageName: node
+  linkType: hard
+
+"pony-cause@npm:^1.1.1":
   version: 1.1.1
   resolution: "pony-cause@npm:1.1.1"
   checksum: 5ff8878b808be48db801d52246a99d7e4789e52d20575ba504ede30c818fd85d38a033915e02c15fa9b6dce72448836dc1a47094acf8f1c21c4f04a4603b0cfb
@@ -37755,13 +40141,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.1.0, postcss@npm:^8.4.33, postcss@npm:^8.4.43":
-  version: 8.4.47
-  resolution: "postcss@npm:8.4.47"
+  version: 8.4.49
+  resolution: "postcss@npm:8.4.49"
   dependencies:
     nanoid: ^3.3.7
-    picocolors: ^1.1.0
+    picocolors: ^1.1.1
     source-map-js: ^1.2.1
-  checksum: f78440a9d8f97431dd2ab1ab8e1de64f12f3eff38a3d8d4a33919b96c381046a314658d2de213a5fa5eb296b656de76a3ec269fdea27f16d5ab465b916a0f52c
+  checksum: eb5d6cbdca24f50399aafa5d2bea489e4caee4c563ea1edd5a2485bc5f84e9ceef3febf170272bc83a99c31d23a316ad179213e853f34c2a7a8ffa534559d63a
   languageName: node
   linkType: hard
 
@@ -37860,9 +40246,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prebuild-install@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "prebuild-install@npm:7.1.1"
+"prebuild-install@npm:^7.1.1, prebuild-install@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "prebuild-install@npm:7.1.2"
   dependencies:
     detect-libc: ^2.0.0
     expand-template: ^2.0.3
@@ -37878,7 +40264,7 @@ __metadata:
     tunnel-agent: ^0.6.0
   bin:
     prebuild-install: bin.js
-  checksum: dbf96d0146b6b5827fc8f67f72074d2e19c69628b9a7a0a17d0fad1bf37e9f06922896972e074197fc00a52eae912993e6ef5a0d471652f561df5cb516f3f467
+  checksum: 543dadf8c60e004ae9529e6013ca0cbeac8ef38b5f5ba5518cb0b622fe7f8758b34e4b5cb1a791db3cdc9d2281766302df6088bd1a225f206925d6fee17d6c5c
   languageName: node
   linkType: hard
 
@@ -38153,7 +40539,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"protobufjs@npm:^7.2.5, protobufjs@npm:^7.2.6, protobufjs@npm:^7.3.0, protobufjs@npm:^7.3.2":
+"protobufjs@npm:^7.2.5, protobufjs@npm:^7.2.6, protobufjs@npm:^7.3.0, protobufjs@npm:^7.3.2, protobufjs@npm:^7.4.0":
   version: 7.4.0
   resolution: "protobufjs@npm:7.4.0"
   dependencies:
@@ -38190,6 +40576,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"proxy-agent@npm:6.4.0":
+  version: 6.4.0
+  resolution: "proxy-agent@npm:6.4.0"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    http-proxy-agent: ^7.0.1
+    https-proxy-agent: ^7.0.3
+    lru-cache: ^7.14.1
+    pac-proxy-agent: ^7.0.1
+    proxy-from-env: ^1.1.0
+    socks-proxy-agent: ^8.0.2
+  checksum: 4d3794ad5e07486298902f0a7f250d0f869fa0e92d790767ca3f793a81374ce0ab6c605f8ab8e791c4d754da96656b48d1c24cb7094bfd310a15867e4a0841d7
+  languageName: node
+  linkType: hard
+
 "proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
@@ -38197,13 +40599,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pseudomap@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "pseudomap@npm:1.0.2"
-  checksum: 856c0aae0ff2ad60881168334448e898ad7a0e45fe7386d114b150084254c01e200c957cf378378025df4e052c7890c5bd933939b0e0d2ecfcc1dc2f0b2991f5
-  languageName: node
-  linkType: hard
-
 "psl@npm:^1.1.28, psl@npm:^1.1.33":
   version: 1.8.0
   resolution: "psl@npm:1.8.0"
@@ -38263,10 +40658,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "punycode@npm:2.1.1"
-  checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
   languageName: node
   linkType: hard
 
@@ -38293,7 +40688,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:6.13.0, qs@npm:^6.10.1, qs@npm:^6.10.2, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.11.2, qs@npm:^6.12.2, qs@npm:^6.9.4":
+"qs@npm:6.13.0":
   version: 6.13.0
   resolution: "qs@npm:6.13.0"
   dependencies:
@@ -38302,6 +40697,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:^6.10.1, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.12.2, qs@npm:^6.7.0, qs@npm:^6.9.4":
+  version: 6.13.1
+  resolution: "qs@npm:6.13.1"
+  dependencies:
+    side-channel: ^1.0.6
+  checksum: 86c5059146955fab76624e95771031541328c171b1d63d48a7ac3b1fdffe262faf8bc5fcadc1684e6f3da3ec87a8dedc8c0009792aceb20c5e94dc34cf468bb9
+  languageName: node
+  linkType: hard
+
 "qs@npm:~6.5.2":
   version: 6.5.3
   resolution: "qs@npm:6.5.3"
@@ -38413,7 +40817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ramda@npm:~0.30.0":
+"ramda@npm:^0.30.1, ramda@npm:~0.30.0":
   version: 0.30.1
   resolution: "ramda@npm:0.30.1"
   checksum: ce6f4b6b967a84a4e65c01ab1b1cdd73d46b8efe71aeccf5d1443c56c4e31a0ea82ece7df6510453dd3d83b92cabf8a6b4d50d189a1b35c08a6f44b281bebf79
@@ -38480,7 +40884,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rate-limiter-flexible@npm:^4.0.0, rate-limiter-flexible@npm:^4.0.1":
+"rate-limiter-flexible@npm:^4.0.1":
   version: 4.0.1
   resolution: "rate-limiter-flexible@npm:4.0.1"
   checksum: 88cb4ae4c6a94646eb4987f08ae203896fc340d84038e145958607ab711d9c703e47e55f177a4bf9bab4c637c73ee2254fffe2ec4e289d41389c8502194ca868
@@ -38590,6 +40994,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-confetti@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "react-confetti@npm:6.1.0"
+  dependencies:
+    tween-functions: ^1.2.0
+  peerDependencies:
+    react: ^16.3.0 || ^17.0.1 || ^18.0.0
+  checksum: 24b6975df144d2bf09d8e1c95ddc49e547775f911efaa8d96b49e522659d931539e9d9e48cc0db3a01f3a671be7e3824e6e728db85096f5527db5d1c69ebb153
+  languageName: node
+  linkType: hard
+
 "react-copy-to-clipboard@npm:5.1.0, react-copy-to-clipboard@npm:^5.0.4":
   version: 5.1.0
   resolution: "react-copy-to-clipboard@npm:5.1.0"
@@ -38656,6 +41071,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-docgen-typescript@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "react-docgen-typescript@npm:2.2.2"
+  peerDependencies:
+    typescript: ">= 4.3.x"
+  checksum: a9826459ea44e818f21402728dd47f5cae60bd936574cefd4f90ad101ff3eebacd67b6e017b793309734ce62c037aa3072dbc855d2b0e29bad1a38cbf5bac115
+  languageName: node
+  linkType: hard
+
+"react-docgen@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "react-docgen@npm:7.1.0"
+  dependencies:
+    "@babel/core": ^7.18.9
+    "@babel/traverse": ^7.18.9
+    "@babel/types": ^7.18.9
+    "@types/babel__core": ^7.18.0
+    "@types/babel__traverse": ^7.18.0
+    "@types/doctrine": ^0.0.9
+    "@types/resolve": ^1.20.2
+    doctrine: ^3.0.0
+    resolve: ^1.22.1
+    strip-indent: ^4.0.0
+  checksum: dfdec82a4d695e8b1e31b77eef4ceac0f60e00f13725f0a18886d2737595531e58a54f4dde5db4657276d194597bd5e67a1792ca52eb42a59b67943105f24893
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:^16.13.1":
   version: 16.14.0
   resolution: "react-dom@npm:16.14.0"
@@ -38670,7 +41112,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:^18.0.2":
+"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.0.2":
   version: 18.3.1
   resolution: "react-dom@npm:18.3.1"
   dependencies:
@@ -38715,6 +41157,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-error-boundary@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "react-error-boundary@npm:4.1.2"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+  peerDependencies:
+    react: ">=16.13.1"
+  checksum: afe692f1bbbfb5998b49e1001d7682a3cbfdc623dca1318b408e738606f3450d925c28fbbfa5dc84d2cf285d17c2e7f079d59386a27da354dea9c902a935149b
+  languageName: node
+  linkType: hard
+
 "react-error-overlay@npm:^6.0.11":
   version: 6.0.11
   resolution: "react-error-overlay@npm:6.0.11"
@@ -38760,11 +41213,11 @@ __metadata:
   linkType: hard
 
 "react-hook-form@npm:^7.12.2":
-  version: 7.53.0
-  resolution: "react-hook-form@npm:7.53.0"
+  version: 7.53.2
+  resolution: "react-hook-form@npm:7.53.2"
   peerDependencies:
     react: ^16.8.0 || ^17 || ^18 || ^19
-  checksum: 84d67fb79bad03d0aa809b5e411d97fb081fc13cd2b6d063a988f81f6fbef8545463e05360afa9d8d58fff19f08fa919930dcdc98a9e68bf74048c9f63e10ad5
+  checksum: 37e2dd0e79cd8d3376a7a2cb72ad7b59f0594be499daa898d2c6bec896fc30c2f86e62e8b41bc9d325f77220bd8d76cb31e917f77f1c92ad5740adb1a4cc69e2
   languageName: node
   linkType: hard
 
@@ -39044,15 +41497,15 @@ __metadata:
   linkType: hard
 
 "react-router-dom@npm:^6.3.0":
-  version: 6.27.0
-  resolution: "react-router-dom@npm:6.27.0"
+  version: 6.28.0
+  resolution: "react-router-dom@npm:6.28.0"
   dependencies:
-    "@remix-run/router": 1.20.0
-    react-router: 6.27.0
+    "@remix-run/router": 1.21.0
+    react-router: 6.28.0
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
+  checksum: 0cf4658a92bc66f50ec9d8518c36aa5a402bcadce71fb624ed6f900d73a29ea87ff904a4f2c42279107e75e80cc08c6192563fadcc5d4e642e6d476e38e83b21
   languageName: node
   linkType: hard
 
@@ -39067,14 +41520,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:6.27.0, react-router@npm:^6.3.0":
-  version: 6.27.0
-  resolution: "react-router@npm:6.27.0"
+"react-router@npm:6.28.0, react-router@npm:^6.3.0":
+  version: 6.28.0
+  resolution: "react-router@npm:6.28.0"
   dependencies:
-    "@remix-run/router": 1.20.0
+    "@remix-run/router": 1.21.0
   peerDependencies:
     react: ">=16.8"
-  checksum: d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
+  checksum: 23246ca957b5c2bc8d6f9a81fee2df2ce4fc3feca3ec27c2fd85999568fc1299a4e8273e4ab70b6f3acd43a1fb45e0c93cb01ef77e68c9f9e1f7e4f42a1419ea
   languageName: node
   linkType: hard
 
@@ -39255,7 +41708,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^18.0.2":
+"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.0.2":
   version: 18.3.1
   resolution: "react@npm:18.3.1"
   dependencies:
@@ -39399,7 +41852,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"recast@npm:^0.23.9":
+"recast@npm:^0.23.5, recast@npm:^0.23.9":
   version: 0.23.9
   resolution: "recast@npm:0.23.9"
   dependencies:
@@ -39465,6 +41918,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"redis@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "redis@npm:4.7.0"
+  dependencies:
+    "@redis/bloom": 1.2.0
+    "@redis/client": 1.6.0
+    "@redis/graph": 1.1.1
+    "@redis/json": 1.0.7
+    "@redis/search": 1.2.0
+    "@redis/time-series": 1.1.0
+  checksum: 625172dd913118241288c33f351cda42630819bc82a1dc31f22e1d3e0a4267075ecb851aecfaf106a0c73ff287a434a3df3d2a8ce46713acf68d34d66efc39ec
+  languageName: node
+  linkType: hard
+
 "redux-immutable@npm:^4.0.0":
   version: 4.0.0
   resolution: "redux-immutable@npm:4.0.0"
@@ -39568,7 +42035,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.1, regexp.prototype.flags@npm:^1.5.2":
+"regexp.prototype.flags@npm:^1.5.2":
   version: 1.5.2
   resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
@@ -39777,6 +42244,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"require-like@npm:>= 0.1.1":
+  version: 0.1.2
+  resolution: "require-like@npm:0.1.2"
+  checksum: edb8331f05fd807381a75b76f6cca9f0ce8acaa2e910b7e116541799aa970bfbc64fde5fd6adb3a6917dba346f8386ebbddb81614c24e8dad1b4290c7af9535e
+  languageName: node
+  linkType: hard
+
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
@@ -39784,10 +42258,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "reselect@npm:5.1.0"
-  checksum: 5bc9c5d03d7caea00d0c0e24330bf23d91801227346fec1cef6a60988ab8d3dd7cee76e6994ca0915bc1c20845bb2bd929b95753763e0a9db74c0f9dff5cb845
+"reselect@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "reselect@npm:5.1.1"
+  checksum: 5d32d48be29071ddda21a775945c2210cf4ca3fccde1c4a0e1582ac3bf99c431c6c2330ef7ca34eae4c06feea617e7cb2c275c4b33ccf9a930836dfc98b49b13
   languageName: node
   linkType: hard
 
@@ -39852,7 +42326,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.22.8, resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4, resolve@npm:~1.22.1, resolve@npm:~1.22.2":
+"resolve@npm:1.22.8, resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4, resolve@npm:^1.22.8, resolve@npm:~1.22.1, resolve@npm:~1.22.2":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -39878,7 +42352,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@1.22.8#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>, resolve@patch:resolve@~1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@~1.22.2#~builtin<compat/resolve>":
+"resolve@patch:resolve@1.22.8#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.8#~builtin<compat/resolve>, resolve@patch:resolve@~1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@~1.22.2#~builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -39922,6 +42396,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"responselike@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "responselike@npm:3.0.0"
+  dependencies:
+    lowercase-keys: ^3.0.0
+  checksum: e0cc9be30df4f415d6d83cdede3c5c887cd4a73e7cc1708bcaab1d50a28d15acb68460ac5b02bcc55a42f3d493729c8856427dcf6e57e6e128ad05cba4cfb95e
+  languageName: node
+  linkType: hard
+
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -40180,26 +42663,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.0.0, rollup@npm:^4.20.0":
-  version: 4.24.0
-  resolution: "rollup@npm:4.24.0"
+"rollup@npm:^4.20.0, rollup@npm:^4.27.3":
+  version: 4.27.4
+  resolution: "rollup@npm:4.27.4"
   dependencies:
-    "@rollup/rollup-android-arm-eabi": 4.24.0
-    "@rollup/rollup-android-arm64": 4.24.0
-    "@rollup/rollup-darwin-arm64": 4.24.0
-    "@rollup/rollup-darwin-x64": 4.24.0
-    "@rollup/rollup-linux-arm-gnueabihf": 4.24.0
-    "@rollup/rollup-linux-arm-musleabihf": 4.24.0
-    "@rollup/rollup-linux-arm64-gnu": 4.24.0
-    "@rollup/rollup-linux-arm64-musl": 4.24.0
-    "@rollup/rollup-linux-powerpc64le-gnu": 4.24.0
-    "@rollup/rollup-linux-riscv64-gnu": 4.24.0
-    "@rollup/rollup-linux-s390x-gnu": 4.24.0
-    "@rollup/rollup-linux-x64-gnu": 4.24.0
-    "@rollup/rollup-linux-x64-musl": 4.24.0
-    "@rollup/rollup-win32-arm64-msvc": 4.24.0
-    "@rollup/rollup-win32-ia32-msvc": 4.24.0
-    "@rollup/rollup-win32-x64-msvc": 4.24.0
+    "@rollup/rollup-android-arm-eabi": 4.27.4
+    "@rollup/rollup-android-arm64": 4.27.4
+    "@rollup/rollup-darwin-arm64": 4.27.4
+    "@rollup/rollup-darwin-x64": 4.27.4
+    "@rollup/rollup-freebsd-arm64": 4.27.4
+    "@rollup/rollup-freebsd-x64": 4.27.4
+    "@rollup/rollup-linux-arm-gnueabihf": 4.27.4
+    "@rollup/rollup-linux-arm-musleabihf": 4.27.4
+    "@rollup/rollup-linux-arm64-gnu": 4.27.4
+    "@rollup/rollup-linux-arm64-musl": 4.27.4
+    "@rollup/rollup-linux-powerpc64le-gnu": 4.27.4
+    "@rollup/rollup-linux-riscv64-gnu": 4.27.4
+    "@rollup/rollup-linux-s390x-gnu": 4.27.4
+    "@rollup/rollup-linux-x64-gnu": 4.27.4
+    "@rollup/rollup-linux-x64-musl": 4.27.4
+    "@rollup/rollup-win32-arm64-msvc": 4.27.4
+    "@rollup/rollup-win32-ia32-msvc": 4.27.4
+    "@rollup/rollup-win32-x64-msvc": 4.27.4
     "@types/estree": 1.0.6
     fsevents: ~2.3.2
   dependenciesMeta:
@@ -40211,6 +42696,10 @@ __metadata:
       optional: true
     "@rollup/rollup-darwin-x64":
       optional: true
+    "@rollup/rollup-freebsd-arm64":
+      optional: true
+    "@rollup/rollup-freebsd-x64":
+      optional: true
     "@rollup/rollup-linux-arm-gnueabihf":
       optional: true
     "@rollup/rollup-linux-arm-musleabihf":
@@ -40239,7 +42728,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: b7e915b0cc43749c2c71255ff58858496460b1a75148db2abecc8e9496af83f488517768593826715f610e20e480a5ae7f1132a1408eb1d364830d6b239325cf
+  checksum: 7268678ce9a645fda79efa2dc3c9b458357683b0bbd8cc44f8e52d406df4d40468ea3efdf24ad01e25210594cd40902b2b3d20730e2d58e9b226cb3c48dcbd8b
   languageName: node
   linkType: hard
 
@@ -40258,10 +42747,11 @@ __metadata:
     "@octokit/rest": ^19.0.3
     "@playwright/test": ^1.32.3
     "@spotify/eslint-plugin": ^15.0.0
-    "@spotify/prettier-config": ^15.0.0
     "@techdocs/cli": "workspace:*"
+    "@types/cacheable-request": ^8.3.6
     "@types/global-agent": ^2.1.3
-    "@types/node": ^18.17.8
+    "@types/memjs": ^1.3.3
+    "@types/node": ^20.16.0
     "@types/webpack": ^5.28.0
     "@useoptic/optic": ^1.0.0
     array-to-table: ^1.0.1
@@ -40287,6 +42777,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"rrweb-cssom@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "rrweb-cssom@npm:0.7.1"
+  checksum: 62e410ddbaaba6abc196c3bbfa8de4952e0a134d9f2b454ee293039bf9931322d806e14d52ed122a5c2bd332a868b9da2e99358fb6232c33758b5ede86d992c8
+  languageName: node
+  linkType: hard
+
 "rtl-css-js@npm:^1.16.1":
   version: 1.16.1
   resolution: "rtl-css-js@npm:1.16.1"
@@ -40312,13 +42809,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"run-async@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "run-async@npm:3.0.0"
-  checksum: 280c03d5a88603f48103fc6fd69f07fb0c392a1e0d319c34ec96a2516030e07ba06f79231a563c78698b882649c2fc1fda601bc84705f57d50efcd1fa506cfc0
-  languageName: node
-  linkType: hard
-
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -40355,6 +42845,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safari-14-idb-fix@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "safari-14-idb-fix@npm:1.0.6"
+  checksum: 588cd632606ff0e47d64d0b71d88f9626f6187177a3187cb063a272ecb0412f7453f4e9321a9e731a1439b7830aa24f907e2338b402e1ef24e8d6a42f7ce8532
+  languageName: node
+  linkType: hard
+
 "safe-array-concat@npm:^1.1.2":
   version: 1.1.2
   resolution: "safe-array-concat@npm:1.1.2"
@@ -40445,15 +42942,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"saxes@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "saxes@npm:5.0.1"
-  dependencies:
-    xmlchars: ^2.2.0
-  checksum: 5636b55cf15f7cf0baa73f2797bf992bdcf75d1b39d82c0aa4608555c774368f6ac321cb641fd5f3d3ceb87805122cd47540da6a7b5960fe0dbdb8f8c263f000
-  languageName: node
-  linkType: hard
-
 "saxes@npm:^6.0.0":
   version: 6.0.0
   resolution: "saxes@npm:6.0.0"
@@ -40607,7 +43095,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.6.3, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
+"semver@npm:7.6.3, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2":
   version: 7.6.3
   resolution: "semver@npm:7.6.3"
   bin:
@@ -40951,23 +43439,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-eval@npm:1.0.0":
-  version: 1.0.0
-  resolution: "simple-eval@npm:1.0.0"
+"simple-eval@npm:1.0.1":
+  version: 1.0.1
+  resolution: "simple-eval@npm:1.0.1"
   dependencies:
-    jsep: ^1.1.2
-  checksum: 0f0719ae3a84d4b9c19366dc03065b1fe9638c982ed3e9d44ba541d25e3454e99419e3239034974fd6c5074b79c119419168b8f343fef4da6d7e35227cfd1f87
-  languageName: node
-  linkType: hard
-
-"simple-get@npm:^3.0.3":
-  version: 3.1.1
-  resolution: "simple-get@npm:3.1.1"
-  dependencies:
-    decompress-response: ^4.2.0
-    once: ^1.3.1
-    simple-concat: ^1.0.0
-  checksum: 80195e70bf171486e75c31e28e5485468195cc42f85940f8b45c4a68472160144d223eb4d07bc82ef80cb974b7c401db021a540deb2d34ac4b3b8883da2d6401
+    jsep: ^1.3.6
+  checksum: 280207cfe4538c500f6b41e4d88576cf250337b0042bec8f9f5cf025b3a70e07974e522edd01e69d378767dd73068765d4f46ad55db5c94943c8f3585bff95af
   languageName: node
   linkType: hard
 
@@ -41028,10 +43505,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slash@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slash@npm:4.0.0"
-  checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d
+"slash@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "slash@npm:5.1.0"
+  checksum: 70434b34c50eb21b741d37d455110258c42d2cf18c01e6518aeb7299f3c6e626330c889c0c552b5ca2ef54a8f5a74213ab48895f0640717cacefeef6830a1ba4
   languageName: node
   linkType: hard
 
@@ -41098,10 +43575,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"smol-toml@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "smol-toml@npm:1.3.0"
-  checksum: 79e1db6b6cd32a13ad7602bfe1a02f20894fe599657a5cc2c8ffab7c3de4ba51f7426b701b513f9b859560918b36a63f7c73f7eaf6def8a1dc73db74ffd9b601
+"smol-toml@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "smol-toml@npm:1.3.1"
+  checksum: dc3284a674065874b1d34a945709ce3da2a0c44b1ff86b3274615d322c2f6cf8e5d2f5f7d569fd92330ec08590777972725e7d3ba856bd6d841243673064994e
   languageName: node
   linkType: hard
 
@@ -41147,24 +43624,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:^8.0.1, socks-proxy-agent@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "socks-proxy-agent@npm:8.0.2"
+"socks-proxy-agent@npm:^8.0.1, socks-proxy-agent@npm:^8.0.2, socks-proxy-agent@npm:^8.0.4":
+  version: 8.0.4
+  resolution: "socks-proxy-agent@npm:8.0.4"
   dependencies:
-    agent-base: ^7.0.2
+    agent-base: ^7.1.1
     debug: ^4.3.4
-    socks: ^2.7.1
-  checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d
+    socks: ^2.8.3
+  checksum: b2ec5051d85fe49072f9a250c427e0e9571fd09d5db133819192d078fd291276e1f0f50f6dbc04329b207738b1071314cee8bdbb4b12e27de42dbcf1d4233c67
   languageName: node
   linkType: hard
 
-"socks@npm:^2.6.1, socks@npm:^2.6.2, socks@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
+"socks@npm:^2.6.1, socks@npm:^2.6.2, socks@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
-    ip: ^2.0.0
+    ip-address: ^9.0.5
     smart-buffer: ^4.2.0
-  checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748
+  checksum: 7a6b7f6eedf7482b9e4597d9a20e09505824208006ea8f2c49b71657427f3c137ca2ae662089baa73e1971c62322d535d9d0cf1c9235cf6f55e315c18203eadd
   languageName: node
   linkType: hard
 
@@ -41186,20 +43663,20 @@ __metadata:
   linkType: hard
 
 "sort-package-json@npm:^2.8.0":
-  version: 2.10.1
-  resolution: "sort-package-json@npm:2.10.1"
+  version: 2.12.0
+  resolution: "sort-package-json@npm:2.12.0"
   dependencies:
     detect-indent: ^7.0.1
     detect-newline: ^4.0.0
     get-stdin: ^9.0.0
     git-hooks-list: ^3.0.0
-    globby: ^13.1.2
     is-plain-obj: ^4.1.0
     semver: ^7.6.0
     sort-object-keys: ^1.1.3
+    tinyglobby: ^0.2.9
   bin:
     sort-package-json: cli.js
-  checksum: 861d8161565fba322414d70b6be10fb331680549b73399778965be628783833c85c4e02929bcea5a2d96994884b0327dfe2f7c7a79409c901d2582b703f5333d
+  checksum: c4bd25516b0e23c83a6c0f9ad418869a4b09675628e96f8c44b6b1f3458fbbd8a84d623ed63e24af620675977ab8a867e0f5356fc3cc4f9c7be85dcd3136d4ac
   languageName: node
   linkType: hard
 
@@ -41300,13 +43777,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spawndamnit@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "spawndamnit@npm:2.0.0"
+"spawndamnit@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "spawndamnit@npm:3.0.1"
   dependencies:
-    cross-spawn: ^5.1.0
-    signal-exit: ^3.0.2
-  checksum: c74b5e264ee5bc13d55692fd422d74c282e4607eb04ac64d19d06796718d89b14921620fa4237ec5635e7acdff21461670ff19850f210225410a353cad0d7fed
+    cross-spawn: ^7.0.5
+    signal-exit: ^4.0.1
+  checksum: 47d88a7f1e5691e13e435eddc3d34123c2f7746e2853e91bfac5ea7c6e3bb4b1d1995223b25f7a8745871510d92f63ecd3c9fa02aa2896ac0c79fb618eb08bbe
   languageName: node
   linkType: hard
 
@@ -41369,10 +43846,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sprintf-js@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "sprintf-js@npm:1.1.2"
-  checksum: d4bb46464632b335e5faed381bd331157e0af64915a98ede833452663bc672823db49d7531c32d58798e85236581fb7342fd0270531ffc8f914e186187bf1c90
+"sprintf-js@npm:^1.1.2, sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: a3fdac7b49643875b70864a9d9b469d87a40dfeaf5d34d9d0c5b1cda5fd7d065531fcb43c76357d62254c57184a7b151954156563a4d6a747015cfb41021cad0
   languageName: node
   linkType: hard
 
@@ -41573,15 +44050,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: ^1.0.4
-  checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42
-  languageName: node
-  linkType: hard
-
 "stoppable@npm:^1.1.0":
   version: 1.1.0
   resolution: "stoppable@npm:1.1.0"
@@ -41589,6 +44057,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"storybook@npm:^8.4.6":
+  version: 8.4.6
+  resolution: "storybook@npm:8.4.6"
+  dependencies:
+    "@storybook/core": 8.4.6
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
+  bin:
+    getstorybook: ./bin/index.cjs
+    sb: ./bin/index.cjs
+    storybook: ./bin/index.cjs
+  checksum: af1295778a99d504f6200d9594a517a58e0e8ccf2d5f2706e9716eb2e60ac4475bb558d811d4b51bc7feb0c21701a3801e09a4d52b453e1f94ce28b13be1a50f
+  languageName: node
+  linkType: hard
+
 "stream-browserify@npm:3.0.0, stream-browserify@npm:^3.0.0":
   version: 3.0.0
   resolution: "stream-browserify@npm:3.0.0"
@@ -41799,13 +44285,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.includes@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "string.prototype.includes@npm:2.0.0"
+"string.prototype.includes@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "string.prototype.includes@npm:2.0.1"
   dependencies:
-    define-properties: ^1.1.3
-    es-abstract: ^1.17.5
-  checksum: cf413e7f603b0414b65fdf1e7e3670ba85fd992b31c7eadfbdd9a484b86d265f0260431e7558cdb44a318dcadd1da8442b7bb8193b9ddd0aea3c376d2a559859
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.3
+  checksum: ed4b7058b092f30d41c4df1e3e805eeea92479d2c7a886aa30f42ae32fde8924a10cc99cccc99c29b8e18c48216608a0fe6bf887f8b4aadf9559096a758f313a
   languageName: node
   linkType: hard
 
@@ -41990,6 +44477,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-indent@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "strip-indent@npm:4.0.0"
+  dependencies:
+    min-indent: ^1.0.1
+  checksum: 06cbcd93da721c46bc13caeb1c00af93a9b18146a1c95927672d2decab6a25ad83662772417cea9317a2507fb143253ecc23c4415b64f5828cef9b638a744598
+  languageName: node
+  linkType: hard
+
 "strip-json-comments@npm:5.0.1":
   version: 5.0.1
   resolution: "strip-json-comments@npm:5.0.1"
@@ -42244,42 +44740,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swagger-client@npm:^3.28.1":
-  version: 3.28.2
-  resolution: "swagger-client@npm:3.28.2"
+"swagger-client@npm:^3.31.0":
+  version: 3.31.0
+  resolution: "swagger-client@npm:3.31.0"
   dependencies:
     "@babel/runtime-corejs3": ^7.22.15
-    "@swagger-api/apidom-core": ">=1.0.0-alpha.5 <1.0.0-beta.0"
-    "@swagger-api/apidom-error": ">=1.0.0-alpha.5 <1.0.0-beta.0"
-    "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.5 <1.0.0-beta.0"
-    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.5 <1.0.0-beta.0"
-    "@swagger-api/apidom-reference": ">=1.0.0-alpha.5 <1.0.0-beta.0"
-    cookie: ~0.6.0
+    "@scarf/scarf": =1.4.0
+    "@swagger-api/apidom-core": ">=1.0.0-alpha.9 <1.0.0-beta.0"
+    "@swagger-api/apidom-error": ">=1.0.0-alpha.9 <1.0.0-beta.0"
+    "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.9 <1.0.0-beta.0"
+    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.9 <1.0.0-beta.0"
+    "@swagger-api/apidom-reference": ">=1.0.0-alpha.9 <1.0.0-beta.0"
+    cookie: ~0.7.2
     deepmerge: ~4.3.0
     fast-json-patch: ^3.0.0-1
     js-yaml: ^4.1.0
+    neotraverse: =0.6.18
     node-abort-controller: ^3.1.1
     node-fetch-commonjs: ^3.3.2
     openapi-path-templating: ^1.5.1
     openapi-server-url-templating: ^1.0.0
-    qs: ^6.10.2
+    ramda: ^0.30.1
     ramda-adjunct: ^5.0.0
-    traverse: =0.6.8
-  checksum: 46b970fce13976c2491d3f1a18cbaee9eedebe89bb6da9c4444a6c60de8f9436f375b4cfbd011093a3070f6719037852e8e4a1d3bf06aeb8b7192b805bfe20bf
+  checksum: 86b414dda317d5e9ca6efac8c04355016106e9e637b9b0bfb7a27c43f4b14e18a18c93ac108798ecc0e00c1937036f79fe103b98f551ef1e24fd54e0c3b756b0
   languageName: node
   linkType: hard
 
 "swagger-ui-react@npm:^5.0.0":
-  version: 5.17.14
-  resolution: "swagger-ui-react@npm:5.17.14"
+  version: 5.18.2
+  resolution: "swagger-ui-react@npm:5.18.2"
   dependencies:
-    "@babel/runtime-corejs3": ^7.24.5
-    "@braintree/sanitize-url": =7.0.2
+    "@babel/runtime-corejs3": ^7.24.7
+    "@braintree/sanitize-url": =7.0.4
+    "@scarf/scarf": =1.4.0
     base64-js: ^1.5.1
     classnames: ^2.5.1
     css.escape: 1.5.1
     deep-extend: 0.6.0
-    dompurify: =3.1.4
+    dompurify: =3.1.6
     ieee754: ^1.2.1
     immutable: ^3.x.x
     js-file-download: ^0.4.12
@@ -42298,10 +44796,10 @@ __metadata:
     redux: ^5.0.1
     redux-immutable: ^4.0.0
     remarkable: ^2.0.1
-    reselect: ^5.1.0
+    reselect: ^5.1.1
     serialize-error: ^8.1.0
     sha.js: ^2.4.11
-    swagger-client: ^3.28.1
+    swagger-client: ^3.31.0
     url-parse: ^1.5.10
     xml: =1.0.1
     xml-but-prettier: ^1.0.1
@@ -42309,7 +44807,7 @@ __metadata:
   peerDependencies:
     react: ">=16.8.0 <19"
     react-dom: ">=16.8.0 <19"
-  checksum: 1283b23feb91b475ab036f219342374853b6113090c47c49df4576fa9f187a6df05825e7df059d862b8fcf3be51c25691a8da380084f4ca84bc6b5d0ee0ef744
+  checksum: 8ad40bda044c9ff5a940b4e76f88dd740dae183266dc2d48cd88b73877a0ad464f26ad41459de7d7562c5e1a0030ed5a15b99fe57d3f2919acc7ddb126c07447
   languageName: node
   linkType: hard
 
@@ -42351,6 +44849,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tabbable@npm:^6.0.0":
+  version: 6.2.0
+  resolution: "tabbable@npm:6.2.0"
+  checksum: f8440277d223949272c74bb627a3371be21735ca9ad34c2570f7e1752bd646ccfc23a9d8b1ee65d6561243f4134f5fbbf1ad6b39ac3c4b586554accaff4a1300
+  languageName: node
+  linkType: hard
+
 "tapable@npm:^1.0.0":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
@@ -42444,6 +44949,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tar@npm:^7.0.0":
+  version: 7.4.3
+  resolution: "tar@npm:7.4.3"
+  dependencies:
+    "@isaacs/fs-minipass": ^4.0.0
+    chownr: ^3.0.0
+    minipass: ^7.1.2
+    minizlib: ^3.0.1
+    mkdirp: ^3.0.1
+    yallist: ^5.0.0
+  checksum: 8485350c0688331c94493031f417df069b778aadb25598abdad51862e007c39d1dd5310702c7be4a6784731a174799d8885d2fde0484269aea205b724d7b2ffa
+  languageName: node
+  linkType: hard
+
 "tarn@npm:^3.0.2":
   version: 3.0.2
   resolution: "tarn@npm:3.0.2"
@@ -42540,7 +45059,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:*, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.10":
+"terser-webpack-plugin@npm:*, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10":
   version: 5.3.10
   resolution: "terser-webpack-plugin@npm:5.3.10"
   dependencies:
@@ -42588,8 +45107,8 @@ __metadata:
   linkType: hard
 
 "testcontainers@npm:^10.0.0":
-  version: 10.13.2
-  resolution: "testcontainers@npm:10.13.2"
+  version: 10.14.0
+  resolution: "testcontainers@npm:10.14.0"
   dependencies:
     "@balena/dockerignore": ^1.0.2
     "@types/dockerode": ^3.3.29
@@ -42606,7 +45125,7 @@ __metadata:
     tar-fs: ^3.0.6
     tmp: ^0.2.3
     undici: ^5.28.4
-  checksum: dd115745369981d159b9e74ce2461c2d7c9f3cfbe747e021c8268913b0b20beb5234cb160f22743cb40b38442dbcdfb5f985c63aa14d3b367493d0bfece6afe3
+  checksum: 8d83bf259748b07aac2913a41875be15df7cbb2f8b2b6a2535e0de8705a9ca3838ae8112de79fb698cdb12d33ebdb9ff45de37abab69e0c3ccbfe95ba6f0c999
   languageName: node
   linkType: hard
 
@@ -42736,7 +45255,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.3.3":
+"tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.3.1, tiny-invariant@npm:^1.3.3":
   version: 1.3.3
   resolution: "tiny-invariant@npm:1.3.3"
   checksum: 5e185c8cc2266967984ce3b352a4e57cb89dad5a8abb0dea21468a6ecaa67cd5bb47a3b7a85d08041008644af4f667fb8b6575ba38ba5fb00b3b5068306e59fe
@@ -42750,6 +45269,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyglobby@npm:^0.2.9":
+  version: 0.2.10
+  resolution: "tinyglobby@npm:0.2.10"
+  dependencies:
+    fdir: ^6.4.2
+    picomatch: ^4.0.2
+  checksum: 7e2ffe262ebc149036bdef37c56b32d02d52cf09efa7d43dbdab2ea3c12844a4da881058835ce4c74d1891190e5ad5ec5133560a11ec8314849b68ad0d99d3f4
+  languageName: node
+  linkType: hard
+
 "tinylogic@npm:^2.0.0":
   version: 2.0.0
   resolution: "tinylogic@npm:2.0.0"
@@ -42771,6 +45300,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tldts-core@npm:^6.1.51":
+  version: 6.1.51
+  resolution: "tldts-core@npm:6.1.51"
+  checksum: 70eb4c26b4cb1f7bc12081a932e59fff661f5ea39138a46d2a4f2b580577d99a6ed3c0a33dfb70950795c8a6551dc431444bbdb47251850b14fbf27b30448810
+  languageName: node
+  linkType: hard
+
+"tldts@npm:^6.1.32":
+  version: 6.1.51
+  resolution: "tldts@npm:6.1.51"
+  dependencies:
+    tldts-core: ^6.1.51
+  bin:
+    tldts: bin/cli.js
+  checksum: 9450c859ffcef5870dc08d27fb22a8f34997765f1cf5b441b8d7ee73bbc7e851228b2935839bfdd97c0b6683fe66984c68dcb84eef6302c915aaa63a8b84e177
+  languageName: node
+  linkType: hard
+
+"tmp-promise@npm:^3.0.2":
+  version: 3.0.3
+  resolution: "tmp-promise@npm:3.0.3"
+  dependencies:
+    tmp: ^0.2.0
+  checksum: f854f5307dcee6455927ec3da9398f139897faf715c5c6dcee6d9471ae85136983ea06662eba2edf2533bdcb0fca66d16648e79e14381e30c7fb20be9c1aa62c
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -42780,7 +45336,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tmp@npm:^0.2.3":
+"tmp@npm:^0.2.0, tmp@npm:^0.2.3":
   version: 0.2.3
   resolution: "tmp@npm:0.2.3"
   checksum: 73b5c96b6e52da7e104d9d44afb5d106bb1e16d9fa7d00dbeb9e6522e61b571fbdb165c756c62164be9a3bbe192b9b268c236d370a2a0955c7689cd2ae377b95
@@ -42801,13 +45357,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-fast-properties@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-fast-properties@npm:2.0.0"
-  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
-  languageName: node
-  linkType: hard
-
 "to-readable-stream@npm:^1.0.0":
   version: 1.0.0
   resolution: "to-readable-stream@npm:1.0.0"
@@ -42885,6 +45434,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "tough-cookie@npm:5.0.0"
+  dependencies:
+    tldts: ^6.1.32
+  checksum: 774f6c939c96f74b5847361f7e11e0d69383681d21a35a2d37a20956638e614ec521782d2d20bcb32b58638ff337bba87cc72fb72c987bd02ea0fdfc93994cdb
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:~2.5.0":
   version: 2.5.0
   resolution: "tough-cookie@npm:2.5.0"
@@ -42895,15 +45453,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "tr46@npm:2.1.0"
-  dependencies:
-    punycode: ^2.1.1
-  checksum: ffe6049b9dca3ae329b059aada7f515b0f0064c611b39b51ff6b53897e954650f6f63d9319c6c008d36ead477c7b55e5f64c9dc60588ddc91ff720d64eb710b3
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^3.0.0":
   version: 3.0.0
   resolution: "tr46@npm:3.0.0"
@@ -42913,6 +45462,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tr46@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "tr46@npm:5.0.0"
+  dependencies:
+    punycode: ^2.3.1
+  checksum: 8d8b021f8e17675ebf9e672c224b6b6cfdb0d5b92141349e9665c14a2501c54a298d11264bbb0b17b447581e1e83d4fc3c038c929f3d210e3964d4be47460288
+  languageName: node
+  linkType: hard
+
 "tr46@npm:~0.0.3":
   version: 0.0.3
   resolution: "tr46@npm:0.0.3"
@@ -42920,13 +45478,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"traverse@npm:=0.6.8":
-  version: 0.6.8
-  resolution: "traverse@npm:0.6.8"
-  checksum: ef22abfc73fe2052403093b6747febbfeb52dcf827db1ca0542a78932c918706b9b12c373ef27e1c3e07e3e92eb1c646b4fe97b936fe775d59cbce7da417e13b
-  languageName: node
-  linkType: hard
-
 "tree-kill@npm:^1.2.2":
   version: 1.2.2
   resolution: "tree-kill@npm:1.2.2"
@@ -43018,6 +45569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-dedent@npm:^2.0.0, ts-dedent@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "ts-dedent@npm:2.2.0"
+  checksum: 93ed8f7878b6d5ed3c08d99b740010eede6bccfe64bce61c5a4da06a2c17d6ddbb80a8c49c2d15251de7594a4f93ffa21dd10e7be75ef66a4dc9951b4a94e2af
+  languageName: node
+  linkType: hard
+
 "ts-easing@npm:^0.2.0":
   version: 0.2.0
   resolution: "ts-easing@npm:0.2.0"
@@ -43055,23 +45613,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-morph@npm:^22.0.0":
-  version: 22.0.0
-  resolution: "ts-morph@npm:22.0.0"
+"ts-morph@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "ts-morph@npm:24.0.0"
   dependencies:
-    "@ts-morph/common": ~0.23.0
-    code-block-writer: ^13.0.1
-  checksum: 7bf0ec8cc9ab2a4ce528ec249634db315caa01b5783259484fd91ac0dae2f05b94d9c53ba236939fad2b8ab882e7fce1c82a689ab7c9a4a9dcec5c1160d77264
-  languageName: node
-  linkType: hard
-
-"ts-morph@npm:^23.0.0":
-  version: 23.0.0
-  resolution: "ts-morph@npm:23.0.0"
-  dependencies:
-    "@ts-morph/common": ~0.24.0
-    code-block-writer: ^13.0.1
-  checksum: 3282eb0f8bd4577770874736c3259b97501da9a86137160b5d68f106b7848ea7b1fbccf9e198a3d930ec40c993e9951d4bfae31e2562dac8f3de0d7bb0e23615
+    "@ts-morph/common": ~0.25.0
+    code-block-writer: ^13.0.3
+  checksum: 49eabeaa00f0922d2d6b955b85f17e6fd49e1270116ef37f1948c5515d2c84c1b6aa821bba436292c67568cd74e0b2734c37219b8f155b1d444150c8383580e0
   languageName: node
   linkType: hard
 
@@ -43139,13 +45687,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.7.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tsconfig-paths@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "tsconfig-paths@npm:4.2.0"
+  dependencies:
+    json5: ^2.2.2
+    minimist: ^1.2.6
+    strip-bom: ^3.0.0
+  checksum: 28c5f7bbbcabc9dabd4117e8fdc61483f6872a1c6b02a4b1c4d68c5b79d06896c3cc9547610c4c3ba64658531caa2de13ead1ea1bf321c7b53e969c4752b98c7
+  languageName: node
+  linkType: hard
+
+"tslib@npm:2.7.0":
   version: 2.7.0
   resolution: "tslib@npm:2.7.0"
   checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
   languageName: node
   linkType: hard
 
+"tslib@npm:2.8.1, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2, tslib@npm:^2.8.0, tslib@npm:^2.8.1":
+  version: 2.8.1
+  resolution: "tslib@npm:2.8.1"
+  checksum: e4aba30e632b8c8902b47587fd13345e2827fa639e7c3121074d5ee0880723282411a8838f830b55100cbe4517672f84a2472667d355b81e8af165a55dc6203a
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^1.11.1, tslib@npm:^1.14.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
@@ -43201,6 +45767,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tween-functions@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "tween-functions@npm:1.2.0"
+  checksum: 880708d680eff5c347ddcb9f922ad121703a91c78ce308ed309073e73a794b633eb0b80589a839365803f150515ad34c9646809ae8a0e90f09e62686eefb1ab6
+  languageName: node
+  linkType: hard
+
 "tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
   version: 0.14.5
   resolution: "tweetnacl@npm:0.14.5"
@@ -43509,6 +46082,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ufo@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "ufo@npm:1.5.4"
+  checksum: f244703b7d4f9f0df4f9af23921241ab73410b591f4e5b39c23e3147f3159b139a4b1fb5903189c306129f7a16b55995dac0008e0fbae88a37c3e58cbc34d833
+  languageName: node
+  linkType: hard
+
 "uglify-js@npm:^3.1.4":
   version: 3.17.0
   resolution: "uglify-js@npm:3.17.0"
@@ -43577,9 +46157,9 @@ __metadata:
   linkType: hard
 
 "underscore@npm:^1.12.1":
-  version: 1.13.6
-  resolution: "underscore@npm:1.13.6"
-  checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36
+  version: 1.13.7
+  resolution: "underscore@npm:1.13.7"
+  checksum: 174b011af29e4fbe2c70eb2baa8bfab0d0336cf2f5654f364484967bc6264a86224d0134b9176e4235c8cceae00d11839f0fd4824268de04b11c78aca1241684
   languageName: node
   linkType: hard
 
@@ -43597,6 +46177,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~6.20.0":
+  version: 6.20.0
+  resolution: "undici-types@npm:6.20.0"
+  checksum: b7bc50f012dc6afbcce56c9fd62d7e86b20a62ff21f12b7b5cbf1973b9578d90f22a9c7fe50e638e96905d33893bf2f9f16d98929c4673c2480de05c6c96ea8b
+  languageName: node
+  linkType: hard
+
 "undici@npm:^5.28.4":
   version: 5.28.4
   resolution: "undici@npm:5.28.4"
@@ -43646,6 +46233,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unicorn-magic@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "unicorn-magic@npm:0.1.0"
+  checksum: 48c5882ca3378f380318c0b4eb1d73b7e3c5b728859b060276e0a490051d4180966beeb48962d850fd0c6816543bcdfc28629dcd030bb62a286a2ae2acb5acb6
+  languageName: node
+  linkType: hard
+
 "unified@npm:^10.0.0":
   version: 10.1.0
   resolution: "unified@npm:10.1.0"
@@ -43841,6 +46435,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unplugin@npm:^1.3.1":
+  version: 1.16.0
+  resolution: "unplugin@npm:1.16.0"
+  dependencies:
+    acorn: ^8.14.0
+    webpack-virtual-modules: ^0.6.2
+  checksum: 84bff88dd8fd6ba88bd21dad1b170fea2a91f7ff8ddcfadf826297cf77dfe305f3428f1612c0637f30d7ac10d668491f15fdf8f378dd56def370fdbc16edd85e
+  languageName: node
+  linkType: hard
+
 "unraw@npm:^3.0.0":
   version: 3.0.0
   resolution: "unraw@npm:3.0.0"
@@ -43862,17 +46466,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "update-browserslist-db@npm:1.1.0"
+"update-browserslist-db@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "update-browserslist-db@npm:1.1.1"
   dependencies:
-    escalade: ^3.1.2
-    picocolors: ^1.0.1
+    escalade: ^3.2.0
+    picocolors: ^1.1.0
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 7b74694d96f0c360f01b702e72353dc5a49df4fe6663d3ee4e5c628f061576cddf56af35a3a886238c01dd3d8f231b7a86a8ceaa31e7a9220ae31c1c1238e562
+  checksum: 2ea11bd2562122162c3e438d83a1f9125238c0844b6d16d366e3276d0c0acac6036822dc7df65fc5a89c699cdf9f174acf439c39bedf3f9a2f3983976e4b4c3e
   languageName: node
   linkType: hard
 
@@ -43939,7 +46543,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
+"url-parse@npm:^1.4.3, url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
   dependencies:
@@ -43949,6 +46553,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-template@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "url-template@npm:2.0.8"
+  checksum: 4183fccd74e3591e4154134d4443dccecba9c455c15c7df774f1f1e3fa340fd9bffb903b5beec347196d15ce49c34edf6dec0634a95d170ad6e78c0467d6e13e
+  languageName: node
+  linkType: hard
+
 "url-value-parser@npm:^2.0.0":
   version: 2.0.3
   resolution: "url-value-parser@npm:2.0.3"
@@ -44049,15 +46660,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-resize-observer@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "use-resize-observer@npm:8.0.0"
+"use-resize-observer@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "use-resize-observer@npm:9.1.0"
   dependencies:
     "@juggle/resize-observer": ^3.3.1
   peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: 944ce47811f6056b481ce2f1550c2881bd5c25838cae2e0fb0bc0ed4aad7b5f2e55dcc0fc52107998ecfb602446465f94b2e728d3f3259fe8e6d4a3031cfb24a
+    react: 16.8.0 - 18
+    react-dom: 16.8.0 - 18
+  checksum: 92be0ac34a3b3cf884cd55847c90792b5b44833dc258e96d650152815ad246afe45825aa223332203004d836535a927ab74f18dc0313229e2c7c69510eddf382
   languageName: node
   linkType: hard
 
@@ -44077,12 +46688,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:^1.0.0, use-sync-external-store@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "use-sync-external-store@npm:1.2.0"
+"use-sync-external-store@npm:^1.0.0, use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "use-sync-external-store@npm:1.2.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a
+  checksum: fe07c071c4da3645f112c38c0e57beb479a8838616ff4e92598256ecce527f2888c08febc7f9b2f0ce2f0e18540ba3cde41eb2035e4fafcb4f52955037098a81
   languageName: node
   linkType: hard
 
@@ -44154,6 +46765,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^11.0.0, uuid@npm:^11.0.2":
+  version: 11.0.3
+  resolution: "uuid@npm:11.0.3"
+  bin:
+    uuid: dist/esm/bin/uuid
+  checksum: 646181c77e8b8df9bd07254faa703943e1c4d5ccde7d080312edf12f443f6c5750801fd9b27bf2e628594182165e6b1b880c0382538f7eca00b26622203741dc
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^3.3.2, uuid@npm:^3.4.0":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
@@ -44350,6 +46970,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-node@npm:^1.2.0":
+  version: 1.6.0
+  resolution: "vite-node@npm:1.6.0"
+  dependencies:
+    cac: ^6.7.14
+    debug: ^4.3.4
+    pathe: ^1.1.1
+    picocolors: ^1.0.0
+    vite: ^5.0.0
+  bin:
+    vite-node: vite-node.mjs
+  checksum: ce111c5c7a4cf65b722baa15cbc065b7bfdbf1b65576dd6372995f6a72b2b93773ec5df59f6c5f08cfe1284806597b44b832efcea50d5971102428159ff4379f
+  languageName: node
+  linkType: hard
+
 "vite-plugin-html@npm:^3.2.2":
   version: 3.2.2
   resolution: "vite-plugin-html@npm:3.2.2"
@@ -44384,9 +47019,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.0":
-  version: 5.4.9
-  resolution: "vite@npm:5.4.9"
+"vite@npm:^5.0.0, vite@npm:^5.0.11":
+  version: 5.4.11
+  resolution: "vite@npm:5.4.11"
   dependencies:
     esbuild: ^0.21.3
     fsevents: ~2.3.3
@@ -44423,7 +47058,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: d3229e0618ece284af0478ec09c474a7a70ac369920716afdb6ebed8e320fd17a17c60afddba0d436698fe4837474cccd057c3e7d8270281b57506b78c5fbb8c
+  checksum: 8c5b31d17487b69c40a30419dc0ade9f33360eb6893dbfa33a90980271bd74d35ae550b5cbb2a9e640f0df41ea36fd1bb4f222c98f6d02e607080f20832e69e8
   languageName: node
   linkType: hard
 
@@ -44457,15 +47092,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"w3c-xmlserializer@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "w3c-xmlserializer@npm:2.0.0"
-  dependencies:
-    xml-name-validator: ^3.0.0
-  checksum: ae25c51cf71f1fb2516df1ab33a481f83461a117565b95e3d0927432522323f93b1b2846cbb60196d337970c421adb604fc2d0d180c6a47a839da01db5b9973b
-  languageName: node
-  linkType: hard
-
 "w3c-xmlserializer@npm:^3.0.0":
   version: 3.0.0
   resolution: "w3c-xmlserializer@npm:3.0.0"
@@ -44475,6 +47101,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"w3c-xmlserializer@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "w3c-xmlserializer@npm:5.0.0"
+  dependencies:
+    xml-name-validator: ^5.0.0
+  checksum: 593acc1fdab3f3207ec39d851e6df0f3fa41a36b5809b0ace364c7a6d92e351938c53424a7618ce8e0fbaffee8be2e8e070a5734d05ee54666a8bdf1a376cc40
+  languageName: node
+  linkType: hard
+
 "wait-for-expect@npm:^3.0.2":
   version: 3.0.2
   resolution: "wait-for-expect@npm:3.0.2"
@@ -44567,20 +47202,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "webidl-conversions@npm:5.0.0"
-  checksum: ccf1ec2ca7c0b5671e5440ace4a66806ae09c49016ab821481bec0c05b1b82695082dc0a27d1fe9d804d475a408ba0c691e6803fd21be608e710955d4589cd69
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "webidl-conversions@npm:6.1.0"
-  checksum: 1f526507aa491f972a0c1409d07f8444e1d28778dfa269a9971f2e157182f3d496dc33296e4ed45b157fdb3bf535bb90c90bf10c50dcf1dd6caacb2a34cc84fb
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
@@ -44588,6 +47209,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-dev-middleware@npm:^6.1.2":
+  version: 6.1.3
+  resolution: "webpack-dev-middleware@npm:6.1.3"
+  dependencies:
+    colorette: ^2.0.10
+    memfs: ^3.4.12
+    mime-types: ^2.1.31
+    range-parser: ^1.2.1
+    schema-utils: ^4.0.0
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+  checksum: ddedaa913cc39d7ac7f971d902f181ecc5c4ab0b91f9eda5923f0ea513ecf458f71046f2ed423cb4fc657c2177fe279186453e395bd1051f0949e265c3124665
+  languageName: node
+  linkType: hard
+
 "webpack-dev-middleware@npm:^7.1.0, webpack-dev-middleware@npm:^7.4.2":
   version: 7.4.2
   resolution: "webpack-dev-middleware@npm:7.4.2"
@@ -44699,6 +47338,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-hot-middleware@npm:^2.25.1":
+  version: 2.26.1
+  resolution: "webpack-hot-middleware@npm:2.26.1"
+  dependencies:
+    ansi-html-community: 0.0.8
+    html-entities: ^2.1.0
+    strip-ansi: ^6.0.0
+  checksum: 78513d8d5770c59c3039ce094c49b2e2772b3f1d4ec5c124a7aabe6124a0e08429993b81129649087dc300f496822257e39135bf8b891b51aea197c1b554072a
+  languageName: node
+  linkType: hard
+
+"webpack-merge@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "webpack-merge@npm:6.0.1"
+  dependencies:
+    clone-deep: ^4.0.1
+    flat: ^5.0.2
+    wildcard: ^2.0.1
+  checksum: e8a604c686b944605a1c57cc7b75e886ab902dc5ffdd15259a092c5c2dd5f58868fe39f995ea4bad4f189e38843b061c4ae1eb22822d7169813f4adab571dc3d
+  languageName: node
+  linkType: hard
+
 "webpack-sources@npm:^1.4.3":
   version: 1.4.3
   resolution: "webpack-sources@npm:1.4.3"
@@ -44716,17 +47377,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:^5, webpack@npm:^5.94.0":
-  version: 5.95.0
-  resolution: "webpack@npm:5.95.0"
+"webpack-virtual-modules@npm:^0.6.0, webpack-virtual-modules@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "webpack-virtual-modules@npm:0.6.2"
+  checksum: 7e8e1d63f35864c815420cc2f27da8561a1e028255040698a352717de0ba46d3b3faf16f06c1a1965217054c4c2894eb9af53a85451870e919b5707ce9c5822d
+  languageName: node
+  linkType: hard
+
+"webpack@npm:5, webpack@npm:^5, webpack@npm:^5.94.0":
+  version: 5.96.1
+  resolution: "webpack@npm:5.96.1"
   dependencies:
-    "@types/estree": ^1.0.5
+    "@types/eslint-scope": ^3.7.7
+    "@types/estree": ^1.0.6
     "@webassemblyjs/ast": ^1.12.1
     "@webassemblyjs/wasm-edit": ^1.12.1
     "@webassemblyjs/wasm-parser": ^1.12.1
-    acorn: ^8.7.1
-    acorn-import-attributes: ^1.9.5
-    browserslist: ^4.21.10
+    acorn: ^8.14.0
+    browserslist: ^4.24.0
     chrome-trace-event: ^1.0.2
     enhanced-resolve: ^5.17.1
     es-module-lexer: ^1.2.1
@@ -44748,7 +47416,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 0c3dfe288de4d62f8f3dc25478a618894883cab739121330763b7847e43304630ea2815ae2351a5f8ff6ab7c9642caf530d503d89bda261fe2cd220e524dd5d1
+  checksum: ec3662f64895fae408440a997f87299e374c9d9f911f77b880bab46402f52221c7836bdf101fc2556338d07fc7cb86da50661f944eb1d1041a8361a5b9247876
   languageName: node
   linkType: hard
 
@@ -44770,15 +47438,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "whatwg-encoding@npm:1.0.5"
-  dependencies:
-    iconv-lite: 0.4.24
-  checksum: 5be4efe111dce29ddee3448d3915477fcc3b28f991d9cf1300b4e50d6d189010d47bca2f51140a844cf9b726e8f066f4aee72a04d687bfe4f2ee2767b2f5b1e6
-  languageName: node
-  linkType: hard
-
 "whatwg-encoding@npm:^2.0.0":
   version: 2.0.0
   resolution: "whatwg-encoding@npm:2.0.0"
@@ -44788,10 +47447,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "whatwg-mimetype@npm:2.3.0"
-  checksum: 23eb885940bcbcca4ff841c40a78e9cbb893ec42743993a42bf7aed16085b048b44b06f3402018931687153550f9a32d259dfa524e4f03577ab898b6965e5383
+"whatwg-encoding@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "whatwg-encoding@npm:3.1.1"
+  dependencies:
+    iconv-lite: 0.6.3
+  checksum: f75a61422421d991e4aec775645705beaf99a16a88294d68404866f65e92441698a4f5b9fa11dd609017b132d7b286c3c1534e2de5b3e800333856325b549e3c
   languageName: node
   linkType: hard
 
@@ -44802,6 +47463,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: f97edd4b4ee7e46a379f3fb0e745de29fe8b839307cc774300fd49059fcdd560d38cb8fe21eae5575b8f39b022f23477cc66e40b0355c2851ce84760339cef30
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -44812,6 +47480,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "whatwg-url@npm:14.0.0"
+  dependencies:
+    tr46: ^5.0.0
+    webidl-conversions: ^7.0.0
+  checksum: 4b5887e50f786583bead70916413e67a381d2126899b9eb5c67ce664bba1e7ec07cdff791404581ce73c6190d83c359c9ca1d50711631217905db3877dec075c
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^5.0.0":
   version: 5.0.0
   resolution: "whatwg-url@npm:5.0.0"
@@ -44822,17 +47500,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
-  version: 8.7.0
-  resolution: "whatwg-url@npm:8.7.0"
-  dependencies:
-    lodash: ^4.7.0
-    tr46: ^2.1.0
-    webidl-conversions: ^6.1.0
-  checksum: a87abcc6cefcece5311eb642858c8fdb234e51ec74196bfacf8def2edae1bfbffdf6acb251646ed6301f8cee44262642d8769c707256125a91387e33f405dd1e
-  languageName: node
-  linkType: hard
-
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -44888,7 +47555,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
   version: 1.1.15
   resolution: "which-typed-array@npm:1.1.15"
   dependencies:
@@ -44952,6 +47619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wildcard@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "wildcard@npm:2.0.1"
+  checksum: e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c
+  languageName: node
+  linkType: hard
+
 "winston-transport@npm:^4.5.0, winston-transport@npm:^4.7.0":
   version: 4.8.0
   resolution: "winston-transport@npm:4.8.0"
@@ -44964,8 +47638,8 @@ __metadata:
   linkType: hard
 
 "winston@npm:^3.13.0, winston@npm:^3.2.1":
-  version: 3.15.0
-  resolution: "winston@npm:3.15.0"
+  version: 3.16.0
+  resolution: "winston@npm:3.16.0"
   dependencies:
     "@colors/colors": ^1.6.0
     "@dabh/diagnostics": ^2.0.2
@@ -44978,7 +47652,7 @@ __metadata:
     stack-trace: 0.0.x
     triple-beam: ^1.3.0
     winston-transport: ^4.7.0
-  checksum: 2ae6f3a3359fadd90f69a4db20d78aba6901e18114648e48c8538e925511e4820f8d488f19b1c026096ece614732338aa138f4a0fa2c5e29e8fbc53029f55473
+  checksum: 2b01d51d8dc355c7eec67fe26f1f9642a5d4fb4ad3db38612229fa95c7c925fba7cbe3d87d362f36c433f9ad15032d455f96159a5bbe77166c4a8cf440127a6d
   languageName: node
   linkType: hard
 
@@ -45079,7 +47753,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:*, ws@npm:8.18.0, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.8.0":
+"ws@npm:*, ws@npm:8.18.0, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.2.3, ws@npm:^8.8.0":
   version: 8.18.0
   resolution: "ws@npm:8.18.0"
   peerDependencies:
@@ -45094,7 +47768,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7, ws@npm:^7.4.6, ws@npm:^7.5.5":
+"ws@npm:^7, ws@npm:^7.5.5":
   version: 7.5.10
   resolution: "ws@npm:7.5.10"
   peerDependencies:
@@ -45154,13 +47828,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml-name-validator@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "xml-name-validator@npm:3.0.0"
-  checksum: b3ac459afed783c285bb98e4960bd1f3ba12754fd4f2320efa0f9181ca28928c53cc75ca660d15d205e81f92304419afe94c531c7cfb3e0649aa6d140d53ecb0
-  languageName: node
-  linkType: hard
-
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
@@ -45168,6 +47835,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml-name-validator@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "xml-name-validator@npm:5.0.0"
+  checksum: 86effcc7026f437701252fcc308b877b4bc045989049cfc79b0cc112cb365cf7b009f4041fab9fb7cd1795498722c3e9fe9651afc66dfa794c16628a639a4c45
+  languageName: node
+  linkType: hard
+
 "xml2js@npm:^0.6.2":
   version: 0.6.2
   resolution: "xml2js@npm:0.6.2"
@@ -45266,10 +47940,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "yallist@npm:2.1.2"
-  checksum: 9ba99409209f485b6fcb970330908a6d41fa1c933f75e08250316cce19383179a6b70a7e0721b89672ebb6199cc377bf3e432f55100da6a7d6e11902b0a642cb
+"yallist@npm:4.0.0, yallist@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "yallist@npm:4.0.0"
+  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
   languageName: node
   linkType: hard
 
@@ -45280,10 +47954,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "yallist@npm:4.0.0"
-  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
+"yallist@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "yallist@npm:5.0.0"
+  checksum: eba51182400b9f35b017daa7f419f434424410691bbc5de4f4240cc830fdef906b504424992700dc047f16b4d99100a6f8b8b11175c193f38008e9c96322b6a5
   languageName: node
   linkType: hard
 
@@ -45317,11 +47991,11 @@ __metadata:
   linkType: hard
 
 "yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.2, yaml@npm:^2.3.3, yaml@npm:^2.3.4":
-  version: 2.6.0
-  resolution: "yaml@npm:2.6.0"
+  version: 2.6.1
+  resolution: "yaml@npm:2.6.1"
   bin:
     yaml: bin.mjs
-  checksum: e5e74fd75e01bde2c09333d529af9fbb5928c5f7f01bfdefdcb2bf753d4ef489a45cab4deac01c9448f55ca27e691612b81fe3c3a59bb8cb5b0069da0f92cf0b
+  checksum: 5cf2627f121dcf04ccdebce8e6cbac7c9983d465c4eab314f6fbdc13cda8a07f4e8f9c2252a382b30bcabe05ee3c683647293afd52eb37cbcefbdc7b6ebde9ee
   languageName: node
   linkType: hard
 
@@ -45389,20 +48063,19 @@ __metadata:
     "@yarnpkg/builder": ^4.0.0
     "@yarnpkg/core": ^4.0.3
     "@yarnpkg/fslib": ^3.0.2
-    chalk: ^4.0.0
-    lodash: ^4.17.21
+    "@yarnpkg/plugin-pack": ^4.0.0
     nodemon: ^3.0.1
     semver: ^7.6.0
   languageName: unknown
   linkType: soft
 
 "yauzl@npm:^3.0.0":
-  version: 3.1.3
-  resolution: "yauzl@npm:3.1.3"
+  version: 3.2.0
+  resolution: "yauzl@npm:3.2.0"
   dependencies:
     buffer-crc32: ~0.2.3
     pend: ~1.2.0
-  checksum: 5b782f6e99361a9c715e7a82e7aae3d983b6ddff6ebe3a66d2dd3f4ee601ec41c55fa88587bf6de0acbc013aac0b2cac84f9f0cd48372fd5329ee5e273f46f2c
+  checksum: d16440447bbc4973cf60c455290d6a394c47b82d449193098b10c69a6cc8f3eb003e361a512d1885ca67c96c95351aadb46bfcc47ee2c73a5134743d99275554
   languageName: node
   linkType: hard
 
@@ -45491,6 +48164,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yoctocolors-cjs@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "yoctocolors-cjs@npm:2.1.2"
+  checksum: 1c474d4b30a8c130e679279c5c2c33a0d48eba9684ffa0252cc64846c121fb56c3f25457fef902edbe1e2d7a7872130073a9fc8e795299d75e13fa3f5f548f1b
+  languageName: node
+  linkType: hard
+
 "yoga-layout-prebuilt@npm:^1.9.6":
   version: 1.10.0
   resolution: "yoga-layout-prebuilt@npm:1.10.0"
@@ -45538,11 +48218,11 @@ __metadata:
   linkType: hard
 
 "zod-to-json-schema@npm:^3.20.4, zod-to-json-schema@npm:^3.21.4":
-  version: 3.23.3
-  resolution: "zod-to-json-schema@npm:3.23.3"
+  version: 3.23.5
+  resolution: "zod-to-json-schema@npm:3.23.5"
   peerDependencies:
     zod: ^3.23.3
-  checksum: 0d51cf64b54fd39e86434cd5d2239c2981808e6461d022e4c68a1dec67fff28ef2b7bb5733dfd40eb50d6ce6d252288f3989d67134fa81401c36469bb26f13ec
+  checksum: 3ac37128d1b989b027e55684201e1da90237f0955dc9bb40da013bc60f2ed23c57026df2fdc14da187be4d53873daad08210807c28c0dde4375c9df0e5fe7901
   languageName: node
   linkType: hard