diff --git a/docs/features/software-templates/adding-templates.md b/docs/features/software-templates/adding-templates.md
index 4f7af7c015..1472986c2a 100644
--- a/docs/features/software-templates/adding-templates.md
+++ b/docs/features/software-templates/adding-templates.md
@@ -105,13 +105,6 @@ curl \
 This should then have added the catalog, and also should now be listed under the
 create page at http://localhost:3000/create.
 
-Alternatively, if you want to get setup with some mock templates that are
-already provided, run the following to load those templates:
-
-```
-yarn lerna run mock-data
-```
-
 The `type` field which is chosen in the request to add the `template.yaml` to
 the Service Catalog here, will be come the `PreparerKey` which will be used to
 select the `Preparer` when creating a job.
diff --git a/docs/getting-started/running-backstage-locally.md b/docs/getting-started/running-backstage-locally.md
index 04be6499c6..8b19910c8f 100644
--- a/docs/getting-started/running-backstage-locally.md
+++ b/docs/getting-started/running-backstage-locally.md
@@ -48,12 +48,10 @@ yarn start
 
 That starts up a backend instance on port 7000.
 
-In the other window, we will first populate the catalog with some nice mock data
-to look at, and then launch the frontend. These commands are run from the
-project root, not inside the backend directory.
+In the other window, we will then launch the frontend. This command is run from
+the project root, not inside the backend directory.
 
 ```bash
-yarn lerna run mock-data
 yarn start
 ```
 
diff --git a/microsite/blog/2020-08-05-announcing-backstage-software-templates.md b/microsite/blog/2020-08-05-announcing-backstage-software-templates.md
index 51c1da2885..81d495e1c3 100644
--- a/microsite/blog/2020-08-05-announcing-backstage-software-templates.md
+++ b/microsite/blog/2020-08-05-announcing-backstage-software-templates.md
@@ -39,7 +39,7 @@ You can customize Backstage Software Templates to fit your organization’s stan
 
 ## Getting started
 
-The sample Software Templates are available under `/create`. If you're setting up Backstage for the first time, follow [Getting Started with Backstage](https://backstage.io/docs/getting-started/) and go to `http://localhost:3000/create`. If you’ve already been running Backstage locally, run the command `yarn lerna run mock-data` to load the new sample templates into the Service Catalog first.
+The sample Software Templates are available under `/create`. If you're setting up Backstage for the first time, follow [Getting Started with Backstage](https://backstage.io/docs/getting-started/) and go to `http://localhost:3000/create`.
 
 ![available-templates](assets/2020-08-05/templates.png)
 
diff --git a/packages/backend/README.md b/packages/backend/README.md
index 860520f4b5..c45a0d28d9 100644
--- a/packages/backend/README.md
+++ b/packages/backend/README.md
@@ -43,21 +43,13 @@ The backend starts up on port 7000 per default.
 
 ## Populating The Catalog
 
-If you want to use the catalog functionality, you need to add so called locations
-to the backend. These are places where the backend can find some entity descriptor
-data to consume and serve.
+If you want to use the catalog functionality, you need to add so called
+locations to the backend. These are places where the backend can find some
+entity descriptor data to consume and serve. For more information, see
+[Software Catalog Overview - Adding Components to the Catalog](https://backstage.io/docs/features/software-catalog/software-catalog-overview#adding-components-to-the-catalog).
 
-To get started, you can issue the following after starting the backend, from inside
-the `plugins/catalog-backend` directory:
-
-```bash
-yarn mock-data
-```
-
-You should then start seeing data on `localhost:7000/catalog/entities`.
-
-The catalog currently runs in-memory only, so feel free to try it out, but it will
-need to be re-populated on next startup.
+For convenience we already include some statically configured example locations
+in `app-config.yaml` under `catalog.locations`. For local development you can override these in your own `app-config.local.yaml`.
 
 ## Authentication
 
diff --git a/packages/create-app/templates/default-app/packages/backend/README.md b/packages/create-app/templates/default-app/packages/backend/README.md
index f94904a930..5583bff625 100644
--- a/packages/create-app/templates/default-app/packages/backend/README.md
+++ b/packages/create-app/templates/default-app/packages/backend/README.md
@@ -3,8 +3,8 @@
 This package is an EXAMPLE of a Backstage backend.
 
 The main purpose of this package is to provide a test bed for Backstage plugins
-that have a backend part. Feel free to experiment locally or within your fork
-by adding dependencies and routes to this backend, to try things out.
+that have a backend part. Feel free to experiment locally or within your fork by
+adding dependencies and routes to this backend, to try things out.
 
 Our goal is to eventually amend the create-app flow of the CLI, such that a
 production ready version of a backend skeleton is made alongside the frontend
@@ -33,34 +33,32 @@ LOG_LEVEL=debug \
 yarn start
 ```
 
-Substitute `x` for actual values, or leave them as
-dummy values just to try out the backend without using the auth or sentry features.
+Substitute `x` for actual values, or leave them as dummy values just to try out
+the backend without using the auth or sentry features.
 
 The backend starts up on port 7000 per default.
 
 ## Populating The Catalog
 
-If you want to use the catalog functionality, you need to add so called locations
-to the backend. These are places where the backend can find some entity descriptor
-data to consume and serve.
+If you want to use the catalog functionality, you need to add so called
+locations to the backend. These are places where the backend can find some
+entity descriptor data to consume and serve. For more information, see
+[Software Catalog Overview - Adding Components to the Catalog](https://backstage.io/docs/features/software-catalog/software-catalog-overview#adding-components-to-the-catalog).
 
-To get started, you can issue the following after starting the backend, from inside
-the `plugins/catalog-backend` directory:
-
-```bash
-yarn mock-data
-```
-
-You should then start seeing data on `localhost:7000/catalog/entities`.
-
-The catalog currently runs in-memory only, so feel free to try it out, but it will
-need to be re-populated on next startup.
+To get started quickly, this template already includes some statically configured example locations
+in `app-config.yaml` under `catalog.locations`. You can remove and replace these locations as you
+like, and also override them for local development in `app-config.local.yaml`.
 
 ## Authentication
 
-We chose [Passport](http://www.passportjs.org/) as authentication platform due to its comprehensive set of supported authentication [strategies](http://www.passportjs.org/packages/).
+We chose [Passport](http://www.passportjs.org/) as authentication platform due
+to its comprehensive set of supported authentication
+[strategies](http://www.passportjs.org/packages/).
 
-Read more about the [auth-backend](https://github.com/spotify/backstage/blob/master/plugins/auth-backend/README.md) and [how to add a new provider](https://github.com/spotify/backstage/blob/master/docs/auth/add-auth-provider.md)
+Read more about the
+[auth-backend](https://github.com/spotify/backstage/blob/master/plugins/auth-backend/README.md)
+and
+[how to add a new provider](https://github.com/spotify/backstage/blob/master/docs/auth/add-auth-provider.md)
 
 ## Documentation
 
diff --git a/plugins/catalog-backend/README.md b/plugins/catalog-backend/README.md
index 7c52dfad72..1b4a653f4a 100644
--- a/plugins/catalog-backend/README.md
+++ b/plugins/catalog-backend/README.md
@@ -21,12 +21,9 @@ To evaluate the catalog and have a greater amount of functionality available, in
 # in one terminal window, run this from from the very root of the Backstage project
 cd packages/backend
 yarn start
-
-# open another terminal window, and run the following from the very root of the Backstage project
-yarn lerna run mock-data
 ```
 
-This will launch the full example backend and populate its catalog with some mock entities.
+This will launch the full example backend, populated some example entities.
 
 ## Links
 
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index c1b20ed7bb..d1711cf3d5 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -17,9 +17,7 @@
     "test": "backstage-cli test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "mock-data": "./scripts/mock-data.sh",
-    "mock-data:local": "./scripts/mock-data-local.sh"
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.21",
diff --git a/plugins/catalog-backend/scripts/mock-data-local.sh b/plugins/catalog-backend/scripts/mock-data-local.sh
deleted file mode 100755
index 3bea819319..0000000000
--- a/plugins/catalog-backend/scripts/mock-data-local.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-for FILE in \
-  ../../packages/catalog-model/examples/*.yaml \
-; do \
-  curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"file\", \"target\": \"../catalog-model/${FILE}\"}"
-  echo
-done
diff --git a/plugins/catalog-backend/scripts/mock-data.sh b/plugins/catalog-backend/scripts/mock-data.sh
deleted file mode 100755
index 92ec647281..0000000000
--- a/plugins/catalog-backend/scripts/mock-data.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-for URL in \
-  'artist-lookup-component.yaml' \
-  'playback-order-component.yaml' \
-  'podcast-api-component.yaml' \
-  'queue-proxy-component.yaml' \
-  'searcher-component.yaml' \
-  'playback-lib-component.yaml' \
-  'www-artist-component.yaml' \
-  'shuffle-api-component.yaml' \
-  'petstore-api.yaml' \
-  'streetlights-api.yaml' \
-; do \
-  curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"github\", \"target\": \"https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/${URL}\"}"
-  echo
-done
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index e55a195f6e..25508a91ff 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -18,8 +18,7 @@
     "diff": "backstage-cli plugin:diff",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "mock-data": "./scripts/mock-data.sh"
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.1.1-alpha.21",
diff --git a/plugins/github-actions/scripts/mock-data.sh b/plugins/github-actions/scripts/mock-data.sh
deleted file mode 100755
index 2653a415dd..0000000000
--- a/plugins/github-actions/scripts/mock-data.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-  curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"file\", \"target\": \"$(pwd)/scripts/sample.yaml\"}"
-  echo
diff --git a/plugins/graphql/package.json b/plugins/graphql/package.json
index 1612398ea9..706592c430 100644
--- a/plugins/graphql/package.json
+++ b/plugins/graphql/package.json
@@ -16,8 +16,7 @@
     "test": "backstage-cli test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "mock-data": "./scripts/mock-data.sh"
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.21",
diff --git a/plugins/graphql/scripts/mock-data.sh b/plugins/graphql/scripts/mock-data.sh
deleted file mode 100755
index ff30921715..0000000000
--- a/plugins/graphql/scripts/mock-data.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-echo "use this script to load your service with some mock data if needed!"
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 2fe27f4eb7..2283dd5d05 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -17,8 +17,7 @@
     "test": "backstage-cli test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "mock-data": "./scripts/mock-data.sh"
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.21",
diff --git a/plugins/scaffolder-backend/scripts/mock-data.sh b/plugins/scaffolder-backend/scripts/mock-data.sh
deleted file mode 100755
index 9a9b0b186b..0000000000
--- a/plugins/scaffolder-backend/scripts/mock-data.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-for URL in \
-  'react-ssr-template' \
-  'springboot-grpc-template' \
-  'create-react-app' \
-  'docs-template' \
-; do \
-  curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"file\", \"target\": \"$(pwd)/sample-templates/${URL}/template.yaml\"}"
-  echo
-done
-
-curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"github\", \"target\": \"https://github.com/spotify/cookiecutter-golang/blob/master/template.yaml\"}"
-echo
diff --git a/plugins/techdocs-backend/README.md b/plugins/techdocs-backend/README.md
index 6a54971788..2185c3b3e4 100644
--- a/plugins/techdocs-backend/README.md
+++ b/plugins/techdocs-backend/README.md
@@ -14,9 +14,6 @@ To evaluate TechDocs and have a greater amount of functionality available, inste
 # in one terminal window, run this from from the very root of the Backstage project
 cd packages/backend
 yarn start
-
-# open another terminal window, and run the following from the very root of the Backstage project
-yarn lerna run mock-data
 ```
 
 ## What techdocs-backend does
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index edafe31657..47b2ebc8aa 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -17,8 +17,7 @@
     "test": "backstage-cli test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "mock-data": "./scripts/mock-data.sh"
+    "clean": "backstage-cli clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.21",
diff --git a/plugins/techdocs-backend/scripts/mock-data.sh b/plugins/techdocs-backend/scripts/mock-data.sh
deleted file mode 100755
index 0630490694..0000000000
--- a/plugins/techdocs-backend/scripts/mock-data.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-for URL in \
-  'documented-component/documented-component.yaml' \
-; do \
-  curl \
-    --location \
-    --request POST 'localhost:7000/catalog/locations' \
-    --header 'Content-Type: application/json' \
-    --data-raw "{\"type\": \"file\", \"target\": \"$(pwd)/examples/${URL}\"}"
-  echo
-done