diff --git a/.changeset/brave-boats-greet.md b/.changeset/brave-boats-greet.md
deleted file mode 100644
index e9d3debc35..0000000000
--- a/.changeset/brave-boats-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-lighthouse': patch
----
-
-Strip trailing slash from url when creating a new audit. This change prevents duplicate audits from being displayed in the audit list.
diff --git a/.changeset/bright-icons-repair.md b/.changeset/bright-icons-repair.md
new file mode 100644
index 0000000000..8c3f43403a
--- /dev/null
+++ b/.changeset/bright-icons-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Support HTTP 400 Bad Request from Kubernetes API
diff --git a/.changeset/cost-insights-careless-coins-pretend b/.changeset/cost-insights-careless-coins-pretend.md
similarity index 100%
rename from .changeset/cost-insights-careless-coins-pretend
rename to .changeset/cost-insights-careless-coins-pretend.md
diff --git a/.changeset/eighty-rats-smash.md b/.changeset/eighty-rats-smash.md
deleted file mode 100644
index 4d49d0f203..0000000000
--- a/.changeset/eighty-rats-smash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-import': patch
----
-
-Improve how URLs are analyzed for add/import
diff --git a/.changeset/eleven-badgers-wink.md b/.changeset/eleven-badgers-wink.md
deleted file mode 100644
index a08c11d257..0000000000
--- a/.changeset/eleven-badgers-wink.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/techdocs-common': patch
-'@backstage/plugin-techdocs-backend': patch
----
-
-Improve techdocs-common Generator API for it to be used by techdocs-cli. TechDocs generator.run function now takes
-an input AND an output directory. Most probably you use techdocs-common via plugin-techdocs-backend, and so there
-is no breaking change for you.
-But if you use techdocs-common separately, you need to create an output directory and pass into the generator.
diff --git a/.changeset/flat-cycles-lay.md b/.changeset/flat-cycles-lay.md
deleted file mode 100644
index 2f84b38ffb..0000000000
--- a/.changeset/flat-cycles-lay.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-kubernetes': patch
-'@backstage/plugin-kubernetes-backend': patch
----
-
-Revamped Kubernetes UI and added error reporting/detection
diff --git a/.changeset/flat-walls-burn.md b/.changeset/flat-walls-burn.md
deleted file mode 100644
index 370b651a4b..0000000000
--- a/.changeset/flat-walls-burn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/integration': minor
----
-
-Build out the `ScmIntegrations` class, as well as the individual `*Integration` classes
diff --git a/.changeset/friendly-masks-dress.md b/.changeset/friendly-masks-dress.md
deleted file mode 100644
index 31405f88eb..0000000000
--- a/.changeset/friendly-masks-dress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/catalog-model': patch
----
-
-Export the `schemaValidator` helper function.
diff --git a/.changeset/friendly-rats-wonder.md b/.changeset/friendly-rats-wonder.md
deleted file mode 100644
index 5a5b30f98a..0000000000
--- a/.changeset/friendly-rats-wonder.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-jenkins': patch
----
-
-Handle missing ObjectMetadataAction in Jenkins API
diff --git a/.changeset/generic-catalog-import-descriptions.md b/.changeset/generic-catalog-import-descriptions.md
deleted file mode 100644
index 8f28ce4afd..0000000000
--- a/.changeset/generic-catalog-import-descriptions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-import': patch
----
-
-Add more generic descriptions for the catalog-import form.
diff --git a/.changeset/grumpy-trains-juggle.md b/.changeset/grumpy-trains-juggle.md
deleted file mode 100644
index 91ba37b72a..0000000000
--- a/.changeset/grumpy-trains-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-Fix bug where binary files (`png`, etc.) could not load when using AWS or GCS publisher.
diff --git a/.changeset/heavy-owls-float.md b/.changeset/heavy-owls-float.md
deleted file mode 100644
index 274876e723..0000000000
--- a/.changeset/heavy-owls-float.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-'@backstage/techdocs-common': patch
-'@backstage/plugin-techdocs': patch
----
-
-Google Cloud authentication in TechDocs has been improved.
-
-1. `techdocs.publisher.googleGcs.credentials` is now optional. If it is missing, `GOOGLE_APPLICATION_CREDENTIALS`
-   environment variable (and some other methods) will be used to authenticate.
-   Read more here https://cloud.google.com/docs/authentication/production
-
-2. `techdocs.publisher.googleGcs.projectId` is no longer used. You can remove it from your `app-config.yaml`.
diff --git a/.changeset/loud-kids-dance.md b/.changeset/loud-kids-dance.md
new file mode 100644
index 0000000000..4fd32ac348
--- /dev/null
+++ b/.changeset/loud-kids-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Append `-credentials.yaml` to credentials file generated by `backstage-cli create-github-app` and display warning about sensitive contents.
diff --git a/.changeset/sixty-ants-give.md b/.changeset/orange-avocados-work.md
similarity index 55%
rename from .changeset/sixty-ants-give.md
rename to .changeset/orange-avocados-work.md
index f5cb46bdb7..a1f3597302 100644
--- a/.changeset/sixty-ants-give.md
+++ b/.changeset/orange-avocados-work.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog-backend': patch
 ---
 
-AWS SDK version bump for Catalog Backend.
+Refuse to remove the bootstrap location
diff --git a/.changeset/rare-paws-listen.md b/.changeset/rare-paws-listen.md
deleted file mode 100644
index 1946cd7f2f..0000000000
--- a/.changeset/rare-paws-listen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-import': patch
----
-
-Remove dependency to `@backstage/plugin-catalog-backend`.
diff --git a/.changeset/red-baboons-rhyme.md b/.changeset/red-baboons-rhyme.md
deleted file mode 100644
index dcf924e912..0000000000
--- a/.changeset/red-baboons-rhyme.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Enable catalog table actions for all location types.
-
-The edit button has had support for other providers for a while and there is
-no specific reason the View in GitHub cannot work for all locations. This
-change also replaces the GitHub icon with the OpenInNew icon.
diff --git a/.changeset/rich-games-yawn.md b/.changeset/rich-games-yawn.md
deleted file mode 100644
index 1106a8b3de..0000000000
--- a/.changeset/rich-games-yawn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core': patch
----
-
-Fix issue where `SidebarItem` with `onClick` and without `to` renders an inaccessible div. It now renders a button.
diff --git a/.changeset/short-badgers-collect.md b/.changeset/short-badgers-collect.md
deleted file mode 100644
index 25f5a4044f..0000000000
--- a/.changeset/short-badgers-collect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-AWS SDK version bump for TechDocs.
diff --git a/.changeset/smooth-pigs-deny.md b/.changeset/smooth-pigs-deny.md
deleted file mode 100644
index 702c6ab2de..0000000000
--- a/.changeset/smooth-pigs-deny.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Allow blank certificates and support logout URLs in the SAML provider.
diff --git a/.changeset/spicy-feet-sparkle.md b/.changeset/spicy-feet-sparkle.md
deleted file mode 100644
index dcc8a7c5fb..0000000000
--- a/.changeset/spicy-feet-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Added experimental `create-github-app` command.
diff --git a/.changeset/spoon-fork.md b/.changeset/spoon-fork.md
new file mode 100644
index 0000000000..5b8620f94e
--- /dev/null
+++ b/.changeset/spoon-fork.md
@@ -0,0 +1,12 @@
+---
+'@backstage/create-app': patch
+---
+
+Add `*-credentials.yaml` to gitignore to prevent accidental commits of sensitive credential information.
+
+To apply this change to an existing installation, add these lines to your `.gitignore`
+
+```gitignore
+# Sensitive credentials
+*-credentials.yaml
+```
diff --git a/.changeset/spotty-moons-tap.md b/.changeset/spotty-moons-tap.md
new file mode 100644
index 0000000000..facb76a296
--- /dev/null
+++ b/.changeset/spotty-moons-tap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Reduce log noise on locations refresh
diff --git a/.changeset/stale-cougars-wink.md b/.changeset/stale-cougars-wink.md
deleted file mode 100644
index 306d92ef8f..0000000000
--- a/.changeset/stale-cougars-wink.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@backstage/techdocs-common': patch
-'@backstage/plugin-techdocs': patch
----
-
-AWS S3 authentication in TechDocs has been improved.
-
-1. `techdocs.publisher.awsS3.bucketName` is now the only required config. `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are optional.
-
-2. If `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are missing, the AWS environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` will be used. There are more better ways of setting up AWS authentication. Read the guide at https://backstage.io/docs/features/techdocs/using-cloud-storage
diff --git a/.changeset/techdocs-mean-items-behave.md b/.changeset/techdocs-mean-items-behave.md
new file mode 100644
index 0000000000..77679c39d4
--- /dev/null
+++ b/.changeset/techdocs-mean-items-behave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/techdocs-common': patch
+---
+
+@backstage/techdocs-common can now be imported in an environment without @backstage/plugin-techdocs-backend being installed.
diff --git a/.changeset/twelve-gorillas-give.md b/.changeset/twelve-gorillas-give.md
deleted file mode 100644
index ed13fc773c..0000000000
--- a/.changeset/twelve-gorillas-give.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/catalog-model': patch
-'@backstage/plugin-catalog-backend': patch
----
-
-Add subcomponentOf to Component kind to represent subsystems of larger components.
diff --git a/.changeset/unlucky-cougars-grin.md b/.changeset/unlucky-cougars-grin.md
new file mode 100644
index 0000000000..3c48a612e4
--- /dev/null
+++ b/.changeset/unlucky-cougars-grin.md
@@ -0,0 +1,9 @@
+---
+'@backstage/create-app': patch
+---
+
+Remove the `@types/helmet` dev dependency from the app template. This
+dependency is now unused as the package `helmet` brings its own types.
+
+To update your existing app, simply remove the `@types/helmet` dependency from
+the `package.json` of your backend package.
diff --git a/.changeset/wild-cats-end.md b/.changeset/wild-cats-end.md
new file mode 100644
index 0000000000..d2c9e6f245
--- /dev/null
+++ b/.changeset/wild-cats-end.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Update the @azure/msal-node dependency to 1.0.0-beta.3.
diff --git a/.changeset/wild-dolls-rest.md b/.changeset/wild-dolls-rest.md
deleted file mode 100644
index 33298dbb52..0000000000
--- a/.changeset/wild-dolls-rest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Export all preparers and publishers properly
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 495f1ff78d..11a756a597 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,3 +13,4 @@
 /plugins/techdocs-backend                   @backstage/techdocs-core
 /packages/techdocs-common                   @backstage/techdocs-core
 /.changeset/cost-insights-*                 @backstage/silver-lining
+/.changeset/techdocs-*                      @backstage/techdocs-core
diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt
index f4c7137d23..3188d059f6 100644
--- a/.github/styles/vocab.txt
+++ b/.github/styles/vocab.txt
@@ -70,6 +70,7 @@ Ek
 env
 Env
 eslint
+Expedia
 facto
 failover
 Figma
@@ -77,6 +78,7 @@ Firekube
 Fiverr
 freben
 Fredrik
+gitbeaker
 GitHub
 GitLab
 Grafana
@@ -107,6 +109,7 @@ Kaewkasi
 Knex
 kubectl
 kubernetes
+Kumar
 learnings
 lerna
 Lerna
@@ -142,6 +145,7 @@ npm
 nvarchar
 nvm
 OAuth
+octokit
 oidc
 Okta
 Oldsberg
@@ -181,6 +185,8 @@ rollbar
 Rollbar
 Rollup
 Rosaceae
+routable
+Routable
 rst
 rsync
 rugvip
@@ -193,6 +199,7 @@ semlas
 semver
 Serverless
 Sinon
+Sneha
 Snyk
 sourcemaps
 sparklines
diff --git a/.github/workflows/microsite-build-check.yml b/.github/workflows/microsite-build-check.yml
index 118ba942bb..45182229c9 100644
--- a/.github/workflows/microsite-build-check.yml
+++ b/.github/workflows/microsite-build-check.yml
@@ -27,6 +27,9 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: verify doc links
+        run: node scripts/verify-links.js
+
         # Skip caching of microsite dependencies, it keeps the global cache size
         # smaller, which make Windows builds a lot faster for the rest of the project.
       - name: yarn install
diff --git a/.gitignore b/.gitignore
index 3334bf956d..57ad74c5cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,6 @@ site
 
 # Local configuration files
 *.local.yaml
+
+# Sensitive credentials
+*-credentials.yaml
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 493bf499af..f7d1114008 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -1,19 +1,20 @@
-| Organization                                 | Contact                                                      | Description of Use                                                                                                                     |
-| -------------------------------------------- | ------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- |
-| [Spotify](https://www.spotify.com)           | [@leemills83](https://github.com/leemills83)                 | Main interface towards all of Spotify's infrastructure and technical documentation.                                                    |
-| [bol.com](https://www.bol.com)               | [@RoyJacobs](https://github.com/RoyJacobs)                   | Initial work being done to unify platform tooling.                                                                                     |
-| [DFDS](https://www.dfds.com)                 | [@carlsendk](https://github.com/carlsendk)                   | V2 self-service platform.                                                                                                              |
-| [Roadie](https://roadie.io)                  | [@dtuite](https://github.com/dtuite)                         | Hosted, managed Backstage with easy set-up                                                                                             |
-| [Roku](https://www.roku.com)                 | [@timurista](https://github.com/timurista)                   | Initial work on Cloud engineering service platform.                                                                                    |
-| [SDA SE](https://sda.se)                     | [@Fox32](https://github.com/Fox32)                           | Central place for developing and sharing services in our insurance ecosystem.                                                          |
-| [H-E-B](https://www.heb.com)                 | [@german-j-rodriguez](https://github.com/german-j-rodriguez) | Initial work on Engineering Portal service platform.                                                                                   |
-| [American Airlines](https://www.aa.com)      | [@paulpach](https://github.com/paulpach)                     | Central place for developers to develop and maintain applications                                                                      |
-| [Kiwi.com](https://kiwi.com)                 | [@aexvir](https://github.com/aexvir)                         | Replacing the frontend of [The Zoo](https://github.com/kiwicom/the-zoo), their service registry.                                       |
-| [Voi](https://www.voiscooters.com/)          | [@K-Phoen](https://github.com/K-Phoen)                       | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                              |
-| [Talkdesk](https://www.talkdesk.com)         | [@jaime-talkdesk](https://github.com/jaime-talkdesk)         | Initial work for Engineering Portal and Self Provisioning to R&D                                                                       |
-| [Wealthsimple](https://www.wealthsimple.com) | [@andrewthauer](https://github.com/andrewthauer)             | Developer portal, service catalog, documentation and tooling                                                                           |
-| [Grab](https://www.grab.com)                 | [@althafh](https://github.com/althafh)                       | Initial work as a unified interface for all of Grab's internal tooling                                                                 |
-| [Telenor Sweden](https://www.telenor.se)     | [@O5ten](https://github.com/O5ten)                           | Building a developer portal for scaffolding projects towards our unified build environment and microservice stacks                     |
-| [Fiverr](https://www.fiverr.com)             | [@nirga](https://github.com/nirga)                           | Unifying separate tools that developers are using today (i.e. monitoring, dead letter queues management, etc.) into a single platform. |
-| [Zalando SE](https://www.zalando.de)         | [@leviferreira](https://github.com/leviferreira)             | Building V2 of the Internal Development Portal.                                                                                        |
-| [LegalZoom](https://legalzoom.com)           | [@backjo](https://github.com/backjo)                         | Developer portal - hub for all engineering projects and metadata.                                                                      |
+| Organization                                  | Contact                                                                                                                                               | Description of Use                                                                                                                     |
+| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| [Spotify](https://www.spotify.com)            | [@leemills83](https://github.com/leemills83)                                                                                                          | Main interface towards all of Spotify's infrastructure and technical documentation.                                                    |
+| [bol.com](https://www.bol.com)                | [@RoyJacobs](https://github.com/RoyJacobs)                                                                                                            | Initial work being done to unify platform tooling.                                                                                     |
+| [DFDS](https://www.dfds.com)                  | [@carlsendk](https://github.com/carlsendk)                                                                                                            | V2 self-service platform.                                                                                                              |
+| [Roadie](https://roadie.io)                   | [@dtuite](https://github.com/dtuite)                                                                                                                  | Hosted, managed Backstage with easy set-up                                                                                             |
+| [Roku](https://www.roku.com)                  | [@timurista](https://github.com/timurista)                                                                                                            | Initial work on Cloud engineering service platform.                                                                                    |
+| [SDA SE](https://sda.se)                      | [@Fox32](https://github.com/Fox32)                                                                                                                    | Central place for developing and sharing services in our insurance ecosystem.                                                          |
+| [H-E-B](https://www.heb.com)                  | [@german-j-rodriguez](https://github.com/german-j-rodriguez)                                                                                          | Initial work on Engineering Portal service platform.                                                                                   |
+| [American Airlines](https://www.aa.com)       | [@paulpach](https://github.com/paulpach)                                                                                                              | Central place for developers to develop and maintain applications                                                                      |
+| [Kiwi.com](https://kiwi.com)                  | [@aexvir](https://github.com/aexvir)                                                                                                                  | Replacing the frontend of [The Zoo](https://github.com/kiwicom/the-zoo), their service registry.                                       |
+| [Voi](https://www.voiscooters.com/)           | [@K-Phoen](https://github.com/K-Phoen)                                                                                                                | Developer portal, main gateway to our infrastructure, documentation and internal tooling.                                              |
+| [Talkdesk](https://www.talkdesk.com)          | [@jaime-talkdesk](https://github.com/jaime-talkdesk)                                                                                                  | Initial work for Engineering Portal and Self Provisioning to R&D                                                                       |
+| [Wealthsimple](https://www.wealthsimple.com)  | [@andrewthauer](https://github.com/andrewthauer)                                                                                                      | Developer portal, service catalog, documentation and tooling                                                                           |
+| [Grab](https://www.grab.com)                  | [@althafh](https://github.com/althafh)                                                                                                                | Initial work as a unified interface for all of Grab's internal tooling                                                                 |
+| [Telenor Sweden](https://www.telenor.se)      | [@O5ten](https://github.com/O5ten)                                                                                                                    | Building a developer portal for scaffolding projects towards our unified build environment and microservice stacks                     |
+| [Fiverr](https://www.fiverr.com)              | [@nirga](https://github.com/nirga)                                                                                                                    | Unifying separate tools that developers are using today (i.e. monitoring, dead letter queues management, etc.) into a single platform. |
+| [Zalando SE](https://www.zalando.de)          | [@leviferreira](https://github.com/leviferreira)                                                                                                      | Building V2 of the Internal Development Portal.                                                                                        |
+| [LegalZoom](https://legalzoom.com)            | [@backjo](https://github.com/backjo)                                                                                                                  | Developer portal - hub for all engineering projects and metadata.                                                                      |
+| [Expedia Group](https://www.expediagroup.com) | [Mike Turner](mailto:miturner@expediagroup.com), [Sneha Kumar](mailto:snkumar@expediagroup.com), [@guillermomanzo](https://github.com/guillermomanzo) | EG Common Developer Toolkit                                                                                                            |
diff --git a/app-config.yaml b/app-config.yaml
index d2100801ae..5866354a87 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -127,7 +127,16 @@ integrations:
 
 catalog:
   rules:
-    - allow: [Component, API, Group, User, Template, Location]
+    - allow:
+        - Component
+        - API
+        - Resource
+        - Group
+        - User
+        - Template
+        - System
+        - Domain
+        - Location
 
   processors:
     githubOrg:
@@ -178,12 +187,21 @@ catalog:
     # Example component for github-actions
     - type: url
       target: https://github.com/backstage/backstage/blob/master/plugins/github-actions/examples/sample.yaml
-    # Example component for techdocs
+    # Example component for TechDocs
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component/documented-component.yaml
+      target: https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
     # Backstage example APIs
     - type: url
       target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all-apis.yaml
+    # Backstage example resources
+    - type: url
+      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all-resources.yaml
+    # Backstage example systems
+    - type: url
+      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all-systems.yaml
+    # Backstage example domains
+    - type: url
+      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all-domains.yaml
     # Backstage example templates
     - type: url
       target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/all-templates.yaml
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 617d01093e..2144d1709c 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -6,7 +6,7 @@ metadata:
     Backstage is an open-source developer portal that puts the developer experience first.
   annotations:
     github.com/project-slug: backstage/backstage
-    backstage.io/techdocs-ref: github:https://github.com/backstage/backstage.git
+    backstage.io/techdocs-ref: url:https://github.com/backstage/backstage/tree/master
     lighthouse.com/website-url: https://backstage.io
 spec:
   type: library
diff --git a/contrib/docs/tutorials/quickstart-app-plugin/ExampleComponent.md b/contrib/docs/tutorials/quickstart-app-plugin/ExampleComponent.md
index 9b5d77bc7c..77b820d921 100644
--- a/contrib/docs/tutorials/quickstart-app-plugin/ExampleComponent.md
+++ b/contrib/docs/tutorials/quickstart-app-plugin/ExampleComponent.md
@@ -14,8 +14,8 @@ import {
   HeaderLabel,
   SupportButton,
   identityApiRef,
+  useApi,
 } from '@backstage/core';
-import { useApi } from '@backstage/core-api';
 import ExampleFetchComponent from '../ExampleFetchComponent';
 
 const ExampleComponent = () => {
diff --git a/contrib/docs/tutorials/quickstart-app-plugin/ExampleFetchComponent.md b/contrib/docs/tutorials/quickstart-app-plugin/ExampleFetchComponent.md
index 6061b69e93..6992d05866 100644
--- a/contrib/docs/tutorials/quickstart-app-plugin/ExampleFetchComponent.md
+++ b/contrib/docs/tutorials/quickstart-app-plugin/ExampleFetchComponent.md
@@ -11,8 +11,8 @@ import {
   TableColumn,
   Progress,
   githubAuthApiRef,
+  useApi,
 } from '@backstage/core';
-import { useApi } from '@backstage/core-api';
 import { graphql } from '@octokit/graphql';
 
 const query = `{
diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
new file mode 100644
index 0000000000..b32ff40589
--- /dev/null
+++ b/docs/features/techdocs/how-to-guides.md
@@ -0,0 +1,54 @@
+---
+id: how-to-guides
+title: TechDocs "HOW TO" guides
+sidebar_label: "HOW TO" guides
+description: TechDocs "HOW TO" guides related to TechDocs
+---
+
+## How to use URL Reader in TechDocs Prepare step?
+
+If TechDocs is configured to generate docs, it will first download the
+repository associated with the `backstage.io/techdocs-ref` annotation defined in
+the Entity's `catalog-info.yaml` file. This is also called the
+[Prepare](./concepts.md#techdocs-preparer) step.
+
+There are two kinds of preparers or two ways of downloading these source files
+
+- Preparer 1: Doing a `git clone` of the repository (also known as Common Git
+  Preparer)
+- Preparer 2: Downloading an archive.zip or equivalent of the repository (also
+  known as URL Reader)
+
+If `backstage.io/techdocs-ref` is equal to any of these -
+
+1. `github:https://githubhost.com/org/repo`
+2. `gitlab:https://gitlabhost.com/org/repo`
+3. `bitbucket:https://bitbuckethost.com/project/repo`
+4. `azure/api:https://azurehost.com/org/project`
+
+Then Common Git Preparer will be used i.e. a `git clone`. But the URL Reader is
+a much faster way to do this step. Convert the `backstage.io/techdocs-ref`
+values to the following -
+
+1. `url:https://githubhost.com/org/repo/tree/<branch_name>`
+2. `url:https://gitlabhost.com/org/repo/tree/<branch_name>`
+3. `url:https://bitbuckethost.com/project/repo/src/<branch_name>`
+4. `url:https://azurehost.com/organization/project/_git/repository`
+
+Note that you can also provide a path to a non-root directory inside the
+repository which contains the `docs/` directory.
+
+e.g.
+`url:https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend/examples/documented-component`
+
+### Why is URL Reader faster than a git clone?
+
+URL Reader uses the source code hosting provider to download a zip or tarball of
+the repository. The archive does not have any git history attached to it. Also
+it is a compressed file. Hence the file size is significantly smaller than how
+much data git clone has to transfer.
+
+Caveat: Currently TechDocs sites built using URL Reader will be cached for 30
+minutes which means they will not be re-built if new changes are made within 30
+minutes. This cache invalidation will be replaced by commit timestamp based
+implementation very soon.
diff --git a/docs/features/techdocs/troubleshooting.md b/docs/features/techdocs/troubleshooting.md
index 3a9b2fcfd0..e6efefc578 100644
--- a/docs/features/techdocs/troubleshooting.md
+++ b/docs/features/techdocs/troubleshooting.md
@@ -5,6 +5,53 @@ sidebar_label: Troubleshooting
 description: Troubleshooting for TechDocs
 ---
 
-- TechDocs will fail to clone your docs if you have a git config which overrides
-  the `https` protocol with `ssh` or something else. Make sure to remove your
-  git config locally when you try TechDocs.
+## Failure to clone
+
+TechDocs will fail to clone your docs if you have a git config which overrides
+the `https` protocol with `ssh` or something else. Make sure to remove your git
+config locally when you try TechDocs.
+
+## MkDocs Build Errors
+
+Using the [TechDocs CLI](https://github.com/backstage/techdocs-cli), you can
+troubleshoot MkDocs build issues locally. Note this requires you have Docker
+available to launch images. First, `git clone` the target repository locally,
+then in the root of the repository, run:
+
+```
+npx @techdocs/cli serve
+```
+
+For example, if you have forgotten to put an MkDocs configuration file in your
+repo, the resulting error will be:
+
+```
+npx: installed 278 in 9.089s
+[techdocs-preview-bundle] Running local version of Backstage at http://localhost:3000
+INFO    -  Building documentation...
+
+Config file '/content/mkdocs.yml' does not exist.
+```
+
+When it works, a local copy of both Backstage and your site will be launched
+locally:
+
+```
+npx: installed 278 in 9.682s
+[techdocs-preview-bundle] Running local version of Backstage at http://localhost:3000
+INFO    -  Building documentation...
+WARNING -  Config value: 'dev_addr'. Warning: The use of the IP address '0.0.0.0'
+  suggests a production environment or the use of a proxy to connect to the MkDocs
+  server. However, the MkDocs' server is intended for local development purposes only.
+  Please use a third party production-ready server instead.
+INFO    -  Cleaning site directory
+DEBUG   -  Successfully imported extension module "plantuml_markdown".
+DEBUG   -  Successfully loaded extension "plantuml_markdown.PlantUMLMarkdownExtension".
+INFO    -  Documentation built in 0.23 seconds
+[I 210115 19:00:45 server:335] Serving on http://0.0.0.0:8000
+INFO    -  Serving on http://0.0.0.0:8000
+[I 210115 19:00:45 handlers:62] Start watching changes
+INFO    -  Start watching changes
+[I 210115 19:00:45 handlers:64] Start detecting changes
+INFO    -  Start detecting changes
+```
diff --git a/docs/glossary.md b/docs/glossary.md
new file mode 100644
index 0000000000..dc67b2aae2
--- /dev/null
+++ b/docs/glossary.md
@@ -0,0 +1,21 @@
+---
+id: Glossary
+title: Backstage Glossary
+# prettier-ignore
+description: List of all the terms, abbreviations, and phrases used in Backstage, together with their explanations.
+---
+
+The Backstage Glossary lists all the terms, abbreviations, and phrases used in
+Backstage, together with their explanations. We encourage you to use the
+terminology below for clarity and consistency when discussing Backstage.
+
+### Backstage User Profiles
+
+There are three main user profiles for Backstage: the integrator, the
+contributor, and the software engineer.
+
+| Term              | Explanation                                                                                                                                                                                                                                                                            |
+| ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Integrator        | The **integrator** hosts the Backstage app and configures which plugins are available to use in the app.                                                                                                                                                                               |
+| Contributor       | The **contributor** adds functionality to the app by writing plugins.                                                                                                                                                                                                                  |
+| Software Engineer | The **software engineer** uses the app's functionality and interacts with its plugins. In practice, this profile covers the various roles that help deliver software, from the Software Engineer themselves, to Designers, Data Scientists, Product Owners, Engineering Managers, etc. |
diff --git a/docs/plugins/composability.md b/docs/plugins/composability.md
new file mode 100644
index 0000000000..a496217875
--- /dev/null
+++ b/docs/plugins/composability.md
@@ -0,0 +1,585 @@
+---
+id: composability
+title: Composability System Migration
+# prettier-ignore
+description: Documentation and migration instructions for new composability APIs.
+---
+
+## Summary
+
+This page describes the new composability system that was recently introduced in
+Backstage, and it does so from the perspective of the existing patterns and
+APIs. As the new system is solidified and existing code is ported, this page
+will be removed and replaced with a more direct description of the composability
+system. For now, the primary purpose of this documentation is to aid in the
+migration of existing plugins, but it does cover the migration of apps as well.
+
+The core principle of the new composability system is that plugins should have
+clear boundaries and connections. It should isolate crashes within a plugin, but
+allow navigation between them. It should allow for plugins to be loaded only
+when needed, and enable plugins to provide extension points for other plugins to
+build upon. The composability system is also built with an app-first mindset,
+prioritizing simplicity and clarity in the app over that in the plugins and core
+APIs.
+
+The new composability system isn't a single new API surface. It is a collection
+of patterns, primitives, new APIs, and old APIs used in new ways. At the core is
+the new concept of extensions, which are exported by plugins for use in the app.
+There is also a new primitive called component data, which assists in the
+conversion to a more declarative app. The `RouteRef`s now have a clear purpose
+as well, and can be used route to pages in a flexible way.
+
+## New Concepts
+
+This section is a brief look into all the new and updated concepts that were put
+in place to support the new composability system.
+
+### Component Data
+
+Component data is a new composability primitive that is introduced as a way to
+provide a new data dimension for React components. Data is attached to React
+components using a key, and is then readable from any JSX elements created with
+those components, using the same key, as illustrated by the following example:
+
+```tsx
+const MyComponent = () => <h1>This is my component</h1>;
+attachComponentData(MyComponent, 'my.data', 5);
+
+const element = <MyComponent />;
+const myData = getComponentData(element, 'my.data');
+// myData === 5
+```
+
+The purpose of component data is to provide a method for embedding data that can
+be inspected before rendering elements. Element inspection is a pattern that is
+quite common among React libraries, and used for example by `react-router` and
+`material-ui` to discover properties of the child elements before rendering.
+Although in those libraries only the element type and props are typically
+inspected, while our component data adds more structured access and simplifies
+evolution by allowing for multiple different versions of a piece of data to be
+used and interpreted at once.
+
+The initial use-case for component data is to support route and plugin discovery
+through elements in the app. Through this we allow for the React element tree in
+the app to be the source of truth, both for which plugins are used, as well as
+all top-level plugin routes in the app. The use of component data is not limited
+to these use-cases though, as it can be used as a primitive to create new
+abstractions as well.
+
+### Extensions
+
+Extensions are what plugins export for use in an app. Most typically they are
+React components, but in practice they can be any kind of JavaScript value. They
+are created using `create*Extension` functions, and wrapped with
+`plugin.provide()` in order to create the actual exported extension.
+
+The extension type is a simple one:
+
+```ts
+export type Extension<T> = {
+  expose(plugin: BackstagePlugin<any, any>): T;
+};
+```
+
+The power of extensions comes from the ability of various actors to hook into
+their usage. The creation and plugin wrapping is controlled by whoever owns the
+creation function, the Backstage core is able to hook into the process of
+exposing the extension outside the plugin, and in the end the app controls the
+usage of the extension.
+
+The Backstage core API currently provides two different types of extension
+creators, `createComponentExtension`, and `createRoutableExtension`. Component
+extensions are plain React component with no particular requirements, for
+example a card for an entity overview page. The component will be exported more
+or less as is, but is wrapped to provide things like an error boundary, lazy
+loading, and a plugin context.
+
+Routable extensions build on top of component extensions and are used for any
+component that should be rendered at a specific route path, such as top-level
+pages or entity page tab content. When creating a routable extension you need to
+supply a `RouteRef` as `mountPoint`. The mount point will be the handle of the
+component for the outside world, and is used by other components and plugins
+that wish to link to the routable component.
+
+As of now there are only two extension creation functions, but it is possible to
+add more of them in the future, both in the core library and in plugins that
+wish to provide an extension point for other plugins to build upon. Extensions
+are also not tied to React, and can both be used to model generic JavaScript
+concepts, as well as potentially bridge to rendering libraries and web
+frameworks other than React.
+
+### Extensions from a Plugin's Point of View
+
+Extensions are one of the primary methods to traverse the plugin boundary, and
+the way that plugins provide concrete content for use within an app. They
+replace existing component export concepts such as `Router` or `*Card`s for
+display on entity overview pages.
+
+It is recommended to create the exported extensions either in the top-level
+`plugin.ts` file, or in a dedicated `extensions.ts` (or `.tsx`) file. That file
+should not contain the bulk of the implementation though, and in fact, if the
+extension is a React component it is recommended to lazy-load the actual
+component. Component extensions support lazy loading out of the box using the
+`lazy` component declaration, for example:
+
+```ts
+export const EntityFooCard = plugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () => import('./components/FooCard').then(m => m.FooCard),
+    },
+  }),
+);
+```
+
+Routable extensions even enforce lazy loading, as it is the only way to provide
+a component:
+
+```ts
+export const FooPage = plugin.provide(
+  createRoutableExtension({
+    component: () => import('./components/FooPage').then(m => m.FooPage),
+    mountPoint: fooPageRouteRef,
+  }),
+);
+```
+
+### Using Extensions in an App
+
+Right now all extensions are modelled as React components. The usage of these
+extension is like regular usage of any React components, with one important
+difference. Extensions must all be part of a single React element tree spanning
+from the root `AppProvider`.
+
+For example, the following app code does **NOT** work:
+
+```tsx
+const AppRoutes = () => (
+  <Routes>
+    <Route path="/foo" element={<FooPage />} />
+    <Route path="/bar" element={<BarPage />} />
+  </Routes>
+);
+
+const App = () => (
+  <AppProvider>
+    <AppRouter>
+      <Root>
+        <AppRoutes />
+      </Root>
+    </AppRouter>
+  </AppProvider>
+);
+```
+
+But in this case it is simple to fix! Simply be sure to not create any
+intermediate components in the app, for example like this:
+
+```tsx
+const appRoutes = (
+  <Routes>
+    <Route path="/foo" element={<FooPage />} />
+    <Route path="/bar" element={<BarPage />} />
+  </Routes>
+);
+
+const App = () => (
+  <AppProvider>
+    <AppRouter>
+      <Root>{appRoutes}</Root>
+    </AppRouter>
+  </AppProvider>
+);
+```
+
+### New Routing System
+
+A big piece of what is enabled by moving over to this new composability system
+is to make `RouteRef`s useful. The `RouteRef`s no longer have their own path, in
+fact the only required parameter is currently a `title`. Instead of assigning a
+path to each `RouteRef` and possibly overriding these paths in the app, the
+concrete `path` for each `RouteRef` is discovered based on the element tree in
+the app. Let's consider the following example:
+
+```tsx
+const appRoutes = (
+  <Routes>
+    <Route path="/foo" element={<FooPage />} />
+    <Route path="/bar" element={<BarPage />} />
+  </Routes>
+);
+```
+
+We'll assume that `FooPage` and `BarPage` are routable extensions, exported by
+the `fooPlugin` and `barPlugin` respectively. Since the `FooPage` is a routable
+extension it has a `RouteRef` assigned as its mount point, which we'll refer to
+as `fooPageRouteRef`.
+
+Given the above example, the `fooPageRouteRef` will be associated with the
+`'/foo'` route. The path is no longer accessible via the `path` property of the
+`RouteRef` though, as the routing structure is tied to the app's react tree. We
+instead use the new `useRouteRef` hook if we want to create a concrete link to
+the page. The `useRouteRef` hook takes a single `RouteRef` as its only
+parameter, and returns a function that is called to create the URL. For example
+like this:
+
+```tsx
+const MyComponent = () => {
+  const fooRoute = useRouteRef(fooPageRouteRef);
+  return <a href={fooRoute()}>Link to Foo</a>;
+};
+```
+
+Now let's assume that we want to link from the `BarPage` to the `FooPage`.
+Before the introduction of the new composability system, we would do this by
+importing the `fooPageRouteRef` exported by the `fooPlugin`. This created an
+unnecessary dependency on the plugin, and also provided little flexibility in
+allowing the app to tie plugins together, with the links instead being dictated
+by the plugins themselves. To solve this, we introduce `ExternalRouteRef`s. Much
+like regular route references, they can be passed to `useRouteRef` to create
+concrete URLs, but they can not be used as mount points in routable component
+and instead have to be associated with a target route using route bindings in
+the app.
+
+We create a new `ExternalRouteRef` inside the `barPlugin`, using a neutral name
+that describes its role in the plugin rather than a specific plugin page that it
+might be linking to, allowing the app to decide the final target. If the
+`BarPage` for example wants to link to an external page in the header, it might
+declare an `ExternalRouteRef` similar to this:
+
+```ts
+const headerLinkRouteRef = createExternalRouteRef();
+```
+
+### Binding External Routes in the App
+
+The association of external routes is controlled by the app. Each
+`ExternalRouteRef` of a plugin should be bound to an actual `RouteRef`, usually
+from another plugin. The binding process happens once at app startup, and is
+then used through the lifetime of the app to help resolve concrete route paths.
+
+Using the above example of the `BarPage` linking to the `FooPage`, we might do
+something like this in the app:
+
+```ts
+createApp({
+  bindRoutes({ bind }) {
+    bind(barPlugin.externalRoutes, {
+      headerLink: fooPlugin.routes.root,
+    });
+  },
+});
+```
+
+Given the above binding, using `useRouteRef(headerLinkRouteRef)` within the
+`barPlugin` will let us create a link to whatever path the `FooPage` is mounted
+at.
+
+Note that we are not importing and using the `RouteRef`s directly in the app,
+and instead rely on the plugin instance to access routes of the plugins. This is
+a new convention that was introduced to provide better namespacing and
+discoverability of routes, as well as reduce the number of separate exports from
+each plugin package. The route references would be supplied to `createPlugin`
+like this:
+
+```ts
+// In foo-plugin
+export const fooPlugin = createPlugin({
+  routes: {
+    root: fooPageRouteRef,
+  },
+  ...
+})
+
+// In bar-plugin
+export const barPlugin = createPlugin({
+  externalRoutes: {
+    headerLink: headerLinkRouteRef,
+  },
+  ...
+})
+```
+
+Also note that you almost always want to create the route references themselves
+in a different file than the one that creates the plugin instance, for example a
+top-level `routes.ts`. This is to avoid circular imports when you use the route
+references from other parts of the same plugin.
+
+### Parameterized Routes
+
+A new addition to `RouteRef`s is the possibility of adding named and typed
+parameters. Parameters are declared at creation, and will enforce presence of
+the parameters in the path in the app, and require them as a parameter when
+using `useRouteRef`.
+
+The following is an example of creation and usage of a parameterized route:
+
+```tsx
+// Creation of a parameterized route
+const myRouteRef = createRouteRef({
+  title: 'My Named Route',
+  params: ['name']
+})
+
+// In the app, where MyPage is a routable extension with myRouteRef set as mountPoint
+<Route path='/my-page/:name' element={<MyPage />}/>
+
+// Usage within a component
+const myRoute = useRouteRef(myRouteRef)
+return (
+  <div>
+    <a href={myRoute({name: 'a'})}>A</a>
+    <a href={myRoute({name: 'b'})}>B</a>
+  </div>
+)
+```
+
+It is currently not possible to have parameterized `ExternalRouteRef`s, or to
+bind an external route to a parameterized route, although this may be added in
+the future if needed.
+
+### New Catalog Components
+
+The established pattern for selecting what plugins should be available on each
+catalog page is to use custom components in the app, with logic embedded in the
+render function. Typically this takes form as a component that either receives
+the entity via props or uses the `useEntity` hook to retrieve the selected
+entity. A `switch` or `if` / `else if` chain is then used to select what
+children should be rendered based on information in the entity.
+
+This pattern will no longer work with the new composability system, and in
+general is very difficult to build any form of declarative model around, as it
+depends on runtime execution. To help replace existing code, a new
+`EntitySwitch` component has been added to the `@backstage/catalog` plugin,
+which grabs the selected entity from a context, and selects at most one element
+to render using a list of `EntitySwitch.Case` children.
+
+For example, if you want all entities of kind `"Template"` to be rendered with a
+`MyTemplate` component, and all other entities to be rendered with a `MyOther`
+component, you would do the following:
+
+```tsx
+<EntitySwitch>
+  <EntitySwitch.Case if={isKind('template')}>
+    <MyTemplate />
+  </EntitySwitch.Case>
+
+  <EntitySwitch.Case>
+    <MyTemplate />
+  </EntitySwitch.Case>
+</EntitySwitch>
+
+// Shorter form if desired:
+<EntitySwitch>
+  <EntitySwitch.Case if={isKind('template')} children={<MyTemplate />}/>
+  <EntitySwitch.Case children={<MyTemplate />}/>
+</EntitySwitch>
+```
+
+The `EntitySwitch` component will render the children of the first
+`EntitySwitch.Case` that returns `true` when the selected entity is passed to
+the function of the `if` prop. If none of the cases match, no children will be
+rendered, and if a case doesn't specify an `if` filter function, it will always
+match. The `if` property is simply a function of the type
+`(entity: Entity) => boolean`, for example, `isKind` can be implemented like
+this:
+
+```ts
+function isKind(kind: string) {
+  return (entity: Entity) => entity.kind.toLowerCase() === kind.toLowerCase();
+}
+```
+
+The `@backstage/catalog` plugin provides a couple of built-in conditions,
+`isKind`, `isComponentType`, and `isNamespace`.
+
+In addition to the `EntitySwitch` component, the catalog plugin also exports a
+new `EntityLayout` component. It is a tweaked version and replacement for the
+`EntityPageLayout` component, and is introduced more in depth in the app
+migration section below.
+
+## Porting Existing Plugins
+
+There are a couple of high-level steps to porting an existing plugin to the new
+composability system:
+
+- Remove usage of `router.addRoute` or `router.registerRoute` within
+  `createPlugin`, and export the page components as routable extensions instead.
+- Switch any `Router` export to instead be a routable extension.
+- Change any plain component exports, such as catalog overview cards, to be
+  component extensions.
+- Stop exporting `RouteRef`s and instead pass them to `createPlugin`.
+- Stop accepting `RouteRef`s as props or importing them from other plugins,
+  instead create an `ExternalRouteRef` as a replacement, and pass it to
+  `createPlugin.`
+- Rename any other exported symbols according to the naming pattern table below.
+
+Note that removing the existing exports and configuration is a breaking change
+in any plugin. If backwards compatibility is needed the existing code be
+deprecated while making the new additions, to then be removed at a later point.
+
+### Naming Patterns
+
+Many export naming patterns have been changed to avoid import aliases and to
+clarify intent. Refer to the following table to formulate the new name:
+
+| Description          | Existing Pattern           | New Pattern     | Examples                                       |
+| -------------------- | -------------------------- | --------------- | ---------------------------------------------- |
+| Top-level Pages      | Router                     | \*Page          | CatalogIndexPage, SettingsPage, LighthousePage |
+| Entity Tab Content   | Router                     | Entity\*Content | EntityJenkinsContent, EntityKubernetesContent  |
+| Entity Overview Card | \*Card                     | Entity\*Card    | EntitySentryCard, EntityPagerDutyCard          |
+| Entity Conditional   | isPluginApplicableToEntity | is\*Available   | isPagerDutyAvailable, isJenkinsAvailable       |
+| Plugin Instance      | plugin                     | \*Plugin        | jenkinsPlugin, catalogPlugin                   |
+
+## Porting Existing Apps
+
+The first step of porting any app is to replace the root `Routes` component with
+`FlatRoutes` from `@backstage/core`. As opposed to the `Routes` component,
+`FlatRoutes` only considers the first level of `Route` components in its
+children, and provides any additional children to the outlet of the route. It
+also removes the need to append `"/*"` to paths, as it is added automatically.
+
+```diff
+const AppRoutes = () => (
+-  <Routes>
++  <FlatRoutes>
+    ...
+-    <Route path="/docs/*" element={<DocsRouter />} />
++    <Route path="/docs" element={<DocsRouter />} />
+    ...
+-  </Routes>
++  </FlatRoutes>
+);
+```
+
+The next step should be to switch from using `EntityPageLayout` to
+`EntityLayout`, as this can also be done without waiting for plugins to be
+ported. You should also replace the top-level `Router` from the catalog plugin
+with the separate `CatalogIndexPage` and `CatalogEntityPage` extensions that
+have been added to the catalog:
+
+```diff
+-<Route
+-  path={`${catalogRouteRef.path}/*`}
+-  element={<CatalogRouter EntityPage={EntityPage} />}
+-/>
++<Route path="/catalog" element={<CatalogIndexPage />} />
++<Route
++  path="/catalog/:namespace/:kind/:name"
++  element={<CatalogEntityPage />}
++>
++  <EntityPage />
++</Route>
+```
+
+At that point you should flatten out the element tree as much as possible in the
+app, removing any intermediate components. At the top level this should usually
+be straightforward, but when reaching the catalog entity pages you may need to
+wait for some plugins to be migrated. This is because it is no longer possible
+to pass in the selected entity through component props, and it should be picked
+up from context inside the plugin instead. See the sections below for how to
+carry out migrations of some common entity page patterns.
+
+Once the app element tree doesn't contain any intermediate components, and all
+plugin imports have been switched to extensions rather than plain components,
+the app has been fully ported.
+
+### Switching from EntityPageLayout to EntityLayout
+
+The existing `EntityPageLayout` is replaced by the new `EntityLayout` component,
+which has a slightly different pattern for expressing the contents and paths.
+
+Porting from the old to the new API is just a matter of moving some things
+around. For example, given the following existing code:
+
+```tsx
+<EntityPageLayout>
+  <EntityPageLayout.Content
+    path="/"
+    title="Overview"
+    element={<ComponentOverviewContent entity={entity} />}
+  />
+  <EntityPageLayout.Content
+    path="/sentry"
+    title="Sentry"
+    element={<SentryRouter entity={entity} />}
+  />
+  <EntityPageLayout.Content
+    path="/kubernetes/*"
+    title="Kubernetes"
+    element={<KubernetesRouter entity={entity} />}
+  />
+</EntityPageLayout>
+```
+
+It would be ported to this:
+
+```tsx
+<EntityLayout>
+  <EntityLayout.Route path="/" title="Overview">
+    <ComponentOverviewContent entity={entity} />
+  </EntityLayout.Route>
+
+  <EntityLayout.Route path="/sentry" title="Sentry">
+    <SentryRouter entity={entity} />
+  </EntityLayout.Route>
+
+  <EntityLayout.Route path="/kubernetes" title="Kubernetes">
+    <KubernetesRouter entity={entity} />
+  </EntityLayout.Route>
+</EntityLayout>
+```
+
+In addition to the renaming, the `element` prop has been moved to `children`.
+Also note that the `/*` suffix has been removed from the `"/kubernetes"` path,
+as it's now added automatically.
+
+Usage of the `EntityLayout` component is required to be able to properly
+discover routes, and so it is required to apply this change before you can start
+using routable entity content extensions from plugins.
+
+### Porting Entity Pages
+
+The established pattern in the app is to use custom components in order to
+select what plugin components to render for a given entity. The new
+`EntitySwitch` component introduced above is what is intended to replace this
+pattern, now that the entire app needs to be rendered as a single element tree.
+For example, given the following existing code:
+
+```tsx
+export const EntityPage = () => {
+  const { entity } = useEntity();
+
+  switch (entity?.kind?.toLowerCase()) {
+    case 'component':
+      return <ComponentEntityPage entity={entity} />;
+    case 'api':
+      return <ApiEntityPage entity={entity} />;
+    case 'group':
+      return <GroupEntityPage entity={entity} />;
+    case 'user':
+      return <UserEntityPage entity={entity} />;
+    default:
+      return <DefaultEntityPage entity={entity} />;
+  }
+};
+```
+
+It would be migrated to this:
+
+```tsx
+export const entityPage = (
+  <EntitySwitch>
+    <EntitySwitch.Case if={isKind('component')} children={componentPage} />
+    <EntitySwitch.Case if={isKind('api')} children={apiPage} />
+    <EntitySwitch.Case if={isKind('group')} children={groupPage} />
+    <EntitySwitch.Case if={isKind('user')} children={userPage} />
+    <EntitySwitch.Case children={defaultPage} />
+  </EntitySwitch>
+);
+```
+
+Note that for example `<ComponentEntityPage ... />` has been changed to simply
+`componentPage`, that is because just like the `EntityPage` component, the
+`ComponentEntityPage` also needs to be ported to be an element rather a
+component in a similar way.
diff --git a/docs/tutorials/quickstart-app-auth.md b/docs/tutorials/quickstart-app-auth.md
index 3cc62ec84e..1c661d274c 100644
--- a/docs/tutorials/quickstart-app-auth.md
+++ b/docs/tutorials/quickstart-app-auth.md
@@ -3,20 +3,18 @@ id: quickstart-app-auth
 title: Monorepo App Setup With Authentication
 ---
 
-###### September 15th 2020 - @backstage/create-app - v0.1.1-alpha.21
+###### January 8th 2021 - @backstage/create-app - v0.4.5
 
 <br />
 
 > This document takes you through setting up a Backstage app that runs in your
 > own environment. It starts with a skeleton install and verifying of the
-> monorepo's functionality. Next, GitHub authentication is added and tested.
+> monorepo's functionality. Next, authentication is added and tested.
 >
-> This document assumes you have Node.js 12 active along with Yarn and Python.
-> Please note, that at the time of this writing, the current version is
-> 0.1.1-alpha.21. This guide can still be used with future versions, just,
-> verify as you go. If you run into issues, you can compare your setup with mine
-> here >
-> [simple-backstage-app](https://github.com/johnson-jesse/simple-backstage-app).
+> This document assumes you have Node.js 12 or 14 active along with Yarn and
+> Python. Please note, that at the time of this writing, the current version is
+> v0.4.5. This guide can still be used with future versions, just, verify as you
+> go.
 
 # The Skeleton Application
 
@@ -55,7 +53,17 @@ guest. Let's fix that now and add auth.
 
 # The Auth Configuration
 
-1. Open `app-config.yaml` and change it as follows
+A default Backstage installation includes multiple authentication providers out
+of the box. The steps to enable new authentication providers in Backstage are
+very similar to each other, the biggest difference is usually configuring the
+external authentication provider. Please see a subset of possible providers and
+instructions to integrate them below. Steps 1 & 2 are described separately for
+each provider and steps beyond that are common for all.
+
+<details><summary>GitHub</summary>
+<p>
+
+### 1. Open `app-config.yaml` and change it as follows
 
 _from:_
 
@@ -75,23 +83,229 @@ auth:
           $env: AUTH_GITHUB_CLIENT_ID
         clientSecret:
           $env: AUTH_GITHUB_CLIENT_SECRET
-        ## uncomment the following three lines if using enterprise
+        ## uncomment the following two lines if using enterprise
         # enterpriseInstanceUrl:
         #  $env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
 ```
 
-2. Set environment variables in whatever fashion is easiest for you. I chose to
-   add mine to my `.zshrc` profile.
+### 2. Generate a GitHub client ID and secret
+
+- Log into http://github.com
+- Navigate to (Settings > Developer Settings > OAuth Apps > New OAuth
+  App)[https://github.com/settings/applications/new]
+- Set Homepage URL = `http://localhost:3000`
+- Set Callback URL = `http://localhost:7000/api/auth/github`
+- Click [Register application]
+- On the next page, copy and paste your new Client ID and Client Secret to
+  environment variables defined in the `app-config.yaml` file,
+  `AUTH_GITHUB_CLIENT_ID` & `AUTH_GITHUB_CLIENT_SECRET`
+
+</p>
+</details>
+
+<details><summary>GitLab</summary>
+<p>
+
+### 1. Open `app-config.yaml` and change it as follows
+
+_from:_
+
+```yaml
+auth:
+  providers: {}
+```
+
+_to:_
+
+```yaml
+auth:
+  providers:
+    gitlab:
+      development:
+        clientId:
+          $env: AUTH_GITLAB_CLIENT_ID
+        clientSecret:
+          $env: AUTH_GITLAB_CLIENT_SECRET
+        audience: https://gitlab.com # Or your self-hosted GitLab instance URL
+```
+
+### 2. Generate a GitLab Application client ID and secret
+
+- Log into GitLab
+- Navigate to (Profile > Settings >
+  Applications)[https://gitlab.com/-/profile/applications]
+- Name your application
+- Set Callback URL = `http://localhost:7000/api/auth/gitlab/handler/frame`
+- Select the following values:
+  - `read_user` (Read the authenticated user's personal information)
+  - `read_repository` (Allows read-only access to the repository)
+  - `write_repository` (Allows read-write access to the repository)
+  - `openid` (Authenticate using OpenID Connect)
+  - `profile` (Allows read-only access to the user's personal information using
+    OpenID Connect)
+  - `email` (Allows read-only access to the user's primary email address using
+    OpenID Connect)
+- Click [Save application]
+- On the next page, copy and paste your new Application ID and Secret to
+  environment variables defined in the `app-config.yaml` file,
+  `AUTH_GITLAB_CLIENT_ID` & `AUTH_GITLAB_CLIENT_SECRET`
+
+</p>
+</details>
+
+<details><summary>Google</summary>
+<p>
+
+### 1. Open `app-config.yaml` and change it as follows
+
+_from:_
+
+```yaml
+auth:
+  providers: {}
+```
+
+_to:_
+
+```yaml
+auth:
+  providers:
+    google:
+      development:
+        clientId:
+          $env: AUTH_GOOGLE_CLIENT_ID
+        clientSecret:
+          $env: AUTH_GOOGLE_CLIENT_SECRET
+```
+
+### 2. Generate Google Credentials in Google Cloud console
+
+- Log into https://console.cloud.google.com
+- Select or create a new project from the dropdown on the top bar
+- Navigate to (APIs & Services >
+  Credentials)[https://console.cloud.google.com/apis/credentials]
+- Click Create Credentials and select [OAuth client ID]
+- Select Web Application as the application type
+- Add new Authorised JavaScript origin = `http://localhost:3000`
+- Add new Authorised redirect URI =
+  `http://localhost:7000/api/auth/google/handler/frame`
+- Click [Save application]
+- Google should display a modal with your Client ID and Secret. Copy and paste
+  those to environment variables defined in the `app-config.yaml` file,
+  `AUTH_GOOGLE_CLIENT_ID` & `AUTH_GOOGLE_CLIENT_SECRET`
+
+</p>
+</details>
+
+<details><summary>Microsoft</summary>
+<p>
+
+### 1. Open `app-config.yaml` and change it as follows
+
+_from:_
+
+```yaml
+auth:
+  providers: {}
+```
+
+_to:_
+
+```yaml
+auth:
+  providers:
+    microsoft:
+      development:
+        clientId:
+          $env: AUTH_MICROSOFT_CLIENT_ID
+        clientSecret:
+          $env: AUTH_MICROSOFT_CLIENT_SECRET
+        tenantId:
+          $env: AUTH_MICROSOFT_TENANT_ID
+```
+
+### 2. Create a Microsoft App Registration in Microsoft Portal
+
+- Log into https://portal.azure.com
+- Navigate to (Azure Active Directory > App
+  Registrations)[https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredApps]
+- Create a New Registration
+- Add new Redirect URI = `http://localhost:3000`
+- Add new Authorised redirect URI =
+  `http://localhost:7000/api/auth/microsoft/handler/frame`
+- Click [Save application]
+- Set environment variable `AUTH_MICROSOFT_CLIENT_ID` from
+  `Application (client) Id` displayed on the directory page
+- Set environment variable `AUTH_MICROSOFT_TENANT_ID` from
+  `Directory (tenant) ID` displayed on the directory page
+- Navigate to Certificates & Secrets section and click [Create a new secret]
+- Set environment variable `AUTH_MICROSOFT_CLIENT_SECRET` from the `value` field
+  created.
+
+</p>
+</details>
+
+<details><summary>Auth0</summary>
+<p>
+
+### 1. Open `app-config.yaml` and change it as follows
+
+_from:_
+
+```yaml
+auth:
+  providers: {}
+```
+
+_to:_
+
+```yaml
+auth:
+  providers:
+    auth0:
+      development:
+        clientId:
+          $env: AUTH_AUTH0_CLIENT_ID
+        clientSecret:
+          $env: AUTH_AUTH0_CLIENT_SECRET
+        domain:
+          $env: AUTH_AUTH0_DOMAIN_ID
+```
+
+### 2. Create an Auth0 application in the Auth0 management console
+
+- Log into https://manage.auth0.com/dashboard/
+- Navigate to Applications
+- Create a New Application
+  - Select Single Page Web Application
+- Go to Settings tab
+- Add new line to Allowed Callback URLs =
+  `http://localhost:7000/api/auth/auth0/handler/frame`
+- Click [Save Changes]
+- Set environment variables displayed on the Basic Information page
+  - `AUTH_AUTH0_CLIENT_ID` from `Client ID` displayed on Auth0 application page
+  - `AUTH_AUTH0_CLIENT_SECRET` from `Client Secret` displayed on Auth0
+    application page
+  - `AUTH_AUTH0_DOMAIN_ID` from `Domain` displayed on Auth0 application page
+
+</p>
+</details>
+
+### 3. Set environment variables in whatever fashion is easiest for you. I chose to
+
+add mine to my `.zshrc` profile.
 
 ```zsh
 # For macOS Catalina & Z Shell
 # ------ simple-backstage-app GitHub
+#
+# (Change the name of the environment variables based on your auth setup above)
 export AUTH_GITHUB_CLIENT_ID=xxx
 export AUTH_GITHUB_CLIENT_SECRET=xxx
 # export AUTH_GITHUB_ENTERPRISE_INSTANCE_URL=https://github.{MY_BIZ}.com
 ```
 
-3. And of course I need to source that file.
+### 4. And of course I need to source that file.
 
 ```zsh
 # Loading the new variables
@@ -107,26 +321,28 @@ export AUTH_GITHUB_CLIENT_SECRET=xxx
 > ...
 ```
 
-4. The values to replace `xxx` above come from your OAuth app setup.
+### 5. Open and change _root > packages > app > src >_ `App.tsx` to use correct
 
-```
-> Log into http://github.com
-> Navigate to (Settings > Developer Settings > OAuth Apps > New OAuth App)[https://github.com/settings/applications/new]
-> Set Homepage URL = http://localhost:3000
-> Set Callback URL = http://localhost:7000/api/auth/github
-> Click [Register application]
-> On the next page, copy and paste your new Client ID and Client Secret to the environment variables above, `AUTH_GITHUB_CLIENT_ID` & `AUTH_GITHUB_CLIENT_SECRET`
-> Don't forget to `source` that profile file again if necessary.
-```
-
-5. Open and change _root > packages > app > src >_`App.tsx` as follows
+authentication provider reference
 
 ```tsx
-// Add the following imports to the existing list from core
 import { githubAuthApiRef, SignInPage } from '@backstage/core';
 ```
 
-6. In the same file, change the createApp function as follows
+Modify the imported reference based on the authentication method you selected
+above:
+
+| Auth Provider | Import Name         |
+| ------------- | ------------------- |
+| GitHub        | githubAuthApiRef    |
+| GitLab        | gitlabAuthApiRef    |
+| Google        | googleAuthApiRef    |
+| Microsoft     | microsoftAuthApiRef |
+| Auth0         | auth0AuthApiRef     |
+
+### 6. In the same file, modify createApp
+
+Remember to modify the provider information based on the table above.
 
 ```tsx
 const app = createApp({
@@ -153,12 +369,18 @@ const app = createApp({
 });
 ```
 
-7. Start the backend and frontend as before
+After finishing setting up one (or multiple) authentication providers defined
+above you can start the backend and frontend as before
 
 When the browser loads, you should be presented with a login page for GitHub.
 Login as usual with your GitHub account. If this is your first time, you will be
 asked to authorize and then are redirected to the catalog page if all is well.
 
+For more information you can clone
+[the backstage-auth-example repository](https://github.com/RoadieHQ/backstage-auth-example).
+Each authentication setting is set up there on a branch named after the
+authentication provider.
+
 # Where to go from here
 
 > You're probably eager to write your first custom plugin. Follow this next
diff --git a/docs/tutorials/quickstart-app-plugin.md b/docs/tutorials/quickstart-app-plugin.md
index 045062fdcb..6208fbe30d 100644
--- a/docs/tutorials/quickstart-app-plugin.md
+++ b/docs/tutorials/quickstart-app-plugin.md
@@ -72,8 +72,7 @@ Our first modification will be to extract information from the Identity API.
 
 ```tsx
 // Add identityApiRef to the list of imported from core
-import { identityApiRef } from '@backstage/core';
-import { useApi } from '@backstage/core-api';
+import { identityApiRef, useApi } from '@backstage/core';
 ```
 
 3. Adjust the ExampleComponent from inline to block
@@ -143,8 +142,8 @@ import {
   TableColumn,
   Progress,
   githubAuthApiRef,
+  useApi,
 } from '@backstage/core';
-import { useApi } from '@backstage/core-api';
 import { graphql } from '@octokit/graphql';
 
 const ExampleFetchComponent = () => {
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index 3d6417cc65..1148f774da 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -83,6 +83,7 @@
           "features/techdocs/creating-and-publishing",
           "features/techdocs/configuration",
           "features/techdocs/using-cloud-storage",
+          "features/techdocs/how-to-guides",
           "features/techdocs/troubleshooting",
           "features/techdocs/faqs"
         ]
@@ -95,6 +96,7 @@
       "plugins/plugin-development",
       "plugins/structure-of-a-plugin",
       "plugins/integrating-plugin-into-service-catalog",
+      "plugins/composability",
       {
         "type": "subcategory",
         "label": "Backends and APIs",
@@ -176,6 +178,7 @@
     ],
     "Contribute": ["../CONTRIBUTING"],
     "Support": ["support/support", "support/project-structure"],
+    "Glossary": ["glossary"],
     "FAQ": ["FAQ"]
   }
 }
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 46b2aa3470..01bb3c89eb 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -48,6 +48,11 @@ h6 {
   color: $textColor;
 }
 
+summary {
+  color: $textColor;
+  cursor: pointer;
+}
+
 h2:hover .hash-link {
   opacity: 1;
 }
diff --git a/mkdocs.yml b/mkdocs.yml
index 29198963e3..bceabf942e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -56,6 +56,7 @@ nav:
           - Creating and Publishing Documentation: 'features/techdocs/creating-and-publishing.md'
           - Configuration: 'features/techdocs/configuration.md'
           - Using Cloud Storage: 'features/techdocs/using-cloud-storage.md'
+          - HOW TO guides: 'features/techdocs/how-to-guides.md'
           - Troubleshooting: 'features/techdocs/troubleshooting.md'
           - FAQ: 'features/techdocs/FAQ.md'
       - Kubernetes:
@@ -66,6 +67,7 @@ nav:
       - Creating a new plugin: 'plugins/create-a-plugin.md'
       - Developing a plugin: 'plugins/plugin-development.md'
       - Structure of a plugin: 'plugins/structure-of-a-plugin.md'
+      - Composability System Migration: 'plugins/composability.md'
       - Backends and APIs:
           - Proxying: 'plugins/proxying.md'
           - Backstage backend plugin: 'plugins/backend-plugin.md'
@@ -117,4 +119,5 @@ nav:
   - Support:
       - 'support/support.md'
       - 'support/project-structure.md'
+  - Glossary: glossary.md
   - FAQ: FAQ.md
diff --git a/package.json b/package.json
index 8376915729..e2e3f1b075 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "version": "1.0.0",
   "devDependencies": {
     "@changesets/cli": "^2.11.0",
-    "@octokit/openapi-types": "^2.0.0",
+    "@octokit/openapi-types": "^2.2.0",
     "@spotify/eslint-config-oss": "^1.0.1",
     "@spotify/prettier-config": "^9.0.0",
     "command-exists": "^1.2.9",
diff --git a/packages/app/package.json b/packages/app/package.json
index 43113bb464..3ecd0c3019 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -37,7 +37,7 @@
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "^18.0.12",
     "@roadiehq/backstage-plugin-buildkite": "^0.1.3",
     "@roadiehq/backstage-plugin-github-insights": "^0.2.16",
     "@roadiehq/backstage-plugin-github-pull-requests": "^0.6.3",
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index 454ec81bfd..0814347c71 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/backend-common
 
+## 0.4.3
+
+### Patch Changes
+
+- Updated dependencies [466354aaa]
+  - @backstage/integration@0.2.0
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index ef91389330..c311a140f6 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -32,7 +32,7 @@
     "@backstage/cli-common": "^0.1.1",
     "@backstage/config": "^0.1.2",
     "@backstage/config-loader": "^0.4.1",
-    "@backstage/integration": "^0.1.5",
+    "@backstage/integration": "^0.2.0",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "archiver": "^5.0.2",
@@ -66,7 +66,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/test-utils": "^0.1.5",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 2740b98937..e9246ab533 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,35 @@
 # example-backend
 
+## 0.2.11
+
+### Patch Changes
+
+- cc068c0d6: Bump the gitbeaker dependencies to 28.x.
+
+  To update your own installation, go through the `package.json` files of all of
+  your packages, and ensure that all dependencies on `@gitbeaker/node` or
+  `@gitbeaker/core` are at version `^28.0.2`. Then run `yarn install` at the root
+  of your repo.
+
+- Updated dependencies [68ad5af51]
+- Updated dependencies [5a9a7e7c2]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [94fdf4955]
+- Updated dependencies [cc068c0d6]
+- Updated dependencies [ade6b3bdf]
+- Updated dependencies [468579734]
+- Updated dependencies [cb7af51e7]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+- Updated dependencies [711ba55a2]
+  - @backstage/plugin-techdocs-backend@0.5.3
+  - @backstage/plugin-kubernetes-backend@0.2.4
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog-backend@0.5.3
+  - @backstage/plugin-scaffolder-backend@0.4.1
+  - @backstage/plugin-auth-backend@0.2.10
+  - @backstage/backend-common@0.4.3
+
 ## 0.2.10
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index dc3cf75367..68357d998c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,21 +27,21 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.4.1",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
     "@backstage/plugin-app-backend": "^0.3.3",
-    "@backstage/plugin-auth-backend": "^0.2.7",
-    "@backstage/plugin-catalog-backend": "^0.5.1",
+    "@backstage/plugin-auth-backend": "^0.2.10",
+    "@backstage/plugin-catalog-backend": "^0.5.3",
     "@backstage/plugin-graphql-backend": "^0.1.4",
-    "@backstage/plugin-kubernetes-backend": "^0.2.3",
+    "@backstage/plugin-kubernetes-backend": "^0.2.4",
     "@backstage/plugin-kafka-backend": "^0.1.0",
     "@backstage/plugin-proxy-backend": "^0.2.3",
     "@backstage/plugin-rollbar-backend": "^0.1.5",
-    "@backstage/plugin-scaffolder-backend": "^0.4.0",
-    "@backstage/plugin-techdocs-backend": "^0.5.0",
-    "@gitbeaker/node": "^25.2.0",
-    "@octokit/rest": "^18.0.0",
+    "@backstage/plugin-scaffolder-backend": "^0.4.1",
+    "@backstage/plugin-techdocs-backend": "^0.5.3",
+    "@gitbeaker/node": "^28.0.2",
+    "@octokit/rest": "^18.0.12",
     "azure-devops-node-api": "^10.1.1",
     "dockerode": "^3.2.1",
     "example-app": "^0.2.8",
@@ -54,11 +54,10 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.3",
+    "@backstage/cli": "^0.4.6",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
-    "@types/express-serve-static-core": "^4.17.5",
-    "@types/helmet": "^0.0.48"
+    "@types/express-serve-static-core": "^4.17.5"
   },
   "files": [
     "dist"
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index f6c2477d6c..97f54bbdd2 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/catalog-model
 
+## 0.6.1
+
+### Patch Changes
+
+- f3b064e1c: Export the `schemaValidator` helper function.
+- abbee6fff: Implement System, Domain and Resource entity kinds.
+- 147fadcb9: Add subcomponentOf to Component kind to represent subsystems of larger components.
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/catalog-model/examples/all-domains.yaml b/packages/catalog-model/examples/all-domains.yaml
new file mode 100644
index 0000000000..91a8a5b76d
--- /dev/null
+++ b/packages/catalog-model/examples/all-domains.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: example-domains
+  description: A collection of all Backstage example domains
+spec:
+  targets:
+    - ./domains/artists-domain.yaml
+    - ./domains/playback-domain.yaml
diff --git a/packages/catalog-model/examples/all-resources.yaml b/packages/catalog-model/examples/all-resources.yaml
new file mode 100644
index 0000000000..d0986e3fe2
--- /dev/null
+++ b/packages/catalog-model/examples/all-resources.yaml
@@ -0,0 +1,8 @@
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: example-resources
+  description: A collection of all Backstage example resources
+spec:
+  targets:
+    - ./resources/artists-db-resource.yaml
diff --git a/packages/catalog-model/examples/all-systems.yaml b/packages/catalog-model/examples/all-systems.yaml
new file mode 100644
index 0000000000..165bee54e5
--- /dev/null
+++ b/packages/catalog-model/examples/all-systems.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: example-systems
+  description: A collection of all Backstage example systems
+spec:
+  targets:
+    - ./systems/artist-engagement-portal-system.yaml
+    - ./systems/audio-playback-system.yaml
+    - ./systems/podcast-system.yaml
diff --git a/packages/catalog-model/examples/components/artist-lookup-component.yaml b/packages/catalog-model/examples/components/artist-lookup-component.yaml
index 257344be3d..3fc516ece9 100644
--- a/packages/catalog-model/examples/components/artist-lookup-component.yaml
+++ b/packages/catalog-model/examples/components/artist-lookup-component.yaml
@@ -10,3 +10,4 @@ spec:
   type: service
   lifecycle: experimental
   owner: team-a
+  system: artist-engagement-portal
diff --git a/packages/catalog-model/examples/components/playback-lib-component.yaml b/packages/catalog-model/examples/components/playback-lib-component.yaml
index f7d7670b5d..de7e93d38d 100644
--- a/packages/catalog-model/examples/components/playback-lib-component.yaml
+++ b/packages/catalog-model/examples/components/playback-lib-component.yaml
@@ -7,3 +7,4 @@ spec:
   type: library
   lifecycle: experimental
   owner: team-c
+  system: audio-playback
diff --git a/packages/catalog-model/examples/components/playback-order-component.yaml b/packages/catalog-model/examples/components/playback-order-component.yaml
index c4f41b2b58..9146063886 100644
--- a/packages/catalog-model/examples/components/playback-order-component.yaml
+++ b/packages/catalog-model/examples/components/playback-order-component.yaml
@@ -10,3 +10,4 @@ spec:
   type: service
   lifecycle: production
   owner: user:guest
+  system: audio-playback
diff --git a/packages/catalog-model/examples/components/podcast-api-component.yaml b/packages/catalog-model/examples/components/podcast-api-component.yaml
index b89ff48c48..30d254a00f 100644
--- a/packages/catalog-model/examples/components/podcast-api-component.yaml
+++ b/packages/catalog-model/examples/components/podcast-api-component.yaml
@@ -9,3 +9,4 @@ spec:
   type: service
   lifecycle: experimental
   owner: team-b
+  system: podcast
diff --git a/packages/catalog-model/examples/components/queue-proxy-component.yaml b/packages/catalog-model/examples/components/queue-proxy-component.yaml
index 7f7fcbd527..a2d5ae5ea4 100644
--- a/packages/catalog-model/examples/components/queue-proxy-component.yaml
+++ b/packages/catalog-model/examples/components/queue-proxy-component.yaml
@@ -10,3 +10,4 @@ spec:
   type: website
   lifecycle: production
   owner: team-b
+  system: podcast
diff --git a/packages/catalog-model/examples/components/shuffle-api-component.yaml b/packages/catalog-model/examples/components/shuffle-api-component.yaml
index 1c2da03511..6328ebdf3b 100644
--- a/packages/catalog-model/examples/components/shuffle-api-component.yaml
+++ b/packages/catalog-model/examples/components/shuffle-api-component.yaml
@@ -9,3 +9,4 @@ spec:
   type: service
   lifecycle: production
   owner: user:guest
+  system: audio-playback
diff --git a/packages/catalog-model/examples/components/www-artist-component.yaml b/packages/catalog-model/examples/components/www-artist-component.yaml
index c333eb8c09..3acb6fc6a6 100644
--- a/packages/catalog-model/examples/components/www-artist-component.yaml
+++ b/packages/catalog-model/examples/components/www-artist-component.yaml
@@ -7,3 +7,4 @@ spec:
   type: website
   lifecycle: production
   owner: team-a
+  system: artist-engagement-portal
diff --git a/packages/catalog-model/examples/domains/artists-domain.yaml b/packages/catalog-model/examples/domains/artists-domain.yaml
new file mode 100644
index 0000000000..7bcc4329dd
--- /dev/null
+++ b/packages/catalog-model/examples/domains/artists-domain.yaml
@@ -0,0 +1,7 @@
+apiVersion: backstage.io/v1alpha1
+kind: Domain
+metadata:
+  name: artists
+  description: Everything related to artists
+spec:
+  owner: team-a
diff --git a/packages/catalog-model/examples/domains/playback-domain.yaml b/packages/catalog-model/examples/domains/playback-domain.yaml
new file mode 100644
index 0000000000..c9933ebf5e
--- /dev/null
+++ b/packages/catalog-model/examples/domains/playback-domain.yaml
@@ -0,0 +1,7 @@
+apiVersion: backstage.io/v1alpha1
+kind: Domain
+metadata:
+  name: playback
+  description: Everything related to audio playback
+spec:
+  owner: user:frank.tiernan
diff --git a/packages/catalog-model/examples/resources/artists-db-resource.yaml b/packages/catalog-model/examples/resources/artists-db-resource.yaml
new file mode 100644
index 0000000000..a666e9b3fd
--- /dev/null
+++ b/packages/catalog-model/examples/resources/artists-db-resource.yaml
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: artists-db
+  description: Stores artist details
+spec:
+  type: database
+  owner: team-a
+  system: artist-engagement-portal
diff --git a/packages/catalog-model/examples/systems/artist-engagement-portal-system.yaml b/packages/catalog-model/examples/systems/artist-engagement-portal-system.yaml
new file mode 100644
index 0000000000..8de3c00880
--- /dev/null
+++ b/packages/catalog-model/examples/systems/artist-engagement-portal-system.yaml
@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: artist-engagement-portal
+  description: Everything related to artists
+  tags:
+    - portal
+spec:
+  owner: team-a
+  domain: artists
diff --git a/packages/catalog-model/examples/systems/audio-playback-system.yaml b/packages/catalog-model/examples/systems/audio-playback-system.yaml
new file mode 100644
index 0000000000..7430ae2ff5
--- /dev/null
+++ b/packages/catalog-model/examples/systems/audio-playback-system.yaml
@@ -0,0 +1,8 @@
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: audio-playback
+  description: Audio playback system
+spec:
+  owner: team-c
+  domain: playback
diff --git a/packages/catalog-model/examples/systems/podcast-system.yaml b/packages/catalog-model/examples/systems/podcast-system.yaml
new file mode 100644
index 0000000000..47a2f7ac9f
--- /dev/null
+++ b/packages/catalog-model/examples/systems/podcast-system.yaml
@@ -0,0 +1,8 @@
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: podcast
+  description: Podcast playback
+spec:
+  owner: team-b
+  domain: playback
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 4fad95e122..01ae2e45b7 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -38,7 +38,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.2",
+    "@backstage/cli": "^0.4.6",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.test.ts
index a5d5152fab..a4d7d904cd 100644
--- a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.test.ts
+++ b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.test.ts
@@ -70,6 +70,7 @@ components:
       items:
         $ref: "#/components/schemas/Pet"
 `,
+        system: 'system',
       },
     };
   });
@@ -152,4 +153,19 @@ components:
     (entity as any).spec.definition = '';
     await expect(validator.check(entity)).rejects.toThrow(/definition/);
   });
+
+  it('accepts missing system', async () => {
+    delete (entity as any).spec.system;
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('rejects wrong system', async () => {
+    (entity as any).spec.system = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
+
+  it('rejects empty system', async () => {
+    (entity as any).spec.system = '';
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
 });
diff --git a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
index 660cd71cd8..2c634ff091 100644
--- a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
@@ -30,6 +30,7 @@ const schema = yup.object<Partial<ApiEntityV1alpha1>>({
       lifecycle: yup.string().required().min(1),
       owner: yup.string().required().min(1),
       definition: yup.string().required().min(1),
+      system: yup.string().notRequired().min(1),
     })
     .required(),
 });
@@ -42,6 +43,7 @@ export interface ApiEntityV1alpha1 extends Entity {
     lifecycle: string;
     owner: string;
     definition: string;
+    system?: string;
   };
 }
 
diff --git a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.test.ts
index 10d66ac880..9284a5d5b1 100644
--- a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.test.ts
+++ b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.test.ts
@@ -36,6 +36,7 @@ describe('ComponentV1alpha1Validator', () => {
         subcomponentOf: 'monolith',
         providesApis: ['api-0'],
         consumesApis: ['api-0'],
+        system: 'system',
       },
     };
   });
@@ -158,4 +159,19 @@ describe('ComponentV1alpha1Validator', () => {
     (entity as any).spec.consumesApis = [];
     await expect(validator.check(entity)).resolves.toBe(true);
   });
+
+  it('accepts missing system', async () => {
+    delete (entity as any).spec.system;
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('rejects wrong system', async () => {
+    (entity as any).spec.system = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
+
+  it('rejects empty system', async () => {
+    (entity as any).spec.system = '';
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
 });
diff --git a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
index 97519ad403..c55c48055a 100644
--- a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
@@ -32,6 +32,7 @@ const schema = yup.object<Partial<ComponentEntityV1alpha1>>({
       subcomponentOf: yup.string().notRequired().min(1),
       providesApis: yup.array(yup.string().required()).notRequired(),
       consumesApis: yup.array(yup.string().required()).notRequired(),
+      system: yup.string().notRequired().min(1),
     })
     .required(),
 });
@@ -46,6 +47,7 @@ export interface ComponentEntityV1alpha1 extends Entity {
     subcomponentOf?: string;
     providesApis?: string[];
     consumesApis?: string[];
+    system?: string;
   };
 }
 
diff --git a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.test.ts
new file mode 100644
index 0000000000..0e989f22ca
--- /dev/null
+++ b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.test.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  DomainEntityV1alpha1,
+  domainEntityV1alpha1Validator as validator,
+} from './DomainEntityV1alpha1';
+
+describe('DomainV1alpha1Validator', () => {
+  let entity: DomainEntityV1alpha1;
+
+  beforeEach(() => {
+    entity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Domain',
+      metadata: {
+        name: 'test',
+      },
+      spec: {
+        owner: 'me',
+      },
+    };
+  });
+
+  it('happy path: accepts valid data', async () => {
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('silently accepts v1beta1 as well', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta1';
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('ignores unknown apiVersion', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta0';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('ignores unknown kind', async () => {
+    (entity as any).kind = 'Wizard';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('rejects missing owner', async () => {
+    delete (entity as any).spec.owner;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects wrong owner', async () => {
+    (entity as any).spec.owner = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects empty owner', async () => {
+    (entity as any).spec.owner = '';
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+});
diff --git a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
new file mode 100644
index 0000000000..60b11aa124
--- /dev/null
+++ b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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 yup from 'yup';
+import type { Entity } from '../entity/Entity';
+import { schemaValidator } from './util';
+
+const API_VERSION = ['backstage.io/v1alpha1', 'backstage.io/v1beta1'] as const;
+const KIND = 'Domain' as const;
+
+const schema = yup.object<Partial<DomainEntityV1alpha1>>({
+  apiVersion: yup.string().required().oneOf(API_VERSION),
+  kind: yup.string().required().equals([KIND]),
+  spec: yup
+    .object({
+      owner: yup.string().required().min(1),
+    })
+    .required(),
+});
+
+export interface DomainEntityV1alpha1 extends Entity {
+  apiVersion: typeof API_VERSION[number];
+  kind: typeof KIND;
+  spec: {
+    owner: string;
+  };
+}
+
+export const domainEntityV1alpha1Validator = schemaValidator(
+  KIND,
+  API_VERSION,
+  schema,
+);
diff --git a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.test.ts
new file mode 100644
index 0000000000..ad8ea5cdf3
--- /dev/null
+++ b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.test.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  ResourceEntityV1alpha1,
+  resourceEntityV1alpha1Validator as validator,
+} from './ResourceEntityV1alpha1';
+
+describe('ResourceV1alpha1Validator', () => {
+  let entity: ResourceEntityV1alpha1;
+
+  beforeEach(() => {
+    entity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Resource',
+      metadata: {
+        name: 'test',
+      },
+      spec: {
+        type: 'database',
+        owner: 'me',
+        system: 'system',
+      },
+    };
+  });
+
+  it('happy path: accepts valid data', async () => {
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('silently accepts v1beta1 as well', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta1';
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('ignores unknown apiVersion', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta0';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('ignores unknown kind', async () => {
+    (entity as any).kind = 'Wizard';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('rejects missing type', async () => {
+    delete (entity as any).spec.type;
+    await expect(validator.check(entity)).rejects.toThrow(/type/);
+  });
+
+  it('rejects wrong type', async () => {
+    (entity as any).spec.type = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/type/);
+  });
+
+  it('rejects empty type', async () => {
+    (entity as any).spec.type = '';
+    await expect(validator.check(entity)).rejects.toThrow(/type/);
+  });
+
+  it('rejects missing owner', async () => {
+    delete (entity as any).spec.owner;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects wrong owner', async () => {
+    (entity as any).spec.owner = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects empty owner', async () => {
+    (entity as any).spec.owner = '';
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('accepts missing system', async () => {
+    delete (entity as any).spec.system;
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('rejects wrong system', async () => {
+    (entity as any).spec.system = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
+
+  it('rejects empty system', async () => {
+    (entity as any).spec.system = '';
+    await expect(validator.check(entity)).rejects.toThrow(/system/);
+  });
+});
diff --git a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
new file mode 100644
index 0000000000..12df7f6664
--- /dev/null
+++ b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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 yup from 'yup';
+import type { Entity } from '../entity/Entity';
+import { schemaValidator } from './util';
+
+const API_VERSION = ['backstage.io/v1alpha1', 'backstage.io/v1beta1'] as const;
+const KIND = 'Resource' as const;
+
+const schema = yup.object<Partial<ResourceEntityV1alpha1>>({
+  apiVersion: yup.string().required().oneOf(API_VERSION),
+  kind: yup.string().required().equals([KIND]),
+  spec: yup
+    .object({
+      type: yup.string().required().min(1),
+      owner: yup.string().required().min(1),
+      system: yup.string().notRequired().min(1),
+    })
+    .required(),
+});
+
+export interface ResourceEntityV1alpha1 extends Entity {
+  apiVersion: typeof API_VERSION[number];
+  kind: typeof KIND;
+  spec: {
+    type: string;
+    owner: string;
+    system?: string;
+  };
+}
+
+export const resourceEntityV1alpha1Validator = schemaValidator(
+  KIND,
+  API_VERSION,
+  schema,
+);
diff --git a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.test.ts b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.test.ts
new file mode 100644
index 0000000000..7d744b7d0d
--- /dev/null
+++ b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  SystemEntityV1alpha1,
+  systemEntityV1alpha1Validator as validator,
+} from './SystemEntityV1alpha1';
+
+describe('SystemV1alpha1Validator', () => {
+  let entity: SystemEntityV1alpha1;
+
+  beforeEach(() => {
+    entity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'System',
+      metadata: {
+        name: 'test',
+      },
+      spec: {
+        owner: 'me',
+        domain: 'domain',
+      },
+    };
+  });
+
+  it('happy path: accepts valid data', async () => {
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('silently accepts v1beta1 as well', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta1';
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('ignores unknown apiVersion', async () => {
+    (entity as any).apiVersion = 'backstage.io/v1beta0';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('ignores unknown kind', async () => {
+    (entity as any).kind = 'Wizard';
+    await expect(validator.check(entity)).resolves.toBe(false);
+  });
+
+  it('rejects missing owner', async () => {
+    delete (entity as any).spec.owner;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects wrong owner', async () => {
+    (entity as any).spec.owner = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('rejects empty owner', async () => {
+    (entity as any).spec.owner = '';
+    await expect(validator.check(entity)).rejects.toThrow(/owner/);
+  });
+
+  it('accepts missing domain', async () => {
+    delete (entity as any).spec.domain;
+    await expect(validator.check(entity)).resolves.toBe(true);
+  });
+
+  it('rejects wrong domain', async () => {
+    (entity as any).spec.domain = 7;
+    await expect(validator.check(entity)).rejects.toThrow(/domain/);
+  });
+
+  it('rejects empty domain', async () => {
+    (entity as any).spec.domain = '';
+    await expect(validator.check(entity)).rejects.toThrow(/domain/);
+  });
+});
diff --git a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
new file mode 100644
index 0000000000..764514efdd
--- /dev/null
+++ b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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 yup from 'yup';
+import type { Entity } from '../entity/Entity';
+import { schemaValidator } from './util';
+
+const API_VERSION = ['backstage.io/v1alpha1', 'backstage.io/v1beta1'] as const;
+const KIND = 'System' as const;
+
+const schema = yup.object<Partial<SystemEntityV1alpha1>>({
+  apiVersion: yup.string().required().oneOf(API_VERSION),
+  kind: yup.string().required().equals([KIND]),
+  spec: yup
+    .object({
+      owner: yup.string().required().min(1),
+      domain: yup.string().notRequired().min(1),
+    })
+    .required(),
+});
+
+export interface SystemEntityV1alpha1 extends Entity {
+  apiVersion: typeof API_VERSION[number];
+  kind: typeof KIND;
+  spec: {
+    owner: string;
+    domain?: string;
+  };
+}
+
+export const systemEntityV1alpha1Validator = schemaValidator(
+  KIND,
+  API_VERSION,
+  schema,
+);
diff --git a/packages/catalog-model/src/kinds/index.ts b/packages/catalog-model/src/kinds/index.ts
index e00a49acb5..bc157c79df 100644
--- a/packages/catalog-model/src/kinds/index.ts
+++ b/packages/catalog-model/src/kinds/index.ts
@@ -26,6 +26,11 @@ export type {
   ComponentEntityV1alpha1 as ComponentEntity,
   ComponentEntityV1alpha1,
 } from './ComponentEntityV1alpha1';
+export { domainEntityV1alpha1Validator } from './DomainEntityV1alpha1';
+export type {
+  DomainEntityV1alpha1 as DomainEntity,
+  DomainEntityV1alpha1,
+} from './DomainEntityV1alpha1';
 export { groupEntityV1alpha1Validator } from './GroupEntityV1alpha1';
 export type {
   GroupEntityV1alpha1 as GroupEntity,
@@ -37,6 +42,16 @@ export type {
   LocationEntityV1alpha1,
 } from './LocationEntityV1alpha1';
 export * from './relations';
+export { resourceEntityV1alpha1Validator } from './ResourceEntityV1alpha1';
+export type {
+  ResourceEntityV1alpha1 as ResourceEntity,
+  ResourceEntityV1alpha1,
+} from './ResourceEntityV1alpha1';
+export { systemEntityV1alpha1Validator } from './SystemEntityV1alpha1';
+export type {
+  SystemEntityV1alpha1 as SystemEntity,
+  SystemEntityV1alpha1,
+} from './SystemEntityV1alpha1';
 export { templateEntityV1alpha1Validator } from './TemplateEntityV1alpha1';
 export type {
   TemplateEntityV1alpha1 as TemplateEntity,
diff --git a/packages/catalog-model/src/kinds/relations.ts b/packages/catalog-model/src/kinds/relations.ts
index 78bbc61df2..8ad5017fba 100644
--- a/packages/catalog-model/src/kinds/relations.ts
+++ b/packages/catalog-model/src/kinds/relations.ts
@@ -30,7 +30,7 @@ export const RELATION_OWNED_BY = 'ownedBy';
 export const RELATION_OWNER_OF = 'ownerOf';
 
 /**
- * A relation with an API entity, typically from a component or system
+ * A relation with an API entity, typically from a component
  */
 export const RELATION_CONSUMES_API = 'consumesApi';
 export const RELATION_API_CONSUMED_BY = 'apiConsumedBy';
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index adf041b4bb..738b56d82d 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/cli
 
+## 0.4.6
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- 08e9893d2: Handle no npm info
+- 9cf71f8bf: Added experimental `create-github-app` command.
+
 ## 0.4.5
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 277f710b5e..4605a6bdff 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -34,7 +34,7 @@
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^3.18.5",
     "@lerna/project": "^3.18.0",
-    "@octokit/request": "^5.2.0",
+    "@octokit/request": "^5.4.12",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.0.2",
     "@rollup/plugin-node-resolve": "^9.0.0",
@@ -113,9 +113,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.4.2",
+    "@backstage/backend-common": "^0.4.3",
     "@backstage/config": "^0.1.2",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@backstage/theme": "^0.2.2",
diff --git a/packages/cli/src/commands/create-github-app/GithubCreateAppServer.ts b/packages/cli/src/commands/create-github-app/GithubCreateAppServer.ts
index 406e563ebc..45671c2ead 100644
--- a/packages/cli/src/commands/create-github-app/GithubCreateAppServer.ts
+++ b/packages/cli/src/commands/create-github-app/GithubCreateAppServer.ts
@@ -47,7 +47,6 @@ const FORM_PAGE = `
 
 type GithubAppConfig = {
   appId: number;
-  apiUrl: string;
   slug?: string;
   name?: string;
   webhookUrl?: string;
@@ -88,14 +87,11 @@ export class GithubCreateAppServer {
           `POST /app-manifests/${encodeURIComponent(
             req.query.code as string,
           )}/conversions`,
-        ).then(({ data, url }) => {
-          // url = https://api.github.com/app-manifests/<code>/conversions
-          const apiUrl = url.replace(/(?:\/[^\/]+){3}$/, '');
+        ).then(({ data }) => {
           resolve({
             name: data.name,
             slug: data.slug,
             appId: data.id,
-            apiUrl,
             webhookUrl: this.webhookUrl,
             clientId: data.client_id,
             clientSecret: data.client_secret,
diff --git a/packages/cli/src/commands/create-github-app/index.ts b/packages/cli/src/commands/create-github-app/index.ts
index b8d232674e..cd9e8dbe09 100644
--- a/packages/cli/src/commands/create-github-app/index.ts
+++ b/packages/cli/src/commands/create-github-app/index.ts
@@ -26,9 +26,14 @@ import { GithubCreateAppServer } from './GithubCreateAppServer';
 export default async (org: string) => {
   const { slug, name, ...config } = await GithubCreateAppServer.run({ org });
 
-  const fileName = `github-app-${slug}.yaml`;
+  const fileName = `github-app-${slug}-credentials.yaml`;
   const content = `# Name: ${name}\n${stringifyYaml(config)}`;
   await fs.writeFile(paths.resolveTargetRoot(fileName), content);
   console.log(`GitHub App configuration written to ${chalk.cyan(fileName)}`);
+  console.log(
+    chalk.yellow(
+      'This file contains sensitive credentials, it should not be committed to version control and handled with care!',
+    ),
+  );
   // TODO: log instructions on how to use the newly created app configuration.
 };
diff --git a/packages/cli/src/commands/versions/bump.test.ts b/packages/cli/src/commands/versions/bump.test.ts
index 164a202385..987d4f6f31 100644
--- a/packages/cli/src/commands/versions/bump.test.ts
+++ b/packages/cli/src/commands/versions/bump.test.ts
@@ -177,4 +177,71 @@ describe('bump', () => {
       },
     });
   });
+
+  it('should ignore not found packages', async () => {
+    // Make sure all modules involved in package discovery are in the module cache before we mock fs
+    await mapDependencies(paths.targetDir);
+    mockFs({
+      '/yarn.lock': lockfileMockResult,
+      '/lerna.json': JSON.stringify({
+        packages: ['packages/*'],
+      }),
+      '/packages/a/package.json': JSON.stringify({
+        name: 'a',
+        dependencies: {
+          '@backstage/core': '^1.0.5',
+        },
+      }),
+      '/packages/b/package.json': JSON.stringify({
+        name: 'b',
+        dependencies: {
+          '@backstage/core': '^1.0.3',
+          '@backstage/theme': '^2.0.0',
+        },
+      }),
+    });
+
+    paths.targetDir = '/';
+    jest
+      .spyOn(paths, 'resolveTargetRoot')
+      .mockImplementation((...paths) => resolvePath('/', ...paths));
+    jest.spyOn(runObj, 'runPlain').mockImplementation(async () => '');
+    jest.spyOn(runObj, 'run').mockResolvedValue(undefined);
+
+    const { log: logs } = await withLogCollector(['log'], async () => {
+      await bump();
+    });
+    expect(logs.filter(Boolean)).toEqual([
+      'Checking for updates of @backstage/theme',
+      'Checking for updates of @backstage/core',
+      'Package info not found, ignoring package @backstage/theme',
+      'Package info not found, ignoring package @backstage/core',
+      'Checking for updates of @backstage/theme',
+      'Checking for updates of @backstage/core',
+      'Package info not found, ignoring package @backstage/theme',
+      'Package info not found, ignoring package @backstage/core',
+      'All Backstage packages are up to date!',
+    ]);
+
+    expect(runObj.run).toHaveBeenCalledTimes(0);
+
+    const lockfileContents = await fs.readFile('/yarn.lock', 'utf8');
+    expect(lockfileContents).toBe(lockfileMockResult);
+
+    const packageA = await fs.readJson('/packages/a/package.json');
+    expect(packageA).toEqual({
+      name: 'a',
+      dependencies: {
+        '@backstage/core': '^1.0.5', // not bumped
+      },
+    });
+    const packageB = await fs.readJson('/packages/b/package.json');
+    expect(packageB).toEqual({
+      name: 'b',
+      dependencies: {
+        '@backstage/core': '^1.0.3', // not bumped
+        '@backstage/theme': '^2.0.0', // not bumped
+      },
+    });
+  });
 });
diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts
index 8b32cd5768..ceb2f7f988 100644
--- a/packages/cli/src/commands/versions/bump.ts
+++ b/packages/cli/src/commands/versions/bump.ts
@@ -55,7 +55,16 @@ export default async () => {
   // Track package versions that we want to remove from yarn.lock in order to trigger a bump
   const unlocked = Array<{ name: string; range: string; target: string }>();
   await workerThreads(16, dependencyMap.entries(), async ([name, pkgs]) => {
-    const target = await findTargetVersion(name);
+    let target: string;
+    try {
+      target = await findTargetVersion(name);
+    } catch (error) {
+      if (error.name === 'NotFoundError') {
+        console.log(`Package info not found, ignoring package ${name}`);
+        return;
+      }
+      throw error;
+    }
 
     for (const pkg of pkgs) {
       if (semver.satisfies(target, pkg.range)) {
@@ -84,7 +93,16 @@ export default async () => {
       return;
     }
 
-    const target = await findTargetVersion(name);
+    let target: string;
+    try {
+      target = await findTargetVersion(name);
+    } catch (error) {
+      if (error.name === 'NotFoundError') {
+        console.log(`Package info not found, ignoring package ${name}`);
+        return;
+      }
+      throw error;
+    }
 
     for (const entry of lockfile.get(name) ?? []) {
       // Ignore lockfile entries that don't satisfy the version range, since
diff --git a/packages/cli/src/lib/errors.ts b/packages/cli/src/lib/errors.ts
index a1eab4c9e5..110a095fe3 100644
--- a/packages/cli/src/lib/errors.ts
+++ b/packages/cli/src/lib/errors.ts
@@ -44,3 +44,5 @@ export function exitWithError(error: Error): never {
     process.exit(1);
   }
 }
+
+export class NotFoundError extends CustomError {}
diff --git a/packages/cli/src/lib/versioning/packages.test.ts b/packages/cli/src/lib/versioning/packages.test.ts
index b0f1c46e8a..5af040809a 100644
--- a/packages/cli/src/lib/versioning/packages.test.ts
+++ b/packages/cli/src/lib/versioning/packages.test.ts
@@ -19,6 +19,7 @@ import path from 'path';
 import * as runObj from '../run';
 import { paths } from '../paths';
 import { fetchPackageInfo, mapDependencies } from './packages';
+import { NotFoundError } from '../errors';
 
 describe('fetchPackageInfo', () => {
   afterEach(() => {
@@ -40,6 +41,14 @@ describe('fetchPackageInfo', () => {
       'my-package',
     );
   });
+
+  it('should throw if no info', async () => {
+    jest.spyOn(runObj, 'runPlain').mockResolvedValue('');
+
+    await expect(fetchPackageInfo('my-package')).rejects.toThrow(
+      new NotFoundError(`No package information found for package my-package`),
+    );
+  });
 });
 
 describe('mapDependencies', () => {
diff --git a/packages/cli/src/lib/versioning/packages.ts b/packages/cli/src/lib/versioning/packages.ts
index 76e5dc49b0..991a4d23ef 100644
--- a/packages/cli/src/lib/versioning/packages.ts
+++ b/packages/cli/src/lib/versioning/packages.ts
@@ -15,6 +15,7 @@
  */
 
 import { runPlain } from '../../lib/run';
+import { NotFoundError } from '../errors';
 
 const PREFIX = '@backstage';
 
@@ -49,6 +50,11 @@ export async function fetchPackageInfo(
   name: string,
 ): Promise<YarnInfoInspectData> {
   const output = await runPlain('yarn', 'info', '--json', name);
+
+  if (!output) {
+    throw new NotFoundError(`No package information found for package ${name}`);
+  }
+
   const info = JSON.parse(output) as YarnInfo;
   if (info.type !== 'inspect') {
     throw new Error(`Received unknown yarn info for ${name}, ${output}`);
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index bb13447f94..b9ea855c83 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/core
 
+## 0.4.4
+
+### Patch Changes
+
+- 265a7ab30: Fix issue where `SidebarItem` with `onClick` and without `to` renders an inaccessible div. It now renders a button.
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/packages/core/package.json b/packages/core/package.json
index b84eb4ff7b..d86ea3b240 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core",
   "description": "Core API used by Backstage plugins and apps",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -65,7 +65,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.4",
+    "@backstage/cli": "^0.4.6",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 5c9b44fd07..8dba8d8fc1 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/create-app
 
+## 0.3.5
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- cc068c0d6: Bump the gitbeaker dependencies to 28.x.
+
+  To update your own installation, go through the `package.json` files of all of
+  your packages, and ensure that all dependencies on `@gitbeaker/node` or
+  `@gitbeaker/core` are at version `^28.0.2`. Then run `yarn install` at the root
+  of your repo.
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 9dec615bb7..0c703bcdac 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -37,29 +37,29 @@
     "recursive-readdir": "^2.2.2"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.4.2",
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/cli": "^0.4.5",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/cli": "^0.4.6",
     "@backstage/config": "^0.1.2",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-api-docs": "^0.4.2",
     "@backstage/plugin-app-backend": "^0.3.3",
-    "@backstage/plugin-auth-backend": "^0.2.9",
-    "@backstage/plugin-catalog": "^0.2.10",
-    "@backstage/plugin-catalog-backend": "^0.5.2",
-    "@backstage/plugin-catalog-import": "^0.3.3",
+    "@backstage/plugin-auth-backend": "^0.2.10",
+    "@backstage/plugin-catalog": "^0.2.11",
+    "@backstage/plugin-catalog-backend": "^0.5.3",
+    "@backstage/plugin-catalog-import": "^0.3.4",
     "@backstage/plugin-circleci": "^0.2.5",
     "@backstage/plugin-explore": "^0.2.2",
-    "@backstage/plugin-github-actions": "^0.2.6",
-    "@backstage/plugin-lighthouse": "^0.2.6",
+    "@backstage/plugin-github-actions": "^0.2.7",
+    "@backstage/plugin-lighthouse": "^0.2.7",
     "@backstage/plugin-proxy-backend": "^0.2.3",
     "@backstage/plugin-rollbar-backend": "^0.1.6",
     "@backstage/plugin-scaffolder": "^0.3.6",
     "@backstage/plugin-search": "^0.2.5",
-    "@backstage/plugin-scaffolder-backend": "^0.4.0",
+    "@backstage/plugin-scaffolder-backend": "^0.4.1",
     "@backstage/plugin-tech-radar": "^0.3.2",
-    "@backstage/plugin-techdocs": "^0.5.2",
-    "@backstage/plugin-techdocs-backend": "^0.5.2",
+    "@backstage/plugin-techdocs": "^0.5.3",
+    "@backstage/plugin-techdocs-backend": "^0.5.3",
     "@backstage/plugin-user-settings": "^0.2.3",
     "@backstage/test-utils": "^0.1.6",
     "@backstage/theme": "^0.2.2",
diff --git a/packages/create-app/templates/default-app/.gitignore.hbs b/packages/create-app/templates/default-app/.gitignore.hbs
index 5f5cc739f4..4adebc5adc 100644
--- a/packages/create-app/templates/default-app/.gitignore.hbs
+++ b/packages/create-app/templates/default-app/.gitignore.hbs
@@ -30,4 +30,7 @@ dist-types
 site
 
 # Local configuration files
-*.local.yaml
\ No newline at end of file
+*.local.yaml
+
+# Sensitive credentials
+*-credentials.yaml
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 c62d7a5e02..3fed72f07b 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
@@ -27,8 +27,8 @@
     "@backstage/plugin-proxy-backend": "^{{version '@backstage/plugin-proxy-backend'}}",
     "@backstage/plugin-scaffolder-backend": "^{{version '@backstage/plugin-scaffolder-backend'}}",
     "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
-    "@octokit/rest": "^18.0.0",
-    "@gitbeaker/node": "^25.2.0",
+    "@gitbeaker/node": "^28.0.2",
+    "@octokit/rest": "^18.0.12",
     "dockerode": "^3.2.1",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
@@ -45,8 +45,7 @@
     "@backstage/cli": "^{{version '@backstage/cli'}}",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
-    "@types/express-serve-static-core": "^4.17.5",
-    "@types/helmet": "^0.0.47"
+    "@types/express-serve-static-core": "^4.17.5"
   },
   "files": [
     "dist"
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index 10b30a11ad..2310c7d020 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/integration
 
+## 0.2.0
+
+### Minor Changes
+
+- 466354aaa: Build out the `ScmIntegrations` class, as well as the individual `*Integration` classes
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 258c5c61c6..eff9e541ce 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
     "git-url-parse": "^11.4.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/test-utils": "^0.1.5",
     "@types/jest": "^26.0.7",
     "msw": "^0.21.2"
diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md
index 6a2ec6cf97..6cf9481327 100644
--- a/packages/techdocs-common/CHANGELOG.md
+++ b/packages/techdocs-common/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/techdocs-common
 
+## 0.3.3
+
+### Patch Changes
+
+- 68ad5af51: Improve techdocs-common Generator API for it to be used by techdocs-cli. TechDocs generator.run function now takes
+  an input AND an output directory. Most probably you use techdocs-common via plugin-techdocs-backend, and so there
+  is no breaking change for you.
+  But if you use techdocs-common separately, you need to create an output directory and pass into the generator.
+- 371f67ecd: fix to-string breakage of binary files
+- f1e74777a: Fix bug where binary files (`png`, etc.) could not load when using AWS or GCS publisher.
+- dbe4450c3: Google Cloud authentication in TechDocs has been improved.
+
+  1. `techdocs.publisher.googleGcs.credentials` is now optional. If it is missing, `GOOGLE_APPLICATION_CREDENTIALS`
+     environment variable (and some other methods) will be used to authenticate.
+     Read more here https://cloud.google.com/docs/authentication/production
+
+  2. `techdocs.publisher.googleGcs.projectId` is no longer used. You can remove it from your `app-config.yaml`.
+
+- 5826d0973: AWS SDK version bump for TechDocs.
+- b3b9445df: AWS S3 authentication in TechDocs has been improved.
+
+  1. `techdocs.publisher.awsS3.bucketName` is now the only required config. `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are optional.
+
+  2. If `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are missing, the AWS environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` will be used. There are more better ways of setting up AWS authentication. Read the guide at https://backstage.io/docs/features/techdocs/using-cloud-storage
+
+- Updated dependencies [466354aaa]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/integration@0.2.0
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index c95f415ad3..387c75241c 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/techdocs-common",
   "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -37,10 +37,10 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1.0",
-    "@backstage/backend-common": "^0.4.2",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@backstage/integration": "^0.1.5",
+    "@backstage/integration": "^0.2.0",
     "@google-cloud/storage": "^5.6.0",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@aws-sdk/types": "3.1.0",
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@types/fs-extra": "^9.0.5",
     "@types/git-url-parse": "^9.0.0",
     "@types/js-yaml": "^3.12.5",
diff --git a/packages/techdocs-common/src/stages/publish/awsS3.ts b/packages/techdocs-common/src/stages/publish/awsS3.ts
index 7a21ae6475..3f7a0e3d81 100644
--- a/packages/techdocs-common/src/stages/publish/awsS3.ts
+++ b/packages/techdocs-common/src/stages/publish/awsS3.ts
@@ -24,13 +24,13 @@ import { PublisherBase, PublishRequest } from './types';
 import fs from 'fs-extra';
 import { Readable } from 'stream';
 
-const streamToString = (stream: Readable): Promise<string> => {
+const streamToBuffer = (stream: Readable): Promise<Buffer> => {
   return new Promise((resolve, reject) => {
     try {
       const chunks: any[] = [];
       stream.on('data', chunk => chunks.push(chunk));
       stream.on('error', reject);
-      stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
+      stream.on('end', () => resolve(Buffer.concat(chunks)));
     } catch (e) {
       throw new Error(`Unable to parse the response data, ${e.message}`);
     }
@@ -173,7 +173,7 @@ export class AwsS3Publish implements PublisherBase {
             Key: `${entityRootDir}/techdocs_metadata.json`,
           })
           .then(async file => {
-            const techdocsMetadataJson = await streamToString(
+            const techdocsMetadataJson = await streamToBuffer(
               file.Body as Readable,
             );
 
@@ -183,7 +183,7 @@ export class AwsS3Publish implements PublisherBase {
               );
             }
 
-            resolve(techdocsMetadataJson);
+            resolve(techdocsMetadataJson.toString('utf-8'));
           })
           .catch(err => {
             this.logger.error(err.message);
@@ -211,7 +211,7 @@ export class AwsS3Publish implements PublisherBase {
       this.storageClient
         .getObject({ Bucket: this.bucketName, Key: filePath })
         .then(async object => {
-          const fileContent = await streamToString(object.Body as Readable);
+          const fileContent = await streamToBuffer(object.Body as Readable);
           if (!fileContent) {
             throw new Error(`Unable to parse the file ${filePath}.`);
           }
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index 2739940530..de670cfba5 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -16,6 +16,8 @@
 import fetch from 'cross-fetch';
 import express from 'express';
 import fs from 'fs-extra';
+import path from 'path';
+import os from 'os';
 import { Logger } from 'winston';
 import { Entity, EntityName } from '@backstage/catalog-model';
 import {
@@ -25,10 +27,20 @@ import {
 import { Config } from '@backstage/config';
 import { PublisherBase, PublishRequest, PublishResponse } from './types';
 
-const staticDocsDir = resolvePackagePath(
-  '@backstage/plugin-techdocs-backend',
-  'static/docs',
-);
+// TODO: Use a more persistent storage than node_modules or /tmp directory.
+// Make it configurable with techdocs.publisher.local.publishDirectory
+let staticDocsDir = '';
+try {
+  staticDocsDir = resolvePackagePath(
+    '@backstage/plugin-techdocs-backend',
+    'static/docs',
+  );
+} catch (err) {
+  // This will most probably never be used.
+  // The try/catch is introduced so that techdocs-cli can import @backstage/techdocs-common
+  // on CI/CD without installing techdocs backend plugin.
+  staticDocsDir = os.tmpdir();
+}
 
 /**
  * Local publisher which uses the local filesystem to store the generated static files. It uses a directory
@@ -39,6 +51,9 @@ export class LocalPublish implements PublisherBase {
   private readonly logger: Logger;
   private readonly discovery: PluginEndpointDiscovery;
 
+  // TODO: Use a static fromConfig method to create a LocalPublish instance, similar to aws/gcs publishers.
+  // Move the logic of setting staticDocsDir based on config over to fromConfig,
+  // and set the value as a class parameter.
   constructor(
     config: Config,
     logger: Logger,
@@ -52,9 +67,8 @@ export class LocalPublish implements PublisherBase {
   publish({ entity, directory }: PublishRequest): Promise<PublishResponse> {
     const entityNamespace = entity.metadata.namespace ?? 'default';
 
-    const publishDir = resolvePackagePath(
-      '@backstage/plugin-techdocs-backend',
-      'static/docs',
+    const publishDir = path.join(
+      staticDocsDir,
       entityNamespace,
       entity.kind,
       entity.metadata.name,
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 0bbd96f1a8..39e202eef8 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.9",
     "@backstage/theme": "^0.2.2",
     "@kyma-project/asyncapi-react": "^0.14.2",
@@ -49,7 +49,7 @@
     "swagger-ui-react": "^3.37.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index ce029cded2..f21224eb65 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend
 
+## 0.2.10
+
+### Patch Changes
+
+- 468579734: Allow blank certificates and support logout URLs in the SAML provider.
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index 7c105af524..c748090711 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -51,7 +51,7 @@ export interface Config {
         cert?: string;
         privateKey?: string;
         decryptionPvk?: string;
-        signatureAlgorithm?: 'sha1' | 'sha256' | 'sha512';
+        signatureAlgorithm?: 'sha256' | 'sha512';
         digestAlgorithm?: string;
       };
       okta?: {
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 713ad07617..8f88c69487 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.4.2",
+    "@backstage/backend-common": "^0.4.3",
     "@backstage/catalog-client": "^0.3.4",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
@@ -58,13 +58,13 @@
     "passport-oauth2": "^1.5.0",
     "passport-okta-oauth": "^0.0.1",
     "passport-onelogin-oauth": "^0.0.1",
-    "passport-saml": "^1.3.5, <1.4.0",
+    "passport-saml": "^2.0.0",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express-session": "^1.17.2",
@@ -74,6 +74,8 @@
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
     "@types/passport-saml": "^1.1.2",
+    "@types/passport-strategy": "^0.2.35",
+    "@types/xml2js": "^0.4.7",
     "msw": "^0.21.2",
     "nock": "^13.0.5"
   },
diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index 45676ac43e..74541d8294 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -15,8 +15,8 @@
  */
 
 import express from 'express';
+import { SamlConfig } from 'passport-saml/lib/passport-saml/types';
 import {
-  SamlConfig,
   Strategy as SamlStrategy,
   Profile as SamlProfile,
   VerifyWithoutRequest,
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index b60555037c..a3ee4b7eb3 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend
 
+## 0.5.3
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- ade6b3bdf: AWS SDK version bump for Catalog Backend.
+- abbee6fff: Implement System, Domain and Resource entity kinds.
+- 147fadcb9: Add subcomponentOf to Component kind to represent subsystems of larger components.
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.5.2
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 8fc9712777..e6b6713e20 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
   },
   "dependencies": {
     "@aws-sdk/client-organizations": "^3.2.0",
-    "@azure/msal-node": "^1.0.0-alpha.8",
-    "@backstage/backend-common": "^0.4.2",
-    "@backstage/catalog-model": "^0.6.0",
+    "@azure/msal-node": "^1.0.0-beta.3",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@octokit/graphql": "^4.5.6",
+    "@octokit/graphql": "^4.5.8",
     "@types/express": "^4.17.6",
     "@types/ldapjs": "^1.0.9",
     "codeowners-utils": "^1.0.2",
@@ -57,7 +57,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/test-utils": "^0.1.6",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.test.ts b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
index 130ed41eb1..b319bb832d 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
@@ -137,6 +137,22 @@ describe('CommonDatabase', () => {
     await expect(db.location(location.id)).rejects.toThrow(/Found no location/);
   });
 
+  it('refuses to remove the bootstrap location', async () => {
+    const input: Location = {
+      id: 'dd12620d-0436-422f-93bd-929aa0788123',
+      type: 'bootstrap',
+      target: 'bootstrap',
+    };
+
+    const output = await db.transaction(
+      async tx => await db.addLocation(tx, input),
+    );
+
+    await expect(
+      db.transaction(async tx => await db.removeLocation(tx, output.id)),
+    ).rejects.toThrow(ConflictError);
+  });
+
   describe('addEntities', () => {
     it('happy path: adds entities to empty database', async () => {
       const result = await db.transaction(tx =>
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.ts b/plugins/catalog-backend/src/database/CommonDatabase.ts
index d641cbb7b6..2edc0ca5b8 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.ts
@@ -330,15 +330,21 @@ export class CommonDatabase implements Database {
   async removeLocation(txOpaque: Transaction, id: string): Promise<void> {
     const tx = txOpaque as Knex.Transaction<any, any>;
 
+    const locations = await tx<DbLocationsRow>('locations')
+      .where({ id })
+      .select();
+    if (!locations.length) {
+      throw new NotFoundError(`Found no location with ID ${id}`);
+    }
+
+    if (locations[0].type === 'bootstrap') {
+      throw new ConflictError('You may not delete the bootstrap location.');
+    }
+
     await tx<DbEntitiesRow>('entities')
       .where({ location_id: id })
       .update({ location_id: null });
-
-    const result = await tx<DbLocationsRow>('locations').where({ id }).del();
-
-    if (!result) {
-      throw new NotFoundError(`Found no location with ID ${id}`);
-    }
+    await tx<DbLocationsRow>('locations').where({ id }).del();
   }
 
   async location(id: string): Promise<DbLocationsRowWithStatus> {
diff --git a/plugins/catalog-backend/src/ingestion/HigherOrderOperations.ts b/plugins/catalog-backend/src/ingestion/HigherOrderOperations.ts
index b7e9c48fe5..ba97232810 100644
--- a/plugins/catalog-backend/src/ingestion/HigherOrderOperations.ts
+++ b/plugins/catalog-backend/src/ingestion/HigherOrderOperations.ts
@@ -186,7 +186,7 @@ export class HigherOrderOperations implements HigherOrderOperation {
       throw e;
     }
 
-    this.logger.info(`Posting update success markers`);
+    this.logger.debug(`Posting update success markers`);
 
     await this.locationsCatalog.logUpdateSuccess(
       location.id,
diff --git a/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.test.ts
index 1d2562c25b..feb4791477 100644
--- a/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.test.ts
@@ -17,7 +17,10 @@
 import {
   ApiEntity,
   ComponentEntity,
+  DomainEntity,
   GroupEntity,
+  ResourceEntity,
+  SystemEntity,
   UserEntity,
 } from '@backstage/catalog-model';
 import { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor';
@@ -42,12 +45,13 @@ describe('BuiltinKindsEntityProcessor', () => {
           lifecycle: 'l',
           providesApis: ['b'],
           consumesApis: ['c'],
+          system: 's',
         },
       };
 
       await processor.postProcessEntity(entity, location, emit);
 
-      expect(emit).toBeCalledTimes(8);
+      expect(emit).toBeCalledTimes(10);
       expect(emit).toBeCalledWith({
         type: 'relation',
         relation: {
@@ -112,6 +116,22 @@ describe('BuiltinKindsEntityProcessor', () => {
           target: { kind: 'Component', namespace: 'default', name: 's' },
         },
       });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'System', namespace: 'default', name: 's' },
+          type: 'hasPart',
+          target: { kind: 'Component', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Component', namespace: 'default', name: 'n' },
+          type: 'partOf',
+          target: { kind: 'System', namespace: 'default', name: 's' },
+        },
+      });
     });
 
     it('generates relations for api entities', async () => {
@@ -124,12 +144,13 @@ describe('BuiltinKindsEntityProcessor', () => {
           owner: 'o',
           lifecycle: 'l',
           definition: 'd',
+          system: 's',
         },
       };
 
       await processor.postProcessEntity(entity, location, emit);
 
-      expect(emit).toBeCalledTimes(2);
+      expect(emit).toBeCalledTimes(4);
       expect(emit).toBeCalledWith({
         type: 'relation',
         relation: {
@@ -146,6 +167,150 @@ describe('BuiltinKindsEntityProcessor', () => {
           target: { kind: 'Group', namespace: 'default', name: 'o' },
         },
       });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'System', namespace: 'default', name: 's' },
+          type: 'hasPart',
+          target: { kind: 'API', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'API', namespace: 'default', name: 'n' },
+          type: 'partOf',
+          target: { kind: 'System', namespace: 'default', name: 's' },
+        },
+      });
+    });
+
+    it('generates relations for resource entities', async () => {
+      const entity: ResourceEntity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Resource',
+        metadata: { name: 'n' },
+        spec: {
+          type: 'database',
+          owner: 'o',
+          system: 's',
+        },
+      };
+
+      await processor.postProcessEntity(entity, location, emit);
+
+      expect(emit).toBeCalledTimes(4);
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Group', namespace: 'default', name: 'o' },
+          type: 'ownerOf',
+          target: { kind: 'Resource', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Resource', namespace: 'default', name: 'n' },
+          type: 'ownedBy',
+          target: { kind: 'Group', namespace: 'default', name: 'o' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'System', namespace: 'default', name: 's' },
+          type: 'hasPart',
+          target: { kind: 'Resource', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Resource', namespace: 'default', name: 'n' },
+          type: 'partOf',
+          target: { kind: 'System', namespace: 'default', name: 's' },
+        },
+      });
+    });
+
+    it('generates relations for system entities', async () => {
+      const entity: SystemEntity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'System',
+        metadata: { name: 'n' },
+        spec: {
+          owner: 'o',
+          domain: 'd',
+        },
+      };
+
+      await processor.postProcessEntity(entity, location, emit);
+
+      expect(emit).toBeCalledTimes(4);
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Group', namespace: 'default', name: 'o' },
+          type: 'ownerOf',
+          target: { kind: 'System', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'System', namespace: 'default', name: 'n' },
+          type: 'ownedBy',
+          target: { kind: 'Group', namespace: 'default', name: 'o' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Domain', namespace: 'default', name: 'd' },
+          type: 'hasPart',
+          target: { kind: 'System', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'System', namespace: 'default', name: 'n' },
+          type: 'partOf',
+          target: { kind: 'Domain', namespace: 'default', name: 'd' },
+        },
+      });
+    });
+
+    it('generates relations for domain entities', async () => {
+      const entity: DomainEntity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Domain',
+        metadata: { name: 'n' },
+        spec: {
+          owner: 'o',
+        },
+      };
+
+      await processor.postProcessEntity(entity, location, emit);
+
+      expect(emit).toBeCalledTimes(2);
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Group', namespace: 'default', name: 'o' },
+          type: 'ownerOf',
+          target: { kind: 'Domain', namespace: 'default', name: 'n' },
+        },
+      });
+      expect(emit).toBeCalledWith({
+        type: 'relation',
+        relation: {
+          source: { kind: 'Domain', namespace: 'default', name: 'n' },
+          type: 'ownedBy',
+          target: { kind: 'Group', namespace: 'default', name: 'o' },
+        },
+      });
     });
 
     it('generates relations for user entities', async () => {
diff --git a/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.ts
index 67e89ac52c..c75a46874d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/BuiltinKindsEntityProcessor.ts
@@ -19,6 +19,8 @@ import {
   apiEntityV1alpha1Validator,
   ComponentEntity,
   componentEntityV1alpha1Validator,
+  DomainEntity,
+  domainEntityV1alpha1Validator,
   Entity,
   getEntityName,
   GroupEntity,
@@ -31,13 +33,17 @@ import {
   RELATION_CHILD_OF,
   RELATION_CONSUMES_API,
   RELATION_HAS_MEMBER,
-  RELATION_MEMBER_OF,
   RELATION_HAS_PART,
-  RELATION_PART_OF,
+  RELATION_MEMBER_OF,
   RELATION_OWNED_BY,
   RELATION_OWNER_OF,
   RELATION_PARENT_OF,
+  RELATION_PART_OF,
   RELATION_PROVIDES_API,
+  ResourceEntity,
+  resourceEntityV1alpha1Validator,
+  SystemEntity,
+  systemEntityV1alpha1Validator,
   templateEntityV1alpha1Validator,
   UserEntity,
   userEntityV1alpha1Validator,
@@ -49,10 +55,13 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor {
   private readonly validators = [
     apiEntityV1alpha1Validator,
     componentEntityV1alpha1Validator,
+    resourceEntityV1alpha1Validator,
     groupEntityV1alpha1Validator,
     locationEntityV1alpha1Validator,
     templateEntityV1alpha1Validator,
     userEntityV1alpha1Validator,
+    systemEntityV1alpha1Validator,
+    domainEntityV1alpha1Validator,
   ];
 
   async validateEntityKind(entity: Entity): Promise<boolean> {
@@ -135,6 +144,12 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor {
         RELATION_CONSUMES_API,
         RELATION_API_CONSUMED_BY,
       );
+      doEmit(
+        component.spec.system,
+        { defaultKind: 'System', defaultNamespace: selfRef.namespace },
+        RELATION_PART_OF,
+        RELATION_HAS_PART,
+      );
     }
 
     /*
@@ -149,6 +164,32 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor {
         RELATION_OWNED_BY,
         RELATION_OWNER_OF,
       );
+      doEmit(
+        api.spec.system,
+        { defaultKind: 'System', defaultNamespace: selfRef.namespace },
+        RELATION_PART_OF,
+        RELATION_HAS_PART,
+      );
+    }
+
+    /*
+     * Emit relations for the Resource kind
+     */
+
+    if (entity.kind === 'Resource') {
+      const resource = entity as ResourceEntity;
+      doEmit(
+        resource.spec.owner,
+        { defaultKind: 'Group', defaultNamespace: selfRef.namespace },
+        RELATION_OWNED_BY,
+        RELATION_OWNER_OF,
+      );
+      doEmit(
+        resource.spec.system,
+        { defaultKind: 'System', defaultNamespace: selfRef.namespace },
+        RELATION_PART_OF,
+        RELATION_HAS_PART,
+      );
     }
 
     /*
@@ -185,6 +226,40 @@ export class BuiltinKindsEntityProcessor implements CatalogProcessor {
       );
     }
 
+    /*
+     * Emit relations for the System kind
+     */
+
+    if (entity.kind === 'System') {
+      const system = entity as SystemEntity;
+      doEmit(
+        system.spec.owner,
+        { defaultKind: 'Group', defaultNamespace: selfRef.namespace },
+        RELATION_OWNED_BY,
+        RELATION_OWNER_OF,
+      );
+      doEmit(
+        system.spec.domain,
+        { defaultKind: 'Domain', defaultNamespace: selfRef.namespace },
+        RELATION_PART_OF,
+        RELATION_HAS_PART,
+      );
+    }
+
+    /*
+     * Emit relations for the Domain kind
+     */
+
+    if (entity.kind === 'Domain') {
+      const domain = entity as DomainEntity;
+      doEmit(
+        domain.spec.owner,
+        { defaultKind: 'Group', defaultNamespace: selfRef.namespace },
+        RELATION_OWNED_BY,
+        RELATION_OWNER_OF,
+      );
+    }
+
     return entity;
   }
 }
diff --git a/plugins/catalog-backend/src/ingestion/processors/microsoftGraph/client.ts b/plugins/catalog-backend/src/ingestion/processors/microsoftGraph/client.ts
index bdb5918b2f..3dfc58e773 100644
--- a/plugins/catalog-backend/src/ingestion/processors/microsoftGraph/client.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/microsoftGraph/client.ts
@@ -96,6 +96,10 @@ export class MicrosoftGraphClient {
       scopes: ['https://graph.microsoft.com/.default'],
     });
 
+    if (!token) {
+      throw new Error('Error while requesting token for Microsoft Graph');
+    }
+
     return await fetch(url, {
       headers: {
         Authorization: `Bearer ${token.accessToken}`,
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index f494949aab..a307095014 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-catalog-import
 
+## 0.3.4
+
+### Patch Changes
+
+- 34a01a171: Improve how URLs are analyzed for add/import
+- bc40ccecf: Add more generic descriptions for the catalog-import form.
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- be5ac7fde: Remove dependency to `@backstage/plugin-catalog-backend`.
+- Updated dependencies [466354aaa]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/integration@0.2.0
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index d308bef7b8..5e601ad896 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,15 +30,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/plugin-catalog": "^0.2.10",
-    "@backstage/integration": "^0.1.5",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
+    "@backstage/integration": "^0.2.0",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@octokit/rest": "^18.0.6",
+    "@octokit/rest": "^18.0.12",
     "git-url-parse": "^11.4.3",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -49,7 +49,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 57a8a9d205..b826346b39 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-catalog
 
+## 0.2.11
+
+### Patch Changes
+
+- c00488983: Enable catalog table actions for all location types.
+
+  The edit button has had support for other providers for a while and there is
+  no specific reason the View in GitHub cannot work for all locations. This
+  change also replaces the GitHub icon with the OpenInNew icon.
+
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/core@0.4.4
+
 ## 0.2.10
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index a5fa16ed6f..fa6d757f0a 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.4",
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-scaffolder": "^0.3.6",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -51,7 +51,7 @@
     "swr": "^0.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@microsoft/microsoft-graph-types": "^1.25.0",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 8e0b4743a0..7e3124375a 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.7",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -50,7 +50,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index 64e1fe2937..95eaf4a391 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-cloudbuild
 
+## 0.2.6
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.2.5
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 7cac2e6a68..5b55f1df5a 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cloudbuild",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,15 +30,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/plugin-catalog": "^0.2.7",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@octokit/rest": "^18.0.0",
-    "@octokit/types": "^5.4.1",
     "moment": "^2.27.0",
     "qs": "^6.9.4",
     "react": "^16.13.1",
@@ -49,7 +47,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index fd0b0e8e7d..f0538720ab 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.2",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -55,7 +55,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 5c109d6a9e..613c0cb098 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -42,7 +42,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 3036554fad..81e047e7ab 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -43,7 +43,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index f2202054db..797b63bda9 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -41,7 +41,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index f2537742f4..7aead61ed2 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-github-actions
 
+## 0.2.7
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- a6f9dca0d: Remove dependency on `@backstage/core-api`. No plugin should ever depend on that package; it's an internal concern whose important bits are re-exported by `@backstage/core` which is the public facing dependency to use.
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 94b69935d0..9b2d199b1f 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,16 +32,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/core-api": "^0.2.7",
-    "@backstage/plugin-catalog": "^0.2.8",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@octokit/rest": "^18.0.0",
-    "@octokit/types": "^5.4.1",
+    "@octokit/rest": "^18.0.12",
     "moment": "^2.27.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -51,7 +49,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/github-actions/src/api/GithubActionsApi.ts b/plugins/github-actions/src/api/GithubActionsApi.ts
index bf79e74351..75086998c9 100644
--- a/plugins/github-actions/src/api/GithubActionsApi.ts
+++ b/plugins/github-actions/src/api/GithubActionsApi.ts
@@ -15,12 +15,7 @@
  */
 
 import { createApiRef } from '@backstage/core';
-import {
-  ActionsListWorkflowRunsForRepoResponseData,
-  ActionsGetWorkflowResponseData,
-  ActionsGetWorkflowRunResponseData,
-  EndpointInterface,
-} from '@octokit/types';
+import { RestEndpointMethodTypes } from '@octokit/rest';
 
 export const githubActionsApiRef = createApiRef<GithubActionsApi>({
   id: 'plugin.githubactions.service',
@@ -42,7 +37,9 @@ export type GithubActionsApi = {
     pageSize?: number;
     page?: number;
     branch?: string;
-  }) => Promise<ActionsListWorkflowRunsForRepoResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data']
+  >;
   getWorkflow: ({
     token,
     owner,
@@ -53,7 +50,9 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     id: number;
-  }) => Promise<ActionsGetWorkflowResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['getWorkflow']['response']['data']
+  >;
   getWorkflowRun: ({
     token,
     owner,
@@ -64,7 +63,9 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     id: number;
-  }) => Promise<ActionsGetWorkflowRunResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data']
+  >;
   reRunWorkflow: ({
     token,
     owner,
@@ -86,5 +87,7 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     runId: number;
-  }) => Promise<EndpointInterface>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data']
+  >;
 };
diff --git a/plugins/github-actions/src/api/GithubActionsClient.ts b/plugins/github-actions/src/api/GithubActionsClient.ts
index 94fb774537..5be2c9a743 100644
--- a/plugins/github-actions/src/api/GithubActionsClient.ts
+++ b/plugins/github-actions/src/api/GithubActionsClient.ts
@@ -15,13 +15,7 @@
  */
 
 import { GithubActionsApi } from './GithubActionsApi';
-import { Octokit } from '@octokit/rest';
-import {
-  ActionsListWorkflowRunsForRepoResponseData,
-  ActionsGetWorkflowResponseData,
-  ActionsGetWorkflowRunResponseData,
-  EndpointInterface,
-} from '@octokit/types';
+import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
 
 export class GithubActionsClient implements GithubActionsApi {
   async reRunWorkflow({
@@ -55,7 +49,9 @@ export class GithubActionsClient implements GithubActionsApi {
     pageSize?: number;
     page?: number;
     branch?: string;
-  }): Promise<ActionsListWorkflowRunsForRepoResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data']
+  > {
     const workflowRuns = await new Octokit({
       auth: token,
     }).actions.listWorkflowRunsForRepo({
@@ -77,7 +73,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     id: number;
-  }): Promise<ActionsGetWorkflowResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['getWorkflow']['response']['data']
+  > {
     const workflow = await new Octokit({ auth: token }).actions.getWorkflow({
       owner,
       repo,
@@ -95,7 +93,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     id: number;
-  }): Promise<ActionsGetWorkflowRunResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data']
+  > {
     const run = await new Octokit({ auth: token }).actions.getWorkflowRun({
       owner,
       repo,
@@ -113,7 +113,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     runId: number;
-  }): Promise<EndpointInterface> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data']
+  > {
     const workflow = await new Octokit({
       auth: token,
     }).actions.downloadJobLogsForWorkflowRun({
diff --git a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
index 1d6001e038..0fd77c0443 100644
--- a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
+++ b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import type { Props as RecentWorkflowRunsCardProps } from './RecentWorkflowRunsCard';
-import React from 'react';
-import { render } from '@testing-library/react';
-import { RecentWorkflowRunsCard } from './RecentWorkflowRunsCard';
-import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core-api';
-import { useWorkflowRuns } from '../useWorkflowRuns';
-import { ThemeProvider } from '@material-ui/core';
+import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
 import { lightTheme } from '@backstage/theme';
+import { ThemeProvider } from '@material-ui/core';
+import { render } from '@testing-library/react';
+import React from 'react';
 import { MemoryRouter } from 'react-router';
+import { useWorkflowRuns } from '../useWorkflowRuns';
+import type { Props as RecentWorkflowRunsCardProps } from './RecentWorkflowRunsCard';
+import { RecentWorkflowRunsCard } from './RecentWorkflowRunsCard';
 
 jest.mock('../useWorkflowRuns', () => ({
   useWorkflowRuns: jest.fn(),
diff --git a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.tsx b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.tsx
index 70348ece0a..9bb52b9ab1 100644
--- a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.tsx
+++ b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.tsx
@@ -14,14 +14,19 @@
  * limitations under the License.
  */
 import { Entity } from '@backstage/catalog-model';
-import { errorApiRef, useApi } from '@backstage/core-api';
+import {
+  EmptyState,
+  errorApiRef,
+  InfoCard,
+  Table,
+  useApi,
+} from '@backstage/core';
+import { Button, Link } from '@material-ui/core';
+import React, { useEffect } from 'react';
+import { generatePath, Link as RouterLink } from 'react-router-dom';
 import { GITHUB_ACTIONS_ANNOTATION } from '../useProjectName';
 import { useWorkflowRuns } from '../useWorkflowRuns';
-import React, { useEffect } from 'react';
-import { EmptyState, InfoCard, Table } from '@backstage/core';
 import { WorkflowRunStatus } from '../WorkflowRunStatus';
-import { Button, Link } from '@material-ui/core';
-import { generatePath, Link as RouterLink } from 'react-router-dom';
 
 const firstLine = (message: string): string => message.split('\n')[0];
 
diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
index a2753589eb..ac238b8d0f 100644
--- a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
@@ -209,8 +209,8 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
               </TableCell>
               <TableCell>
                 <WorkflowRunStatus
-                  status={details.value?.status}
-                  conclusion={details.value?.conclusion}
+                  status={details.value?.status || undefined}
+                  conclusion={details.value?.conclusion || undefined}
                 />
               </TableCell>
             </TableRow>
@@ -218,7 +218,7 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
               <TableCell>
                 <Typography noWrap>Author</Typography>
               </TableCell>
-              <TableCell>{`${details.value?.head_commit.author.name} (${details.value?.head_commit.author.email})`}</TableCell>
+              <TableCell>{`${details.value?.head_commit.author?.name} (${details.value?.head_commit.author?.email})`}</TableCell>
             </TableRow>
             <TableRow>
               <TableCell>
diff --git a/plugins/github-actions/src/components/useWorkflowRuns.ts b/plugins/github-actions/src/components/useWorkflowRuns.ts
index d0be852beb..4261012c26 100644
--- a/plugins/github-actions/src/components/useWorkflowRuns.ts
+++ b/plugins/github-actions/src/components/useWorkflowRuns.ts
@@ -18,7 +18,6 @@ import { useAsyncRetry } from 'react-use';
 import { WorkflowRun } from './WorkflowRunsTable/WorkflowRunsTable';
 import { githubActionsApiRef } from '../api/GithubActionsApi';
 import { useApi, githubAuthApiRef, errorApiRef } from '@backstage/core';
-import { ActionsListWorkflowRunsForRepoResponseData } from '@octokit/types';
 
 export function useWorkflowRuns({
   owner,
@@ -55,44 +54,40 @@ export function useWorkflowRuns({
           page: page + 1,
           branch,
         })
-        .then(
-          (
-            workflowRunsData: ActionsListWorkflowRunsForRepoResponseData,
-          ): WorkflowRun[] => {
-            setTotal(workflowRunsData.total_count);
-            // Transformation here
-            return workflowRunsData.workflow_runs.map(run => ({
-              message: run.head_commit.message,
-              id: `${run.id}`,
-              onReRunClick: async () => {
-                try {
-                  await api.reRunWorkflow({
-                    token,
-                    owner,
-                    repo,
-                    runId: run.id,
-                  });
-                } catch (e) {
-                  errorApi.post(e);
-                }
+        .then((workflowRunsData): WorkflowRun[] => {
+          setTotal(workflowRunsData.total_count);
+          // Transformation here
+          return workflowRunsData.workflow_runs.map(run => ({
+            message: run.head_commit.message,
+            id: `${run.id}`,
+            onReRunClick: async () => {
+              try {
+                await api.reRunWorkflow({
+                  token,
+                  owner,
+                  repo,
+                  runId: run.id,
+                });
+              } catch (e) {
+                errorApi.post(e);
+              }
+            },
+            source: {
+              branchName: run.head_branch,
+              commit: {
+                hash: run.head_commit.id,
+                url: run.head_repository.branches_url.replace(
+                  '{/branch}',
+                  run.head_branch,
+                ),
               },
-              source: {
-                branchName: run.head_branch,
-                commit: {
-                  hash: run.head_commit.id,
-                  url: run.head_repository.branches_url.replace(
-                    '{/branch}',
-                    run.head_branch,
-                  ),
-                },
-              },
-              status: run.status,
-              conclusion: run.conclusion,
-              url: run.url,
-              githubUrl: run.html_url,
-            }));
-          },
-        )
+            },
+            status: run.status,
+            conclusion: run.conclusion,
+            url: run.url,
+            githubUrl: run.html_url,
+          }));
+        })
     );
   }, [page, pageSize, repo, owner]);
 
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 28fead7796..61adfe5d67 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -42,7 +42,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index 9c1289febc..fa33128f45 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-graphiql
 
+## 0.2.5
+
+### Patch Changes
+
+- 5a1368ba1: Updated README
+- Updated dependencies [265a7ab30]
+  - @backstage/core@0.4.4
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/plugins/graphiql/README.md b/plugins/graphiql/README.md
index d2f8cafbfb..c75d8b71e3 100644
--- a/plugins/graphiql/README.md
+++ b/plugins/graphiql/README.md
@@ -12,53 +12,64 @@ By exposing GraphiQL as a plugin instead of a standalone app, it's possible to p
 Start out by installing the plugin in your Backstage app:
 
 ```bash
+cd packages/app
 yarn add @backstage/plugin-graphiql
 ```
 
-Then add an entry to your App's `plugins.ts` to import the plugin.
+```diff
+# in packages/app/src/plugins.ts
++export { plugin as GraphiQL } from '@backstage/plugin-graphiql';
+```
 
-The plugin registers a `/graphiql` route, which you can link to from the Sidebar if desired.
+```diff
+# in packages/app/src/App.tsx
++import { Router as GraphiQLRouter } from '@backstage/plugin-graphiql';
+
+ const AppRoutes = () => (
+   <Routes>
++    <Route path="/graphiql" element={<GraphiQLRouter />} />
+```
 
 ### Adding GraphQL endpoints
 
-For the plugin to function, you need to supply GraphQL endpoints through the GraphQLBrowse API, which is done by implementing the `GraphQLBrowseApi` exported by this plugin.
+For the plugin to function, you need to supply GraphQL endpoints through the GraphQLBrowse API. This is done by implementing the `graphQlBrowseApiRef` exported by this plugin.
 
-If all you need is a static list of endpoints, the plugin exports a `GraphQLEndpoints` class that implements the `GraphQLBrowseApi` for you. Here's and example of how you could expose two GraphQL endpoints in your App:
+If all you need is a static list of endpoints, the plugin exports a `GraphQLEndpoints` class that implements the `GraphQLBrowseApi` for you. Here's an example of how you could expose two GraphQL endpoints in your App:
 
-```tsx
-import {
-  graphQlBrowseApiRef,
-  GraphQLEndpoints,
-} from '@backstage/plugin-graphiql';
+```diff
+# in packages/app/src/apis.ts
++import {
++  graphQlBrowseApiRef,
++  GraphQLEndpoints,
++} from '@backstage/plugin-graphiql';
 
-// Implement the Graph QL browse API using a static list of endpoints
-const graphQlBrowseApi = GraphQLEndpoints.from([
-  // Use the .create function if all you need is a static URL and headers.
-  GraphQLEndpoints.create({
-    id: 'gitlab',
-    title: 'GitLab',
-    url: 'https://gitlab.com/api/graphql',
-    // Optional extra headers
-    headers: { Extra: 'Header' },
-  }),
-  {
-    id: 'hooli-search',
-    title: 'Hooli Search',
-    // Custom fetch function, this one is equivalent to using GraphQLEndpoints.create()
-    // with url set to https://internal.hooli.com/search
-    fetcher: async (params: any) => {
-      return fetch('https://internal.hooli.com/search', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(params),
-      }).then(res => res.json());
-    },
-  },
-]);
-
-// ApiRegistry builder created somewhere in your App
-const builder = ApiRegistry.builder();
-
-// Add the instance to the API registry
-builder.add(graphQlBrowseApiRef, graphQlBrowseApi);
+  export const apis = [
++   createApiFactory({
++     api: graphQlBrowseApiRef,
++     deps: { errorApi: errorApiRef, githubAuthApi: githubAuthApiRef },
++     factory: ({ errorApi, githubAuthApi }) =>
++       GraphQLEndpoints.from([
++         // Use the .create function if all you need is a static URL and headers.
++         GraphQLEndpoints.create({
++           id: 'gitlab',
++           title: 'GitLab',
++           url: 'https://gitlab.com/api/graphql',
++           // Optional extra headers
++           headers: { Extra: 'Header' },
++         }),
++         {
++           id: 'hooli-search',
++           title: 'Hooli Search',
++           // Custom fetch function, this one is equivalent to using GraphQLEndpoints.create()
++           // with url set to https://internal.hooli.com/search
++           fetcher: async (params: any) => {
++             return fetch('https://internal.hooli.com/search', {
++               method: 'POST',
++               headers: { 'Content-Type': 'application/json' },
++               body: JSON.stringify(params),
++             }).then(res => res.json());
++           },
++         }
++       ]),
++   }),
 ```
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 341c4c14f7..f995dc4ebc 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -43,7 +43,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/graphiql/src/plugin.ts b/plugins/graphiql/src/plugin.ts
index a0bb79ed29..87f750b132 100644
--- a/plugins/graphiql/src/plugin.ts
+++ b/plugins/graphiql/src/plugin.ts
@@ -25,7 +25,8 @@ import { graphiQLRouteRef } from './route-refs';
 export const plugin = createPlugin({
   id: 'graphiql',
   apis: [
-    // GitLab is used as an example endpoint, but most plug
+    // GitLab is used as an example endpoint, but most will want to plug in
+    // their own instead.
     createApiFactory(
       graphQlBrowseApiRef,
       GraphQLEndpoints.from([
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index 78792789cf..bcddeedf29 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-jenkins
 
+## 0.3.5
+
+### Patch Changes
+
+- feabc7f0c: Handle missing ObjectMetadataAction in Jenkins API
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.3.4
 
 ### Patch Changes
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 99d69cf50e..f8c0b3fd76 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/plugin-catalog": "^0.2.7",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -46,7 +46,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index 9b247c174f..eeb710fce4 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.2.4
+
+### Patch Changes
+
+- 5a9a7e7c2: Revamped Kubernetes UI and added error reporting/detection
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 66a36f8395..56c6707427 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.4.1",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@kubernetes/client-node": "^0.12.1",
+    "@kubernetes/client-node": "^0.13.2",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -49,7 +49,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.2",
+    "@backstage/cli": "^0.4.6",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
index 29233cf7fd..8d29439539 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
@@ -197,6 +197,27 @@ describe('KubernetesClientProvider', () => {
   });
   // they're in testErrorResponse
   // eslint-disable-next-line jest/expect-expect
+  it('should return pods, bad request error', async () => {
+    await testErrorResponse(
+      {
+        response: {
+          statusCode: 400,
+          request: {
+            uri: {
+              pathname: '/some/path',
+            },
+          },
+        },
+      },
+      {
+        errorType: 'BAD_REQUEST',
+        resourcePath: '/some/path',
+        statusCode: 400,
+      },
+    );
+  });
+  // they're in testErrorResponse
+  // eslint-disable-next-line jest/expect-expect
   it('should return pods, unauthorized error', async () => {
     await testErrorResponse(
       {
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index d9c6ee6d1a..991174e78a 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -74,6 +74,8 @@ function fetchResultsToResponseWrapper(
 
 const statusCodeToErrorType = (statusCode: number): KubernetesErrorTypes => {
   switch (statusCode) {
+    case 400:
+      return 'BAD_REQUEST';
     case 401:
       return 'UNAUTHORIZED_ERROR';
     case 500:
diff --git a/plugins/kubernetes-backend/src/types/types.ts b/plugins/kubernetes-backend/src/types/types.ts
index 9f0b90c032..cf6576153b 100644
--- a/plugins/kubernetes-backend/src/types/types.ts
+++ b/plugins/kubernetes-backend/src/types/types.ts
@@ -135,6 +135,7 @@ export interface KubernetesClustersSupplier {
 }
 
 export type KubernetesErrorTypes =
+  | 'BAD_REQUEST'
   | 'UNAUTHORIZED_ERROR'
   | 'SYSTEM_ERROR'
   | 'UNKNOWN_ERROR';
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index ef5b51cfb9..997676bef7 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-kubernetes
 
+## 0.3.5
+
+### Patch Changes
+
+- 1fea88fd0: Fixed an issue where assets weren't properly bundled in the published package.
+
+## 0.3.4
+
+### Patch Changes
+
+- 5a9a7e7c2: Revamped Kubernetes UI and added error reporting/detection
+- 3e7c09c84: Minor updates to display of errors
+- Updated dependencies [5a9a7e7c2]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/plugin-kubernetes-backend@0.2.4
+  - @backstage/catalog-model@0.6.1
+  - @backstage/core@0.4.4
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index f00c846163..554bfe69ab 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@backstage/core": "^0.4.3",
-    "@backstage/plugin-kubernetes-backend": "^0.2.3",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-kubernetes-backend": "^0.2.4",
     "@backstage/theme": "^0.2.2",
-    "@kubernetes/client-node": "^0.12.1",
+    "@kubernetes/client-node": "^0.13.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -47,7 +47,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/kubernetes/assets/emptystate.svg b/plugins/kubernetes/src/assets/emptystate.svg
similarity index 98%
rename from plugins/kubernetes/assets/emptystate.svg
rename to plugins/kubernetes/src/assets/emptystate.svg
index fa7f19123e..f01a74f374 100644
--- a/plugins/kubernetes/assets/emptystate.svg
+++ b/plugins/kubernetes/src/assets/emptystate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="282" height="173" fill="none" viewBox="0 0 282 173"><path fill="#000" fill-opacity=".05" fill-rule="evenodd" d="M16.4571 45.1637C11.0514 46.1711 7.48574 51.3699 8.49306 56.7756C9.50039 62.1814 14.6992 65.747 20.105 64.7397L27.5528 63.3518C25.4791 65.5835 24.4525 68.7347 25.0535 71.9596C26.0608 77.3653 31.2596 80.931 36.6654 79.9236L89.691 70.0427C89.7016 70.1067 89.7129 70.1708 89.7249 70.2349C90.3258 73.4598 92.4185 76.0298 95.1569 77.3647L91.9031 77.971C86.4974 78.9784 82.9318 84.1772 83.9391 89.583C84.9464 94.9887 90.1452 98.5543 95.551 97.547L250.098 68.7482C255.504 67.7409 259.069 62.5421 258.062 57.1363C257.461 53.9114 255.368 51.3414 252.63 50.0065L257.835 49.0366C263.241 48.0292 266.807 42.8304 265.799 37.4247C264.792 32.0189 259.593 28.4533 254.187 29.4606L161.492 46.7338C161.481 46.6697 161.47 46.6056 161.458 46.5415C160.857 43.3166 158.764 40.7466 156.026 39.4117L165.025 37.7347C170.431 36.7274 173.997 31.5286 172.989 26.1228C171.982 20.7171 166.783 17.1514 161.378 18.1588L16.4571 45.1637ZM24.3031 122.54C23.2958 117.134 26.8614 111.936 32.2672 110.928L190.856 81.3762C196.262 80.3688 201.461 83.9345 202.468 89.3402C203.476 94.746 199.91 99.9448 194.504 100.952L189.963 101.798C190.493 102.057 190.999 102.362 191.474 102.708L246.43 92.4677C251.835 91.4604 257.034 95.026 258.041 100.432C258.642 103.657 257.616 106.808 255.542 109.04L256.649 108.833C262.055 107.826 267.253 111.392 268.261 116.797C269.268 122.203 265.702 127.402 260.297 128.409L95.5591 159.107C90.1534 160.114 84.9545 156.549 83.9472 151.143C82.9399 145.737 86.5055 140.538 91.9113 139.531L103.94 137.29C103.41 137.031 102.904 136.726 102.429 136.38L29.1002 150.044C23.6944 151.051 18.4956 147.486 17.4882 142.08C16.4809 136.674 20.0465 131.475 25.4523 130.468L29.7352 129.67C26.9967 128.335 24.904 125.765 24.3031 122.54Z" clip-rule="evenodd"/><g filter="url(#filter0_d)"><path fill="#EEE" d="M232.896 31.2403H51.2975C49.1452 31.2403 47.4005 32.983 47.4005 35.1327V46.8101C47.4005 48.9598 49.1452 50.7025 51.2975 50.7025H232.896C235.048 50.7025 236.793 48.9598 236.793 46.8101V35.1327C236.793 32.983 235.048 31.2403 232.896 31.2403Z"/><mask id="mask0" width="190" height="114" x="47" y="31" mask-type="alpha" maskUnits="userSpaceOnUse"><path fill="#404040" d="M232.896 31.2403H51.2975C49.1452 31.2403 47.4005 32.983 47.4005 35.1327V141.007C47.4005 143.157 49.1452 144.9 51.2975 144.9H232.896C235.048 144.9 236.793 143.157 236.793 141.007V35.1327C236.793 32.983 235.048 31.2403 232.896 31.2403Z"/></mask><g mask="url(#mask0)"><path fill="#EEE" d="M239.91 42.1391H47.4005V150.349H239.91V42.1391Z"/></g></g><circle cx="188" cy="55" r="6" fill="#69DDC7"/><circle cx="91" cy="92" r="6" fill="#69DDC7"/><path fill="#69DDC7" d="M121 114L95.5 88L86.5 96L121 130L192.5 59L183.5 51L121 114Z"/><defs><filter id="filter0_d" width="229.392" height="153.66" x="29.401" y="15.24" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dx="2" dy="4"/><feGaussianBlur stdDeviation="10"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/><feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow"/><feBlend in="SourceGraphic" in2="effect1_dropShadow" mode="normal" result="shape"/></filter></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="282" height="173" fill="none" viewBox="0 0 282 173"><path fill="#000" fill-opacity=".05" fill-rule="evenodd" d="M16.4571 45.1637C11.0514 46.1711 7.48574 51.3699 8.49306 56.7756C9.50039 62.1814 14.6992 65.747 20.105 64.7397L27.5528 63.3518C25.4791 65.5835 24.4525 68.7347 25.0535 71.9596C26.0608 77.3653 31.2596 80.931 36.6654 79.9236L89.691 70.0427C89.7016 70.1067 89.7129 70.1708 89.7249 70.2349C90.3258 73.4598 92.4185 76.0298 95.1569 77.3647L91.9031 77.971C86.4974 78.9784 82.9318 84.1772 83.9391 89.583C84.9464 94.9887 90.1452 98.5543 95.551 97.547L250.098 68.7482C255.504 67.7409 259.069 62.5421 258.062 57.1363C257.461 53.9114 255.368 51.3414 252.63 50.0065L257.835 49.0366C263.241 48.0292 266.807 42.8304 265.799 37.4247C264.792 32.0189 259.593 28.4533 254.187 29.4606L161.492 46.7338C161.481 46.6697 161.47 46.6056 161.458 46.5415C160.857 43.3166 158.764 40.7466 156.026 39.4117L165.025 37.7347C170.431 36.7274 173.997 31.5286 172.989 26.1228C171.982 20.7171 166.783 17.1514 161.378 18.1588L16.4571 45.1637ZM24.3031 122.54C23.2958 117.134 26.8614 111.936 32.2672 110.928L190.856 81.3762C196.262 80.3688 201.461 83.9345 202.468 89.3402C203.476 94.746 199.91 99.9448 194.504 100.952L189.963 101.798C190.493 102.057 190.999 102.362 191.474 102.708L246.43 92.4677C251.835 91.4604 257.034 95.026 258.041 100.432C258.642 103.657 257.616 106.808 255.542 109.04L256.649 108.833C262.055 107.826 267.253 111.392 268.261 116.797C269.268 122.203 265.702 127.402 260.297 128.409L95.5591 159.107C90.1534 160.114 84.9545 156.549 83.9472 151.143C82.9399 145.737 86.5055 140.538 91.9113 139.531L103.94 137.29C103.41 137.031 102.904 136.726 102.429 136.38L29.1002 150.044C23.6944 151.051 18.4956 147.486 17.4882 142.08C16.4809 136.674 20.0465 131.475 25.4523 130.468L29.7352 129.67C26.9967 128.335 24.904 125.765 24.3031 122.54Z" clip-rule="evenodd"/><g filter="url(#filter0_d)"><path fill="#EEE" d="M232.896 31.2403H51.2975C49.1452 31.2403 47.4005 32.983 47.4005 35.1327V46.8101C47.4005 48.9598 49.1452 50.7025 51.2975 50.7025H232.896C235.048 50.7025 236.793 48.9598 236.793 46.8101V35.1327C236.793 32.983 235.048 31.2403 232.896 31.2403Z"/><mask id="mask0" width="190" height="114" x="47" y="31" mask-type="alpha" maskUnits="userSpaceOnUse"><path fill="#404040" d="M232.896 31.2403H51.2975C49.1452 31.2403 47.4005 32.983 47.4005 35.1327V141.007C47.4005 143.157 49.1452 144.9 51.2975 144.9H232.896C235.048 144.9 236.793 143.157 236.793 141.007V35.1327C236.793 32.983 235.048 31.2403 232.896 31.2403Z"/></mask><g mask="url(#mask0)"><path fill="#EEE" d="M239.91 42.1391H47.4005V150.349H239.91V42.1391Z"/></g></g><circle cx="188" cy="55" r="6" fill="#69DDC7"/><circle cx="91" cy="92" r="6" fill="#69DDC7"/><path fill="#69DDC7" d="M121 114L95.5 88L86.5 96L121 130L192.5 59L183.5 51L121 114Z"/><defs><filter id="filter0_d" width="229.392" height="153.66" x="29.401" y="15.24" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dx="2" dy="4"/><feGaussianBlur stdDeviation="10"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/><feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow"/><feBlend in="SourceGraphic" in2="effect1_dropShadow" mode="normal" result="shape"/></filter></defs></svg>
diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
index c986c0158d..21f66f28c0 100644
--- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
+++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
@@ -17,7 +17,7 @@ import * as React from 'react';
 import { Table, TableColumn, InfoCard } from '@backstage/core';
 import { DetectedError, DetectedErrorsByCluster } from '../../error-detection';
 import { Chip, Typography, Grid } from '@material-ui/core';
-import EmptyStateImage from '../../../assets/emptystate.svg';
+import EmptyStateImage from '../../assets/emptystate.svg';
 
 type ErrorReportingProps = {
   detectedErrors: DetectedErrorsByCluster;
@@ -113,17 +113,17 @@ export const ErrorEmptyState = () => {
   return (
     <Grid
       container
-      justify="center"
-      direction="column"
+      justify="space-around"
+      direction="row"
       alignItems="center"
       spacing={2}
     >
-      <Grid item xs={12}>
+      <Grid item xs={4}>
         <Typography variant="h5">
           Nice! There are no errors to report!
         </Typography>
       </Grid>
-      <Grid item xs={12}>
+      <Grid item xs={4}>
         <img
           src={EmptyStateImage}
           alt="EmptyState"
diff --git a/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.test.tsx b/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.test.tsx
index 6fa6b3114c..8dff742502 100644
--- a/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.test.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.test.tsx
@@ -33,7 +33,7 @@ describe('ErrorPanel', () => {
     // title
     expect(
       getByText(
-        'There was an error retrieving some Kubernetes resources for the entity: THIS_ENTITY',
+        'There was a problem retrieving some Kubernetes resources for the entity: THIS_ENTITY. This could mean that the Error Reporting card is not completely accurate.',
       ),
     ).toBeInTheDocument();
 
@@ -67,7 +67,7 @@ describe('ErrorPanel', () => {
     // title
     expect(
       getByText(
-        'There was an error retrieving some Kubernetes resources for the entity: THIS_ENTITY',
+        'There was a problem retrieving some Kubernetes resources for the entity: THIS_ENTITY. This could mean that the Error Reporting card is not completely accurate.',
       ),
     ).toBeInTheDocument();
 
diff --git a/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.tsx b/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.tsx
index 85060fc11b..650e6ddff1 100644
--- a/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent/ErrorPanel.tsx
@@ -52,8 +52,8 @@ export const ErrorPanel = ({
   clustersWithErrors,
 }: ErrorPanelProps) => (
   <WarningPanel
-    title="There was an error retrieving kubernetes objects"
-    message={`There was an error retrieving some Kubernetes resources for the entity: ${entityName}`}
+    title="There was a problem retrieving Kubernetes objects"
+    message={`There was a problem retrieving some Kubernetes resources for the entity: ${entityName}. This could mean that the Error Reporting card is not completely accurate.`}
   >
     {clustersWithErrors && (
       <div>Errors: {clustersWithErrorsToErrorMessage(clustersWithErrors)}</div>
diff --git a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
index 293e7a4833..39e73782f1 100644
--- a/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
+++ b/plugins/kubernetes/src/components/KubernetesContent/KubernetesContent.tsx
@@ -106,51 +106,55 @@ export const KubernetesContent = ({ entity }: KubernetesContentProps) => {
   return (
     <Page themeId="tool">
       <Content>
-        <Grid container spacing={3} direction="column">
-          {kubernetesObjects === undefined && error === undefined && (
-            <Progress />
-          )}
+        {kubernetesObjects === undefined && error === undefined && <Progress />}
 
-          {/* errors retrieved from the kubernetes clusters */}
-          {clustersWithErrors.length > 0 && (
-            <ErrorPanel
-              entityName={entity.metadata.name}
-              clustersWithErrors={clustersWithErrors}
-            />
-          )}
+        {/* errors retrieved from the kubernetes clusters */}
+        {clustersWithErrors.length > 0 && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorPanel
+                entityName={entity.metadata.name}
+                clustersWithErrors={clustersWithErrors}
+              />
+            </Grid>
+          </Grid>
+        )}
 
-          {/* other errors */}
-          {error !== undefined && (
-            <ErrorPanel
-              entityName={entity.metadata.name}
-              errorMessage={error}
-            />
-          )}
+        {/* other errors */}
+        {error !== undefined && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorPanel
+                entityName={entity.metadata.name}
+                errorMessage={error}
+              />
+            </Grid>
+          </Grid>
+        )}
 
-          {kubernetesObjects && (
-            <>
-              <Grid item>
-                <ErrorReporting detectedErrors={detectedErrors} />
-              </Grid>
-              <Grid item>
-                <Divider />
-              </Grid>
-              <Grid item>
-                <Typography variant="h3">Your Clusters</Typography>
-              </Grid>
-              <Grid item container>
-                {kubernetesObjects?.items.map((item, i) => (
-                  <Grid item key={i} xs={12}>
-                    <Cluster
-                      clusterObjects={item}
-                      detectedErrors={detectedErrors.get(item.cluster.name)}
-                    />
-                  </Grid>
-                ))}
-              </Grid>
-            </>
-          )}
-        </Grid>
+        {kubernetesObjects && (
+          <Grid container spacing={3} direction="column">
+            <Grid item>
+              <ErrorReporting detectedErrors={detectedErrors} />
+            </Grid>
+            <Grid item>
+              <Divider />
+            </Grid>
+            <Grid item>
+              <Typography variant="h3">Your Clusters</Typography>
+            </Grid>
+            <Grid item container>
+              {kubernetesObjects?.items.map((item, i) => (
+                <Grid item key={i} xs={12}>
+                  <Cluster
+                    clusterObjects={item}
+                    detectedErrors={detectedErrors.get(item.cluster.name)}
+                  />
+                </Grid>
+              ))}
+            </Grid>
+          </Grid>
+        )}
       </Content>
     </Page>
   );
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index 42035d1209..b70539f6fa 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-lighthouse
 
+## 0.2.7
+
+### Patch Changes
+
+- cf7df3b1f: Strip trailing slash from url when creating a new audit. This change prevents duplicate audits from being displayed in the audit list.
+- a6f9dca0d: Remove dependency on `@backstage/core-api`. No plugin should ever depend on that package; it's an internal concern whose important bits are re-exported by `@backstage/core` which is the public facing dependency to use.
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index f688f9c1db..6f4892da6c 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,11 +31,10 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@backstage/core": "^0.4.3",
-    "@backstage/core-api": "^0.2.6",
-    "@backstage/plugin-catalog": "^0.2.7",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -47,7 +46,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/lighthouse/src/hooks/useWebsiteForEntity.test.tsx b/plugins/lighthouse/src/hooks/useWebsiteForEntity.test.tsx
index 7f5925abf8..c1773921cf 100644
--- a/plugins/lighthouse/src/hooks/useWebsiteForEntity.test.tsx
+++ b/plugins/lighthouse/src/hooks/useWebsiteForEntity.test.tsx
@@ -15,7 +15,7 @@
  */
 import React, { PropsWithChildren } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core-api';
+import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
 import { lighthouseApiRef, WebsiteListResponse } from '../api';
 import { useWebsiteForEntity } from './useWebsiteForEntity';
 import { EntityContext } from '@backstage/plugin-catalog';
diff --git a/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts b/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
index c52e38f473..08d9925b7a 100644
--- a/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
+++ b/plugins/lighthouse/src/hooks/useWebsiteForEntity.ts
@@ -15,7 +15,7 @@
  */
 import { useEntity } from '@backstage/plugin-catalog';
 import { LIGHTHOUSE_WEBSITE_URL_ANNOTATION } from '../../constants';
-import { errorApiRef, useApi } from '@backstage/core-api';
+import { errorApiRef, useApi } from '@backstage/core';
 import { lighthouseApiRef } from '../api';
 import { useAsync } from 'react-use';
 
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 629dec635b..6d6eb4ac5c 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -41,7 +41,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 13025d8e83..e1bcf20114 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-org
 
+## 0.3.3
+
+### Patch Changes
+
+- f573cf368: Fixed - normalizing strings for comparison when ignoring when one is in low case.
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 9db6fff348..90cbf2aa57 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/plugin-catalog": "^0.2.7",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -33,7 +33,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 579db9d9a5..04a137d515 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -125,7 +125,9 @@ export const MembersListCard = ({
       UserEntity
     >).filter(member =>
       member?.relations?.some(
-        r => r.type === RELATION_MEMBER_OF && r.target.name === groupName,
+        r =>
+          r.type === RELATION_MEMBER_OF &&
+          r.target.name.toLowerCase() === groupName.toLowerCase(),
       ),
     );
     return groupMembersList;
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 1db99822a2..6bfcf86a89 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -44,7 +44,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json
index 56451b7958..955092c2ee 100644
--- a/plugins/register-component/package.json
+++ b/plugins/register-component/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.9",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -45,7 +45,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 37c9cec4c0..e7bfd4f379 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.7",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -47,7 +47,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index ee54a5c794..80330bbce3 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.4.1
+
+### Patch Changes
+
+- 94fdf4955: Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version
+- cc068c0d6: Bump the gitbeaker dependencies to 28.x.
+
+  To update your own installation, go through the `package.json` files of all of
+  your packages, and ensure that all dependencies on `@gitbeaker/node` or
+  `@gitbeaker/core` are at version `^28.0.2`. Then run `yarn install` at the root
+  of your repo.
+
+- 711ba55a2: Export all preparers and publishers properly
+- Updated dependencies [466354aaa]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/integration@0.2.0
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index c2cef2f73e..134f63f96a 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,13 +29,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.4.2",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@backstage/integration": "^0.1.5",
-    "@gitbeaker/core": "^25.2.0",
-    "@gitbeaker/node": "^25.2.0",
-    "@octokit/rest": "^18.0.0",
+    "@backstage/integration": "^0.2.0",
+    "@gitbeaker/core": "^28.0.2",
+    "@gitbeaker/node": "^28.0.2",
+    "@octokit/rest": "^18.0.12",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "azure-devops-node-api": "^10.1.1",
@@ -58,9 +58,8 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/test-utils": "^0.1.5",
-    "@octokit/types": "^5.4.1",
     "@types/fs-extra": "^9.0.1",
     "@types/git-url-parse": "^9.0.0",
     "@types/supertest": "^2.0.8",
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
index 22f1cd3172..2487076605 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
@@ -17,15 +17,10 @@
 jest.mock('@octokit/rest');
 jest.mock('./helpers');
 
-import { Octokit } from '@octokit/rest';
-import {
-  OctokitResponse,
-  ReposCreateInOrgResponseData,
-  UsersGetByUsernameResponseData,
-} from '@octokit/types';
+import { getVoidLogger } from '@backstage/backend-common';
+import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
 import { GithubPublisher } from './github';
 import { initRepoAndPush } from './helpers';
-import { getVoidLogger } from '@backstage/backend-common';
 
 const { mockGithubClient } = require('@octokit/rest') as {
   mockGithubClient: {
@@ -54,12 +49,12 @@ describe('GitHub Publisher', () => {
           data: {
             clone_url: 'https://github.com/backstage/backstage.git',
           },
-        } as OctokitResponse<ReposCreateInOrgResponseData>);
+        } as RestEndpointMethodTypes['repos']['createInOrg']['response']);
         mockGithubClient.users.getByUsername.mockResolvedValue({
           data: {
             type: 'Organization',
           },
-        } as OctokitResponse<UsersGetByUsernameResponseData>);
+        } as RestEndpointMethodTypes['users']['getByUsername']['response']);
 
         const result = await publisher.publish({
           values: {
@@ -104,12 +99,12 @@ describe('GitHub Publisher', () => {
           data: {
             clone_url: 'https://github.com/backstage/backstage.git',
           },
-        } as OctokitResponse<ReposCreateInOrgResponseData>);
+        } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']);
         mockGithubClient.users.getByUsername.mockResolvedValue({
           data: {
             type: 'User',
           },
-        } as OctokitResponse<UsersGetByUsernameResponseData>);
+        } as RestEndpointMethodTypes['users']['getByUsername']['response']);
 
         const result = await publisher.publish({
           values: {
@@ -148,12 +143,12 @@ describe('GitHub Publisher', () => {
         data: {
           clone_url: 'https://github.com/backstage/backstage.git',
         },
-      } as OctokitResponse<ReposCreateInOrgResponseData>);
+      } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']);
       mockGithubClient.users.getByUsername.mockResolvedValue({
         data: {
           type: 'User',
         },
-      } as OctokitResponse<UsersGetByUsernameResponseData>);
+      } as RestEndpointMethodTypes['users']['getByUsername']['response']);
 
       const result = await publisher.publish({
         values: {
@@ -205,12 +200,12 @@ describe('GitHub Publisher', () => {
         data: {
           clone_url: 'https://github.com/backstage/backstage.git',
         },
-      } as OctokitResponse<ReposCreateInOrgResponseData>);
+      } as RestEndpointMethodTypes['repos']['createInOrg']['response']);
       mockGithubClient.users.getByUsername.mockResolvedValue({
         data: {
           type: 'Organization',
         },
-      } as OctokitResponse<UsersGetByUsernameResponseData>);
+      } as RestEndpointMethodTypes['users']['getByUsername']['response']);
 
       const result = await publisher.publish({
         values: {
@@ -254,12 +249,12 @@ describe('GitHub Publisher', () => {
         data: {
           clone_url: 'https://github.com/backstage/backstage.git',
         },
-      } as OctokitResponse<ReposCreateInOrgResponseData>);
+      } as RestEndpointMethodTypes['repos']['createForAuthenticatedUser']['response']);
       mockGithubClient.users.getByUsername.mockResolvedValue({
         data: {
           type: 'User',
         },
-      } as OctokitResponse<UsersGetByUsernameResponseData>);
+      } as RestEndpointMethodTypes['users']['getByUsername']['response']);
 
       const result = await publisher.publish({
         values: {
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 0d6c1bdb37..655b7f324c 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.10",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -50,7 +50,7 @@
     "swr": "^0.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/search/package.json b/plugins/search/package.json
index aae095dafe..eb9512e52c 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -29,7 +29,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.10",
     "@backstage/catalog-model": "^0.6.0",
     "@backstage/theme": "^0.2.2",
@@ -43,7 +43,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 6a1ef07436..5bf8fe1045 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/plugin-catalog": "^0.2.10",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
@@ -46,7 +46,7 @@
     "timeago.js": "^4.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 8ca178f9fe..78c6343685 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -46,7 +46,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 326b0fe732..6e0663e159 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -43,7 +43,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index d83ff92fd4..9993456436 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-techdocs-backend
 
+## 0.5.3
+
+### Patch Changes
+
+- 68ad5af51: Improve techdocs-common Generator API for it to be used by techdocs-cli. TechDocs generator.run function now takes
+  an input AND an output directory. Most probably you use techdocs-common via plugin-techdocs-backend, and so there
+  is no breaking change for you.
+  But if you use techdocs-common separately, you need to create an output directory and pass into the generator.
+- cb7af51e7: If using Url Reader, cache downloaded source files for 30 minutes.
+- Updated dependencies [68ad5af51]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [371f67ecd]
+- Updated dependencies [f1e74777a]
+- Updated dependencies [dbe4450c3]
+- Updated dependencies [5826d0973]
+- Updated dependencies [b3b9445df]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/techdocs-common@0.3.3
+  - @backstage/catalog-model@0.6.1
+  - @backstage/backend-common@0.4.3
+
 ## 0.5.2
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/examples/documented-component/documented-component.yaml b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
similarity index 61%
rename from plugins/techdocs-backend/examples/documented-component/documented-component.yaml
rename to plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
index 800116344f..d609866f9b 100644
--- a/plugins/techdocs-backend/examples/documented-component/documented-component.yaml
+++ b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
@@ -4,7 +4,7 @@ metadata:
   name: documented-component
   description: A Service with TechDocs documentation
   annotations:
-    backstage.io/techdocs-ref: 'github:https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component'
+    backstage.io/techdocs-ref: 'url:https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend/examples/documented-component'
 spec:
   type: service
   lifecycle: experimental
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 6b0aeec177..7c756641e2 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.4.2",
-    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/backend-common": "^0.4.3",
+    "@backstage/catalog-model": "^0.6.1",
     "@backstage/config": "^0.1.2",
-    "@backstage/techdocs-common": "^0.3.2",
+    "@backstage/techdocs-common": "^0.3.3",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
@@ -45,7 +45,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/techdocs-backend/src/DocsBuilder/builder.ts b/plugins/techdocs-backend/src/DocsBuilder/builder.ts
index 3d40f0a870..33d3120c47 100644
--- a/plugins/techdocs-backend/src/DocsBuilder/builder.ts
+++ b/plugins/techdocs-backend/src/DocsBuilder/builder.ts
@@ -144,6 +144,18 @@ export class DocsBuilder {
       }
     }
 
+    // Cache downloaded source files for 30 minutes.
+    // TODO: When urlReader/readTree supports some way to get latest commit timestamp,
+    // it should be used to invalidate cache.
+    if (type === 'url') {
+      const builtAt = buildMetadataStorage.getTimestamp();
+      const now = Date.now();
+
+      if (builtAt > now - 1800000) {
+        return true;
+      }
+    }
+
     this.logger.debug(
       `Docs for entity ${getEntityId(this.entity)} was outdated.`,
     );
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 8bd79e4139..ee8860da46 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-techdocs
 
+## 0.5.3
+
+### Patch Changes
+
+- dbe4450c3: Google Cloud authentication in TechDocs has been improved.
+
+  1. `techdocs.publisher.googleGcs.credentials` is now optional. If it is missing, `GOOGLE_APPLICATION_CREDENTIALS`
+     environment variable (and some other methods) will be used to authenticate.
+     Read more here https://cloud.google.com/docs/authentication/production
+
+  2. `techdocs.publisher.googleGcs.projectId` is no longer used. You can remove it from your `app-config.yaml`.
+
+- a6f9dca0d: Remove dependency on `@backstage/core-api`. No plugin should ever depend on that package; it's an internal concern whose important bits are re-exported by `@backstage/core` which is the public facing dependency to use.
+- b3b9445df: AWS S3 authentication in TechDocs has been improved.
+
+  1. `techdocs.publisher.awsS3.bucketName` is now the only required config. `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are optional.
+
+  2. If `techdocs.publisher.awsS3.credentials` and `techdocs.publisher.awsS3.region` are missing, the AWS environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` will be used. There are more better ways of setting up AWS authentication. Read the guide at https://backstage.io/docs/features/techdocs/using-cloud-storage
+
+- e5d12f705: Use `history.pushState` for hash link navigation.
+- Updated dependencies [68ad5af51]
+- Updated dependencies [f3b064e1c]
+- Updated dependencies [371f67ecd]
+- Updated dependencies [f1e74777a]
+- Updated dependencies [dbe4450c3]
+- Updated dependencies [c00488983]
+- Updated dependencies [265a7ab30]
+- Updated dependencies [5826d0973]
+- Updated dependencies [b3b9445df]
+- Updated dependencies [abbee6fff]
+- Updated dependencies [147fadcb9]
+  - @backstage/techdocs-common@0.3.3
+  - @backstage/catalog-model@0.6.1
+  - @backstage/plugin-catalog@0.2.11
+  - @backstage/core@0.4.4
+
 ## 0.5.2
 
 ### Patch Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 955b0f798c..fb26087790 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,13 +31,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.6.0",
-    "@backstage/core": "^0.4.3",
-    "@backstage/core-api": "^0.2.8",
-    "@backstage/plugin-catalog": "^0.2.9",
+    "@backstage/catalog-model": "^0.6.1",
+    "@backstage/core": "^0.4.4",
+    "@backstage/plugin-catalog": "^0.2.11",
     "@backstage/test-utils": "^0.1.6",
     "@backstage/theme": "^0.2.2",
-    "@backstage/techdocs-common": "^0.3.1",
+    "@backstage/techdocs-common": "^0.3.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -50,7 +49,7 @@
     "sanitize-html": "^1.27.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/techdocs/src/reader/components/Reader.tsx b/plugins/techdocs/src/reader/components/Reader.tsx
index fb49b90096..1264e2b6eb 100644
--- a/plugins/techdocs/src/reader/components/Reader.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.tsx
@@ -115,7 +115,15 @@ export const Reader = ({ entityId, onReady }: Props) => {
         baseUrl: window.location.origin,
         onClick: (_: MouseEvent, url: string) => {
           const parsedUrl = new URL(url);
-          navigate(`${parsedUrl.pathname}${parsedUrl.hash}`);
+          if (parsedUrl.hash) {
+            history.pushState(
+              null,
+              '',
+              `${parsedUrl.pathname}${parsedUrl.hash}`,
+            );
+          } else {
+            navigate(parsedUrl.pathname);
+          }
 
           shadowRoot?.querySelector(parsedUrl.hash)?.scrollIntoView();
         },
diff --git a/plugins/techdocs/src/reader/components/TechDocsHome.test.tsx b/plugins/techdocs/src/reader/components/TechDocsHome.test.tsx
index 0924b90fc1..4979f027a6 100644
--- a/plugins/techdocs/src/reader/components/TechDocsHome.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsHome.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ApiRegistry } from '@backstage/core-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
index c05c0488ff..bc84f792a7 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
@@ -17,7 +17,7 @@ import React from 'react';
 import { TechDocsPage } from './TechDocsPage';
 import { render, act } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
-import { ApiRegistry, ApiProvider } from '@backstage/core-api';
+import { ApiRegistry, ApiProvider } from '@backstage/core';
 import {
   techdocsApiRef,
   TechDocsApi,
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 38b26dd94c..33b1d1aa46 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -41,7 +41,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index d215028960..7ac7dd43b8 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.4.3",
+    "@backstage/core": "^0.4.4",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -41,7 +41,7 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.5",
+    "@backstage/cli": "^0.4.6",
     "@backstage/dev-utils": "^0.1.7",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/scripts/verify-links.js b/scripts/verify-links.js
index 75e7a8c1d0..5ad14ead4d 100755
--- a/scripts/verify-links.js
+++ b/scripts/verify-links.js
@@ -18,8 +18,27 @@
 /* eslint-disable import/no-extraneous-dependencies */
 
 const { resolve: resolvePath, join: joinPath, dirname } = require('path');
-const fs = require('fs-extra');
-const recursive = require('recursive-readdir');
+const fs = require('fs').promises;
+const { existsSync } = require('fs');
+
+const IGNORED_DIRS = ['node_modules', 'dist', 'bin', '.git'];
+
+async function listFiles(dir) {
+  const files = await fs.readdir(dir);
+  const paths = await Promise.all(
+    files
+      .filter(file => !IGNORED_DIRS.includes(file))
+      .map(async file => {
+        const path = joinPath(dir, file);
+
+        if ((await fs.stat(path)).isDirectory()) {
+          return listFiles(path);
+        }
+        return path;
+      }),
+  );
+  return paths.flat();
+}
 
 const projectRoot = resolvePath(__dirname, '..');
 
@@ -65,7 +84,7 @@ async function verifyUrl(basePath, absUrl, docPages) {
     }
 
     const staticPath = resolvePath(projectRoot, 'microsite/static', `.${url}`);
-    if (await fs.pathExists(staticPath)) {
+    if (existsSync(staticPath)) {
       return undefined;
     }
 
@@ -82,8 +101,7 @@ async function verifyUrl(basePath, absUrl, docPages) {
     return { url, basePath, problem: 'out-of-docs' };
   }
 
-  const exists = await fs.pathExists(path);
-  if (!exists) {
+  if (!existsSync(path)) {
     return { url, basePath, problem: 'missing' };
   }
 
@@ -110,7 +128,7 @@ async function verifyFile(filePath, docPages) {
 // It is used to validate microsite links from outside /docs/, as those
 // are not transformed from the markdown file representation by docusaurus.
 async function findExternalDocsLinks(dir) {
-  const allFiles = await recursive(dir);
+  const allFiles = await listFiles(dir);
   const mdFiles = allFiles.filter(p => p.endsWith('.md'));
 
   const paths = new Map();
@@ -138,14 +156,15 @@ async function findExternalDocsLinks(dir) {
 async function main() {
   process.chdir(projectRoot);
 
-  const files = await recursive('.', ['node_modules', 'dist', 'bin']);
+  const files = await listFiles('.');
   const mdFiles = files.filter(f => f.endsWith('.md'));
   const badUrls = [];
 
   const docPages = await findExternalDocsLinks('docs');
+  const docPageSet = new Set(docPages.values());
 
   for (const mdFile of mdFiles) {
-    const badFileUrls = await verifyFile(mdFile, new Set(docPages.values()));
+    const badFileUrls = await verifyFile(mdFile, docPageSet);
     badUrls.push(...badFileUrls);
   }
 
diff --git a/yarn.lock b/yarn.lock
index 2d2b5b7f7e..71fb15d9dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -879,21 +879,20 @@
   dependencies:
     tslib "^1.8.0"
 
-"@azure/msal-common@^1.6.2":
-  version "1.6.2"
-  resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-1.6.2.tgz#91f3732866d727e20f1e142e6e88a981268fbff2"
-  integrity sha512-GShzp1q7Ld8SwYiDEjQZ9PmFOY4x+2stE86maiguylE9/d/c2muqKjc8aepmEqyjbV7o/omDvEf2Sr9QcIqkSA==
+"@azure/msal-common@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/@azure/msal-common/-/msal-common-2.1.0.tgz#a4bc17e254d6ec524016f13267947dd4ff4a624d"
+  integrity sha512-Y1Id+jG59S3eY2ZQQtUA/lxwbRcgjcWaiib9YX+SwV3zeRauKfEiZT7l3z+lwV+T+Sst20F6l1mJsfQcfE7CEQ==
   dependencies:
     debug "^4.1.1"
 
-"@azure/msal-node@^1.0.0-alpha.8":
-  version "1.0.0-alpha.12"
-  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-alpha.12.tgz#09d8d52f5cea90b133c3d48fe4ec477693040c91"
-  integrity sha512-uGLOJRWiEhfJIrTv/lwdm4RxQFm++00h83zNgDn0O3NkXlzAoCCq9QFYW84PjMR/Q2PUvVy7uW+6yKL/Nq3gBA==
+"@azure/msal-node@^1.0.0-beta.3":
+  version "1.0.0-beta.3"
+  resolved "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.3.tgz#c84c7948028b39e48b901f5fac35bdedcbc8772e"
+  integrity sha512-/KfYRfrsOIrZONvo/0Vi5umuqbPBtCWNtmRvkse64uI0C4CP/W4WXwRD42VMws/8LtKvr1I5rYlYgFzt5zDz/A==
   dependencies:
-    "@azure/msal-common" "^1.6.2"
-    axios "^0.19.2"
-    debug "^4.1.1"
+    "@azure/msal-common" "^2.1.0"
+    axios "^0.21.1"
     jsonwebtoken "^8.5.1"
     uuid "^8.3.0"
 
@@ -2436,9 +2435,7 @@
     to-fast-properties "^2.0.0"
 
 "@backstage/catalog-model@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@backstage/catalog-model/-/catalog-model-0.2.0.tgz#e3fe2a4ddeb6a9b6ec480c80cb2b9c39cb245576"
-  integrity sha512-Y1ocdRpBlxK/VrJQjHlQd0bgADECd1B2NRjwd8ss46ibT5hwLvMOfD80+Fa7oPLu0ktJrH4lq0pNIIJIml48zA==
+  version "0.6.1"
   dependencies:
     "@backstage/config" "^0.1.1"
     "@types/json-schema" "^7.0.5"
@@ -2449,9 +2446,7 @@
     yup "^0.29.3"
 
 "@backstage/catalog-model@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/@backstage/catalog-model/-/catalog-model-0.3.1.tgz#45d08e2f333c9c566b2bf2629fd707fe989bb404"
-  integrity sha512-9XhV7c4rmVW+Yzj2PiwTQ7DsegWGB3C4ELsDRExuEVZONdqNcC02cyJtrt3fT5F31ZS3tHkB9bMUymFOBLqUSA==
+  version "0.6.1"
   dependencies:
     "@backstage/config" "^0.1.1"
     "@types/json-schema" "^7.0.5"
@@ -2462,9 +2457,7 @@
     yup "^0.29.3"
 
 "@backstage/core@^0.3.0":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@backstage/core/-/core-0.3.2.tgz#a8209126d5076cf4a8b9bd632fe4e5e2edb62916"
-  integrity sha512-i5d+Wh8js4qEWoAsPY5L7HVSWpumr1OhfF2dUCGYdyW6AMqVJPca6+n6zp1Rg2CO+J9norp44XAVVCbyhtUpig==
+  version "0.4.4"
   dependencies:
     "@backstage/config" "^0.1.1"
     "@backstage/core-api" "^0.2.1"
@@ -2968,30 +2961,30 @@
   dependencies:
     yaml-ast-parser "0.0.43"
 
-"@gitbeaker/core@^25.2.0":
-  version "25.6.0"
-  resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-25.6.0.tgz#97d5ccc5d61bab6b678bec280036d594d275931e"
-  integrity sha512-+CohJNsbZiPl7jPgw7PHt5t0JIIV9NngObOskY1Ww8jef7SqaKpz0NsbSDawuWFBdmXApMpK81AEfASKtVI+cw==
+"@gitbeaker/core@^28.0.2":
+  version "28.0.2"
+  resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-28.0.2.tgz#5c2cbe27a20426a96d9511642153ead18ff88877"
+  integrity sha512-H+0ChYSxLh+EVNzmOguHaJMR7xB9FlVZGi89JQ7BJ2meq0h1TQl+QaGqTyTNM4GYhn7cYrl7ebGoU0yrnYUWSg==
   dependencies:
-    "@gitbeaker/requester-utils" "^25.6.0"
+    "@gitbeaker/requester-utils" "^28.0.2"
     form-data "^3.0.0"
     li "^1.3.0"
     xcase "^2.0.1"
 
-"@gitbeaker/node@^25.2.0":
-  version "25.2.0"
-  resolved "https://registry.npmjs.org/@gitbeaker/node/-/node-25.2.0.tgz#cc91e83328ec32de0b1a0dac23accd2385734a66"
-  integrity sha512-FWchXYJ5agn0ptAQxtkkSKSg1ObbP2xfMzHLECxINFRBHYhg0ms8Fp8Qb+71pxJz7IMlvajyEtZaPfHBmyuh9Q==
+"@gitbeaker/node@^28.0.2":
+  version "28.0.2"
+  resolved "https://registry.npmjs.org/@gitbeaker/node/-/node-28.0.2.tgz#ead4eb9e1b4400d3a6fe9769b50e43e84fc99747"
+  integrity sha512-FCILxXiRep3PUpe/P2+Ak1KdwzIz3azxf1OY8Jb72gKjNNTgCi4ByFCIpHkvbFZlr7kDKTtcPyEN6oA6qnrCdQ==
   dependencies:
-    "@gitbeaker/core" "^25.2.0"
-    "@gitbeaker/requester-utils" "^25.2.0"
+    "@gitbeaker/core" "^28.0.2"
+    "@gitbeaker/requester-utils" "^28.0.2"
     got "^11.7.0"
     xcase "^2.0.1"
 
-"@gitbeaker/requester-utils@^25.2.0", "@gitbeaker/requester-utils@^25.6.0":
-  version "25.6.0"
-  resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-25.6.0.tgz#001a432a48460bb5196a02ed71763eb707a1a01e"
-  integrity sha512-jD8cHbAZPR6+cB3HiukQxcqIKF5VkHtqg2m+Ns6ROE1pb0oRn10D/a9J1lZOXC9Jz2tQOBMWfHlplbmFFdB6Og==
+"@gitbeaker/requester-utils@^28.0.2":
+  version "28.0.2"
+  resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-28.0.2.tgz#3c1bf97e6b73053ef3c38a2871cbc8e1a2e7501a"
+  integrity sha512-S851vQi0x9Sg5Tx0BcwzkG6OTIG0X4qYTBaA9kPM2sEKg2OOsd8X0HRhj/TbFGr/YVz+3Ubu7oueeWSyr5jvfQ==
   dependencies:
     form-data "^3.0.0"
     query-string "^6.13.3"
@@ -3773,10 +3766,10 @@
   resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@kubernetes/client-node@^0.12.1":
-  version "0.12.2"
-  resolved "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.12.2.tgz#8728684bd57d1cbcbe14fe742e79be7021403eea"
-  integrity sha512-J0UwyFl1Iv/IZ6WMP7LaizBEoKPnqwtc8tIO2q/X+EuDT7eGpPPAMHXSEOC/EI9JGIf0FaJEcDHhB/Dio/mKhw==
+"@kubernetes/client-node@^0.13.2":
+  version "0.13.2"
+  resolved "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.13.2.tgz#881eb407afbd5b499e5daf898ffcc40f839709e7"
+  integrity sha512-ufvGfjBXuy5LbZTJZ8bd1eRVgWUd9rRDCryMWNfxb4372Q60R1oG8qy7svUB9NqBmwFgKHuaXkrfq3rFFbGrew==
   dependencies:
     "@types/js-yaml" "^3.12.1"
     "@types/node" "^10.12.0"
@@ -4709,6 +4702,13 @@
   dependencies:
     "@octokit/types" "^2.0.0"
 
+"@octokit/auth-token@^2.4.4":
+  version "2.4.4"
+  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56"
+  integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==
+  dependencies:
+    "@octokit/types" "^6.0.0"
+
 "@octokit/core@^3.0.0":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@octokit/core/-/core-3.1.0.tgz#9c3c9b23f7504668cfa057f143ccbf0c645a0ac9"
@@ -4721,6 +4721,18 @@
     before-after-hook "^2.1.0"
     universal-user-agent "^5.0.0"
 
+"@octokit/core@^3.2.3":
+  version "3.2.4"
+  resolved "https://registry.npmjs.org/@octokit/core/-/core-3.2.4.tgz#5791256057a962eca972e31818f02454897fd106"
+  integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg==
+  dependencies:
+    "@octokit/auth-token" "^2.4.4"
+    "@octokit/graphql" "^4.5.8"
+    "@octokit/request" "^5.4.12"
+    "@octokit/types" "^6.0.3"
+    before-after-hook "^2.1.0"
+    universal-user-agent "^6.0.0"
+
 "@octokit/endpoint@^6.0.1":
   version "6.0.3"
   resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz#dd09b599662d7e1b66374a177ab620d8cdf73487"
@@ -4739,19 +4751,19 @@
     "@octokit/types" "^5.0.0"
     universal-user-agent "^5.0.0"
 
-"@octokit/graphql@^4.5.6":
-  version "4.5.6"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.6.tgz#708143ba15cf7c1879ed6188266e7f270be805d4"
-  integrity sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg==
+"@octokit/graphql@^4.5.8":
+  version "4.5.8"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b"
+  integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA==
   dependencies:
     "@octokit/request" "^5.3.0"
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.0"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz#7453d8281ce66b8ed1607f7ac7d751c3baffd2cc"
-  integrity sha512-9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q==
+"@octokit/openapi-types@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.2.0.tgz#123e0438a0bc718ccdac3b5a2e69b3dd00daa85b"
+  integrity sha512-274lNUDonw10kT8wHg8fCcUc1ZjZHbWv0/TbAwb0ojhBQqZYc1cQ/4yqTVTtPMDeZ//g7xVEYe/s3vURkRghPg==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
@@ -4772,11 +4784,23 @@
   dependencies:
     "@octokit/types" "^5.0.0"
 
+"@octokit/plugin-paginate-rest@^2.6.2":
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.7.0.tgz#6bb7b043c246e0654119a6ec4e72a172c9e2c7f3"
+  integrity sha512-+zARyncLjt9b0FjqPAbJo4ss7HOlBi1nprq+cPlw5vu2+qjy7WvlXhtXFdRHQbSL1Pt+bfAKaLADEkkvg8sP8w==
+  dependencies:
+    "@octokit/types" "^6.0.1"
+
 "@octokit/plugin-request-log@^1.0.0":
   version "1.0.0"
   resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e"
   integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==
 
+"@octokit/plugin-request-log@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
+  integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
+
 "@octokit/plugin-rest-endpoint-methods@2.4.0":
   version "2.4.0"
   resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e"
@@ -4793,12 +4817,12 @@
     "@octokit/types" "^5.4.1"
     deprecation "^2.3.1"
 
-"@octokit/plugin-rest-endpoint-methods@4.2.0":
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.0.tgz#c5a0691b3aba5d8b4ef5dffd6af3649608f167ba"
-  integrity sha512-1/qn1q1C1hGz6W/iEDm9DoyNoG/xdFDt78E3eZ5hHeUfJTLJgyAMdj9chL/cNBHjcjd+FH5aO1x0VCqR2RE0mw==
+"@octokit/plugin-rest-endpoint-methods@4.4.1":
+  version "4.4.1"
+  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.4.1.tgz#105cf93255432155de078c9efc33bd4e14d1cd63"
+  integrity sha512-+v5PcvrUcDeFXf8hv1gnNvNLdm4C0+2EiuWt9EatjjUmfriM1pTMM+r4j1lLHxeBQ9bVDmbywb11e3KjuavieA==
   dependencies:
-    "@octokit/types" "^5.5.0"
+    "@octokit/types" "^6.1.0"
     deprecation "^2.3.1"
 
 "@octokit/request-error@^1.0.2":
@@ -4833,6 +4857,20 @@
     once "^1.4.0"
     universal-user-agent "^5.0.0"
 
+"@octokit/request@^5.4.12":
+  version "5.4.12"
+  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc"
+  integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.0.0"
+    "@octokit/types" "^6.0.3"
+    deprecation "^2.0.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    once "^1.4.0"
+    universal-user-agent "^6.0.0"
+
 "@octokit/rest@^16.28.4":
   version "16.43.1"
   resolved "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b"
@@ -4865,15 +4903,15 @@
     "@octokit/plugin-request-log" "^1.0.0"
     "@octokit/plugin-rest-endpoint-methods" "4.1.4"
 
-"@octokit/rest@^18.0.6":
-  version "18.0.6"
-  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.0.6.tgz#76c274f1a68f40741a131768ef483f041e7b98b6"
-  integrity sha512-ES4lZBKPJMX/yUoQjAZiyFjei9pJ4lTTfb9k7OtYoUzKPDLl/M8jiHqt6qeSauyU4eZGLw0sgP1WiQl9FYeM5w==
+"@octokit/rest@^18.0.12":
+  version "18.0.12"
+  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.0.12.tgz#278bd41358c56d87c201e787e8adc0cac132503a"
+  integrity sha512-hNRCZfKPpeaIjOVuNJzkEL6zacfZlBPV8vw8ReNeyUkVvbuCvvrrx8K8Gw2eyHHsmd4dPlAxIXIZ9oHhJfkJpw==
   dependencies:
-    "@octokit/core" "^3.0.0"
-    "@octokit/plugin-paginate-rest" "^2.2.0"
-    "@octokit/plugin-request-log" "^1.0.0"
-    "@octokit/plugin-rest-endpoint-methods" "4.2.0"
+    "@octokit/core" "^3.2.3"
+    "@octokit/plugin-paginate-rest" "^2.6.2"
+    "@octokit/plugin-request-log" "^1.0.2"
+    "@octokit/plugin-rest-endpoint-methods" "4.4.1"
 
 "@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
   version "2.5.0"
@@ -4896,11 +4934,12 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@octokit/types@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
-  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
+"@octokit/types@^6.0.0", "@octokit/types@^6.0.1", "@octokit/types@^6.0.3", "@octokit/types@^6.1.0":
+  version "6.2.1"
+  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.2.1.tgz#7f881fe44475ab1825776a4a59ca1ae082ed1043"
+  integrity sha512-jHs9OECOiZxuEzxMZcXmqrEO8GYraHF+UzNVH2ACYh8e/Y7YoT+hUf9ldvVd6zIvWv4p3NdxbQ0xx3ku5BnSiA==
   dependencies:
+    "@octokit/openapi-types" "^2.2.0"
     "@types/node" ">= 8"
 
 "@open-draft/until@^1.0.3":
@@ -6474,13 +6513,6 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/helmet@^0.0.48":
-  version "0.0.48"
-  resolved "https://registry.npmjs.org/@types/helmet/-/helmet-0.0.48.tgz#e754399d2f4672ba63962e8490efd3edd31d9799"
-  integrity sha512-C7MpnvSDrunS1q2Oy1VWCY7CDWHozqSnM8P4tFeRTuzwqni+PYOjEredwcqWG+kLpYcgLsgcY3orHB54gbx2Jw==
-  dependencies:
-    "@types/express" "*"
-
 "@types/history@*":
   version "4.7.5"
   resolved "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz#527d20ef68571a4af02ed74350164e7a67544860"
@@ -6877,6 +6909,14 @@
     "@types/express" "*"
     "@types/passport" "*"
 
+"@types/passport-strategy@^0.2.35":
+  version "0.2.35"
+  resolved "https://registry.npmjs.org/@types/passport-strategy/-/passport-strategy-0.2.35.tgz#e52f5212279ea73f02d9b06af67efe9cefce2d0c"
+  integrity sha512-o5D19Jy2XPFoX2rKApykY15et3Apgax00RRLf0RUotPDUsYrQa7x4howLYr9El2mlUApHmCMv5CZ1IXqKFQ2+g==
+  dependencies:
+    "@types/express" "*"
+    "@types/passport" "*"
+
 "@types/passport@*", "@types/passport@^1.0.3":
   version "1.0.4"
   resolved "https://registry.npmjs.org/@types/passport/-/passport-1.0.4.tgz#1b35c4e197560d3974fa5f71711b6e9cce0711f0"
@@ -7336,6 +7376,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/xml2js@^0.4.7":
+  version "0.4.7"
+  resolved "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.7.tgz#cd5b6c67bbec741ac625718a76e6cb99bc34365e"
+  integrity sha512-f5VOKSMEE0O+/L54FHwA/a7vcx9mHeSDM71844yHCOhh8Cin2xQa0UFw0b7Vc5hoZ3Ih6ZHaDobjfLih4tWPNw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -8567,12 +8614,12 @@ axobject-query@^2.0.2:
   integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==
 
 azure-devops-node-api@^10.1.1:
-  version "10.1.1"
-  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.1.1.tgz#9016d8935316fff260f5f8fafd81d0caff90a19e"
-  integrity sha512-P4Hyrh/+Nzc2KXQk73z72/GsenSWIH5o8uiyELqykJYs9TWTVCxVwghoR7lPeiY6QVoXkq2S2KtvAgi5fyjl9w==
+  version "10.2.1"
+  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.1.tgz#835080164f8c30cec6506c47198b044c053f1f36"
+  integrity sha512-XuSiUaYpk0tQpd9fD8qfRa5y1IdavupKNVmwxy0w/RhmxG2Wl8uAYnNJchUoWd3Rn9On0mYTCCZSn+UlYdYFSg==
   dependencies:
     tunnel "0.0.6"
-    typed-rest-client "^1.7.3"
+    typed-rest-client "^1.8.0"
     underscore "1.8.3"
 
 babel-code-frame@^6.22.0:
@@ -14309,23 +14356,6 @@ got@^11.5.2:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-got@^11.6.2:
-  version "11.7.0"
-  resolved "https://registry.npmjs.org/got/-/got-11.7.0.tgz#a386360305571a74548872e674932b4ef70d3b24"
-  integrity sha512-7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg==
-  dependencies:
-    "@sindresorhus/is" "^3.1.1"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.1"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
 got@^11.7.0, got@^11.8.0:
   version "11.8.0"
   resolved "https://registry.npmjs.org/got/-/got-11.8.0.tgz#be0920c3586b07fd94add3b5b27cb28f49e6545f"
@@ -15837,6 +15867,11 @@ is-plain-object@^3.0.0:
   dependencies:
     isobject "^4.0.0"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-potential-custom-element-name@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
@@ -19496,21 +19531,7 @@ opencollective-postinstall@^2.0.2:
   resolved "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
   integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
 
-openid-client@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/openid-client/-/openid-client-4.1.1.tgz#3e8a25584c4292e9b9b03e60358f5549fb85197a"
-  integrity sha512-/qch3I3v8UtO0A7wVgyXJJjGX/knR8bv06DQpLuKQqLG5u4AHcgusGuVKPKAcneLZvHKbKovF2+3e2ngXyuudA==
-  dependencies:
-    base64url "^3.0.1"
-    got "^11.6.2"
-    jose "^2.0.2"
-    lru-cache "^6.0.0"
-    make-error "^1.3.6"
-    object-hash "^2.0.1"
-    oidc-token-hash "^5.0.0"
-    p-any "^3.0.0"
-
-openid-client@^4.2.1:
+openid-client@^4.1.1, openid-client@^4.2.1:
   version "4.2.1"
   resolved "https://registry.npmjs.org/openid-client/-/openid-client-4.2.1.tgz#8200c0ab6a3b8e954727dfa790847dc5cb8999c2"
   integrity sha512-07eOcJeMH3ZHNvx5DVMZQmy3vZSTQqKSSunbtM1pXb+k5LBPi5hMum1vJCFReXlo4wuLEqZ/OgbsZvXPhbGRtA==
@@ -20086,17 +20107,16 @@ passport-onelogin-oauth@^0.0.1:
     pkginfo "0.2.x"
     uid2 "0.0.3"
 
-"passport-saml@^1.3.5, <1.4.0":
-  version "1.3.5"
-  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-1.3.5.tgz#747f2c8bb8b9fed41e8cd14586df5aa83e8a8996"
-  integrity sha512-HFamiqgGiMRCbUBm3wx02WYWKb6ojke0WJHrg4QXI8tx35HrTmDiY8MksUXhouJtEkfcRwXjBL2cSEpRQ6+PgQ==
+passport-saml@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-2.0.2.tgz#41c459f0f4c4cf0374b161bf3f9ab008fcacb8fe"
+  integrity sha512-e8rT/nWEY3YalktzZlGXvnj6mLDQD4R+atfStCF4nHCbqK5IUpip+Bj2Wzbm9v5F/KI497k57kNXkHCLfDSVjA==
   dependencies:
     debug "^3.1.0"
     passport-strategy "*"
-    q "^1.5.0"
-    xml-crypto "^1.4.0"
+    xml-crypto "^2.0.0"
     xml-encryption "1.2.1"
-    xml2js "0.4.x"
+    xml2js "^0.4.23"
     xmlbuilder "^11.0.0"
     xmldom "0.1.x"
 
@@ -21268,7 +21288,7 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-q@^1.1.2, q@^1.5.0, q@^1.5.1:
+q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -25033,22 +25053,17 @@ tslib@2.0.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
   integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
 
-tslib@2.0.1, tslib@^2.0.0, tslib@~2.0.0, tslib@~2.0.1:
+tslib@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
   integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.13.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
-
-tslib@^1.8.0:
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1:
+tslib@^2.0.0, tslib@^2.0.1, tslib@~2.0.0, tslib@~2.0.1:
   version "2.0.3"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
   integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
@@ -25156,10 +25171,10 @@ type@^2.0.0:
   resolved "https://registry.npmjs.org/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
   integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
-typed-rest-client@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.7.3.tgz#1beb263b86b14d34596f6127c6172dd5fd652e7b"
-  integrity sha512-CwTpx/TkRHGZoHkJhBcp4X8K3/WtlzSHVQR0OIFnt10j4tgy4ypgq/SrrgVpA1s6tAL49Q6J3R5C0Cgfh2ddqA==
+typed-rest-client@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.0.tgz#3b6c22a7cc31b665ec1e4bedb3482ebe12e2fbe6"
+  integrity sha512-Nu1MrdH6ECrRW5gHoRAdubgCs4oH6q5/J76jsEC8bVDfvVoVPkigukPalhMHPwb7ZvpsZqPptd5zpt/QdtrdBw==
   dependencies:
     qs "^6.9.1"
     tunnel "0.0.6"
@@ -26291,12 +26306,7 @@ ws@^6.0.0, ws@^6.1.2, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.2.3:
-  version "7.3.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
-  integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
-
-ws@^7.3.1:
+ws@^7.2.3, ws@^7.3.1:
   version "7.3.1"
   resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
@@ -26318,10 +26328,10 @@ xml-but-prettier@^1.0.1:
   dependencies:
     repeat-string "^1.5.2"
 
-xml-crypto@^1.4.0:
-  version "1.5.3"
-  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-1.5.3.tgz#a8f500b90f0dfaf0efa3331c345ecb0fff993c34"
-  integrity sha512-uHkmpUtX15xExe5iimPmakAZN+6CqIvjmaJTy4FwqGzaTjrKRBNeqMh8zGEzVNgW0dk6beFYpyQSgqV/J6C5xA==
+xml-crypto@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.0.0.tgz#54cd268ad9d31930afcf7092cbb664258ca9e826"
+  integrity sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==
   dependencies:
     xmldom "0.1.27"
     xpath "0.0.27"
@@ -26341,7 +26351,7 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml2js@0.4.x:
+xml2js@^0.4.23:
   version "0.4.23"
   resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
   integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==