diff --git a/.changeset/empty-games-cheer.md b/.changeset/empty-games-cheer.md
new file mode 100644
index 0000000000..d17e97f752
--- /dev/null
+++ b/.changeset/empty-games-cheer.md
@@ -0,0 +1,22 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-api-docs-module-protoc-gen-doc': patch
+'@backstage/plugin-code-coverage-backend': patch
+'@backstage/plugin-azure-devops-backend': patch
+'@backstage/backend-test-utils': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-azure-sites-backend': patch
+'@backstage/plugin-microsoft-calendar': patch
+'@backstage/plugin-catalog-graph': patch
+'@backstage/plugin-code-coverage': patch
+'@backstage/plugin-adr-backend': patch
+'@backstage/plugin-azure-sites': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-xcmetrics': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-home': patch
+---
+
+Update docs to always use `yarn add --cwd` for app & backend
diff --git a/docs/getting-started/configure-app-with-plugins.md b/docs/getting-started/configure-app-with-plugins.md
index ebe98f9ddc..835da0cd49 100644
--- a/docs/getting-started/configure-app-with-plugins.md
+++ b/docs/getting-started/configure-app-with-plugins.md
@@ -22,7 +22,8 @@ to an entity in the software catalog.
 1. Add the plugin's npm package to the repo:
 
    ```bash
-   yarn workspace app add @backstage/plugin-circleci
+   # From your Backstage root directory
+   yarn add --cwd packages/app @backstage/plugin-circleci
    ```
 
    Note the plugin is added to the `app` package, rather than the root
diff --git a/docs/integrations/aws-s3/discovery.md b/docs/integrations/aws-s3/discovery.md
index 748aeb2392..4a2b953bc9 100644
--- a/docs/integrations/aws-s3/discovery.md
+++ b/docs/integrations/aws-s3/discovery.md
@@ -63,7 +63,7 @@ As this provider is not one of the default providers, you will first need to ins
 the AWS catalog plugin:
 
 ```bash
-# From the Backstage root directory
+# From your Backstage root directory
 yarn add --cwd packages/backend @backstage/plugin-catalog-backend-module-aws
 ```
 
diff --git a/docs/integrations/gerrit/discovery.md b/docs/integrations/gerrit/discovery.md
index 7ed05d2b3b..5d822effb5 100644
--- a/docs/integrations/gerrit/discovery.md
+++ b/docs/integrations/gerrit/discovery.md
@@ -17,7 +17,7 @@ As this provider is not one of the default providers, you will first need to ins
 the Gerrit provider plugin:
 
 ```bash
-# From the Backstage root directory
+# From your Backstage root directory
 yarn add --cwd packages/backend @backstage/plugin-catalog-backend-module-gerrit
 ```
 
diff --git a/docs/integrations/gitlab/discovery.md b/docs/integrations/gitlab/discovery.md
index 51c34b67ac..3d554ce6b2 100644
--- a/docs/integrations/gitlab/discovery.md
+++ b/docs/integrations/gitlab/discovery.md
@@ -36,7 +36,7 @@ As this provider is not one of the default providers, you will first need to ins
 the gitlab catalog plugin:
 
 ```bash
-# From the Backstage root directory
+# From your Backstage root directory
 yarn add --cwd packages/backend @backstage/plugin-catalog-backend-module-gitlab
 ```
 
diff --git a/docs/permissions/getting-started.md b/docs/permissions/getting-started.md
index d2c467ff08..e71601b703 100644
--- a/docs/permissions/getting-started.md
+++ b/docs/permissions/getting-started.md
@@ -47,7 +47,8 @@ The permissions framework uses a new `permission-backend` plugin to accept autho
 1. Add `@backstage/plugin-permission-backend` as a dependency of your Backstage backend:
 
 ```bash
-$ yarn workspace backend add @backstage/plugin-permission-backend
+# From your Backstage root directory
+$ yarn add --cwd packages/backend @backstage/plugin-permission-backend
 ```
 
 2. Add the following to a new file, `packages/backend/src/plugins/permission.ts`. This adds the permission-backend router, and configures it with a policy which allows everything.
diff --git a/docs/permissions/plugin-authors/01-setup.md b/docs/permissions/plugin-authors/01-setup.md
index a38b81e679..c368505849 100644
--- a/docs/permissions/plugin-authors/01-setup.md
+++ b/docs/permissions/plugin-authors/01-setup.md
@@ -39,9 +39,10 @@ The source code is available here:
 
 2.  Add these packages as dependencies for your Backstage app:
 
-    ```
-    $ yarn workspace backend add @internal/plugin-todo-list-backend @internal/plugin-todo-list-common
-    $ yarn workspace app add @internal/plugin-todo-list
+    ```sh
+    # From your Backstage root directory
+    $ yarn add --cwd packages/backend @internal/plugin-todo-list-backend @internal/plugin-todo-list-common
+    $ yarn add --cwd packages/app @internal/plugin-todo-list
     ```
 
 3.  Include the backend and frontend plugin in your application:
diff --git a/docs/plugins/backend-plugin.md b/docs/plugins/backend-plugin.md
index 517779d161..c4414c8e55 100644
--- a/docs/plugins/backend-plugin.md
+++ b/docs/plugins/backend-plugin.md
@@ -66,7 +66,7 @@ To actually attach and run the plugin router, you will make some modifications
 to your backend.
 
 ```bash
-# From the Backstage root directory
+# From your Backstage root directory
 yarn add --cwd packages/backend @internal/plugin-carmen-backend@^0.1.1 # Change this to match the plugin's package.json
 ```
 
diff --git a/docs/tutorials/configuring-plugin-databases.md b/docs/tutorials/configuring-plugin-databases.md
index ed550f1801..34e62c285a 100644
--- a/docs/tutorials/configuring-plugin-databases.md
+++ b/docs/tutorials/configuring-plugin-databases.md
@@ -37,7 +37,7 @@ package. If you intend to use both PostgreSQL and SQLite, you can install
 both of them.
 
 ```bash
-# From the Backstage root directory
+# From your Backstage root directory
 # install pg if you need PostgreSQL
 yarn add --cwd packages/backend pg
 
diff --git a/packages/backend-test-utils/README.md b/packages/backend-test-utils/README.md
index 38756fa5d7..7ccf4e2798 100644
--- a/packages/backend-test-utils/README.md
+++ b/packages/backend-test-utils/README.md
@@ -7,7 +7,7 @@ Test helpers library for Backstage backends.
 Add the library as a `devDependency` to your backend package:
 
 ```sh
-# From the Backstage root directory, go to your backend package, or to a backend plugin
+# From your Backstage root directory, go to your backend package, or to a backend plugin
 cd plugins/my-plugin-backend
 yarn add --dev @backstage/backend-test-utils
 ```
diff --git a/plugins/adr-backend/README.md b/plugins/adr-backend/README.md
index b751a3b56d..29fead7c84 100644
--- a/plugins/adr-backend/README.md
+++ b/plugins/adr-backend/README.md
@@ -19,9 +19,8 @@ Here's how to get the backend up and running:
 1. First we need to add the `@backstage/plugin-adr-backend` package to your backend:
 
 ```sh
-# From the Backstage root directory
-cd packages/backend
-yarn add @backstage/plugin-adr-backend
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-adr-backend
 ```
 
 2. Then we will create a new file named `packages/backend/src/plugins/adr.ts`, and add the
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
index b9a8435a34..3a1137fc39 100644
--- a/plugins/allure/README.md
+++ b/plugins/allure/README.md
@@ -4,16 +4,9 @@ Welcome to the Backstage Allure plugin. This plugin add an entity service page t
 
 ## Install
 
-Run the below command from the `app` package directory.
-
 ```shell
-yarn add @backstage/plugin-allure
-```
-
-alternatively, you can execute below command from the root directory of your Backstage app.
-
-```shell
-yarn workspace app add @backstage/plugin-allure
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-allure
 ```
 
 ## Configure
diff --git a/plugins/analytics-module-ga/README.md b/plugins/analytics-module-ga/README.md
index c2d79aa45d..d6e2642e2b 100644
--- a/plugins/analytics-module-ga/README.md
+++ b/plugins/analytics-module-ga/README.md
@@ -9,7 +9,12 @@ This plugin contains no other functionality.
 ## Installation
 
 1. Install the plugin package in your Backstage app:
-   `cd packages/app && yarn add @backstage/plugin-analytics-module-ga`
+
+```sh
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-analytics-module-ga
+```
+
 2. Wire up the API implementation to your App:
 
 ```tsx
diff --git a/plugins/api-docs-module-protoc-gen-doc/README.md b/plugins/api-docs-module-protoc-gen-doc/README.md
index 4d90cd74c2..a921fafc0b 100644
--- a/plugins/api-docs-module-protoc-gen-doc/README.md
+++ b/plugins/api-docs-module-protoc-gen-doc/README.md
@@ -6,8 +6,9 @@ This package contains ApiDefinitionWidgets for the following projects:
 
 ## Setup
 
-```
-yarn add @backstage/plugin-api-docs-module-protoc-gen-doc
+```sh
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-api-docs-module-protoc-gen-doc
 ```
 
 ## Add the GrpcDocsApiWidget to your apis
diff --git a/plugins/azure-devops-backend/README.md b/plugins/azure-devops-backend/README.md
index 301ae5b2b9..ba2a847c0a 100644
--- a/plugins/azure-devops-backend/README.md
+++ b/plugins/azure-devops-backend/README.md
@@ -30,9 +30,8 @@ Here's how to get the backend up and running:
 1. First we need to add the `@backstage/plugin-azure-devops-backend` package to your backend:
 
    ```sh
-   # From the Backstage root directory
-   cd packages/backend
-   yarn add @backstage/plugin-azure-devops-backend
+   # From your Backstage root directory
+   yarn add --cwd packages/backend @backstage/plugin-azure-devops-backend
    ```
 
 2. Then we will create a new file named `packages/backend/src/plugins/azure-devops.ts`, and add the
diff --git a/plugins/azure-sites-backend/README.md b/plugins/azure-sites-backend/README.md
index 5f19267499..0d44b9a4e4 100644
--- a/plugins/azure-sites-backend/README.md
+++ b/plugins/azure-sites-backend/README.md
@@ -36,7 +36,7 @@ Here's how to get the backend plugin up and running:
 1. First we need to add the `@backstage/plugin-azure-sites-backend` package to your backend:
 
    ```sh
-   # From the Backstage root directory
+   # From your Backstage root directory
    yarn add --cwd packages/backend @backstage/plugin-azure-sites-backend
    ```
 
diff --git a/plugins/azure-sites/README.md b/plugins/azure-sites/README.md
index f240dab140..57bf84ccc5 100644
--- a/plugins/azure-sites/README.md
+++ b/plugins/azure-sites/README.md
@@ -44,10 +44,11 @@ azure.com/microsoft-web-sites: func-testapp
 
 ### Install the component
 
-1. Install the plugin in the `packages/app` directory
+1. Install the plugin
 
 ```sh
-yarn add @backstage/plugin-azure-sites
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-azure-sites
 ```
 
 2. Add widget component to your Backstage instance:
diff --git a/plugins/catalog-backend-module-incremental-ingestion/README.md b/plugins/catalog-backend-module-incremental-ingestion/README.md
index aa23b8dfc1..7fe36eeec7 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/README.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/README.md
@@ -41,7 +41,7 @@ The Incremental Entity Provider backend is designed for data sources that provid
 
 ## Installation
 
-1. Install `@backstage/plugin-catalog-backend-module-incremental-ingestion` with `yarn workspace backend add @backstage/plugin-catalog-backend-module-incremental-ingestion`
+1. Install `@backstage/plugin-catalog-backend-module-incremental-ingestion` with `yarn add --cwd packages/backend @backstage/plugin-catalog-backend-module-incremental-ingestion` from the Backstage root directory.
 2. In your catalog.ts, import `IncrementalCatalogBuilder` from `@backstage/plugin-catalog-backend-module-incremental-ingestion` and instantiate it with `await IncrementalCatalogBuilder.create(env, builder)`. You have to pass `builder` into `IncrementalCatalogBuilder.create` function because `IncrementalCatalogBuilder` will convert an `IncrementalEntityProvider` into an `EntityProvider` and call `builder.addEntityProvider`.
 
 ```ts
diff --git a/plugins/catalog-graph/README.md b/plugins/catalog-graph/README.md
index 33dee92935..f723523716 100644
--- a/plugins/catalog-graph/README.md
+++ b/plugins/catalog-graph/README.md
@@ -24,9 +24,10 @@ The plugin comes with these features:
 
 To use the catalog graph plugin, you have to add some things to your Backstage app:
 
-1. Add a dependency to your `packages/app/package.json`, run:
+1. Add a dependency to your `packages/app/package.json`:
    ```sh
-    yarn add @backstage/plugin-catalog-graph
+   # From your Backstage root directory
+   yarn add --cwd packages/app @backstage/plugin-catalog-graph
    ```
 2. Add the `CatalogGraphPage` to your `packages/app/src/App.tsx`:
 
diff --git a/plugins/code-coverage-backend/README.md b/plugins/code-coverage-backend/README.md
index ae6021b07c..802e538125 100644
--- a/plugins/code-coverage-backend/README.md
+++ b/plugins/code-coverage-backend/README.md
@@ -4,7 +4,10 @@ This is the backend part of the `code-coverage` plugin. It takes care of process
 
 ## Installation
 
-`yarn workspace backend add @backstage/plugin-code-coverage-backend`
+```sh
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-code-coverage-backend
+```
 
 First create a `codecoverage.ts` file here: `packages/backend/src/plugins`. Now add the following as its content:
 
diff --git a/plugins/code-coverage/README.md b/plugins/code-coverage/README.md
index ce793a78d3..d4daa6ec00 100644
--- a/plugins/code-coverage/README.md
+++ b/plugins/code-coverage/README.md
@@ -4,7 +4,10 @@ This is the frontend part of the code-coverage plugin. It displays code coverage
 
 ## Installation
 
-`yarn workspace app add @backstage/plugin-code-coverage`
+```sh
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-code-coverage
+```
 
 Finally you need to import and render the code coverage entity, in `packages/app/src/components/catalog/EntityPage.tsx` add the following:
 
diff --git a/plugins/home/README.md b/plugins/home/README.md
index 0cd307b706..1fdface722 100644
--- a/plugins/home/README.md
+++ b/plugins/home/README.md
@@ -9,7 +9,7 @@ For App Integrators, the system is designed to be composable to give total freed
 If you have a standalone app (you didn't clone this repo), then do
 
 ```bash
-# From the Backstage repository root
+# From your Backstage root directory
 yarn add --cwd packages/app @backstage/plugin-home
 ```
 
diff --git a/plugins/ilert/README.md b/plugins/ilert/README.md
index c704108126..814baea507 100644
--- a/plugins/ilert/README.md
+++ b/plugins/ilert/README.md
@@ -26,7 +26,7 @@ In detail this plugin provides:
 Install the plugin:
 
 ```bash
-# From the Backstage repository root
+# From your Backstage root directory
 yarn add --cwd packages/app @backstage/plugin-ilert
 ```
 
diff --git a/plugins/lighthouse/src/components/Intro/index.tsx b/plugins/lighthouse/src/components/Intro/index.tsx
index 57609476b8..69fcf21cf3 100644
--- a/plugins/lighthouse/src/components/Intro/index.tsx
+++ b/plugins/lighthouse/src/components/Intro/index.tsx
@@ -50,8 +50,8 @@ with the environment variable \`LAS_CORS\` set to \`true\`._
 When you have an instance running that Backstage can hook into, first install the plugin into your app:
 
 \`\`\`sh
-cd packages/app
-yarn add @backstage/plugin-lighthouse
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-lighthouse
 \`\`\`
 
 Modify your app routes in \`App.tsx\` to include the \`LighthousePage\` component exported from the plugin, for example:
diff --git a/plugins/microsoft-calendar/README.md b/plugins/microsoft-calendar/README.md
index 73a66b15f5..219a7cf2dc 100644
--- a/plugins/microsoft-calendar/README.md
+++ b/plugins/microsoft-calendar/README.md
@@ -25,7 +25,7 @@ The following sections will help you set up the Microsoft calendar plugin.
 1. Install the plugin by running this command
 
 ```bash
-# From the Backstage repository root
+# From your Backstage root directory
 yarn add --cwd packages/app @backstage/plugin-microsoft-calendar
 ```
 
diff --git a/plugins/shortcuts/README.md b/plugins/shortcuts/README.md
index d7f8f19aec..cd79901656 100644
--- a/plugins/shortcuts/README.md
+++ b/plugins/shortcuts/README.md
@@ -7,7 +7,8 @@ The shortcuts plugin allows a user to have easy access to pages within a Backsta
 ### Install the package:
 
 ```bash
-yarn add @backstage/plugin-shortcuts
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-shortcuts
 ```
 
 ### Register plugin:
diff --git a/plugins/xcmetrics/README.md b/plugins/xcmetrics/README.md
index a3bb93d2af..7c003722a0 100644
--- a/plugins/xcmetrics/README.md
+++ b/plugins/xcmetrics/README.md
@@ -7,10 +7,9 @@ With this plugin, you can view data from XCMetrics directly in Backstage.
 
 ## Getting started
 
-From `packages/app`:
-
 ```bash
-yarn add @backstage/plugin-xcmetrics
+# From your Backstage root directory
+yarn add --cwd packages/app @backstage/plugin-xcmetrics
 ```
 
 In `packages/app/src/App.tsx`, add the following: