diff --git a/docs/features/techdocs/README.md b/docs/features/techdocs/README.md
index d5d6db1240..b6a4d82b92 100644
--- a/docs/features/techdocs/README.md
+++ b/docs/features/techdocs/README.md
@@ -36,11 +36,7 @@ Spotify’s developer experience offering with 2,400+ documentation sites and
 
 - [Getting Started]
 - [Concepts]
-- [Reading Documentation]
-- [Writing Documentation]
-- [Publishing Documentation]
-- [Contributing]
-- [Debugging]
+- [Creating and Publishing Documentation]
 - [FAQ]
 
 ## Tech Stack
@@ -54,11 +50,7 @@ Spotify’s developer experience offering with 2,400+ documentation sites and
 
 [getting started]: getting-started.md
 [concepts]: concepts.md
-[reading documentation]: reading-documentation.md
-[writing documentation]: writing-documentation.md
-[publishing documentation]: publishing-documentation.md
-[contributing]: contributing.md
-[debugging]: debugging.md
+[creating and publishing documentation]: creating-and-publishing.md
 [faq]: FAQ.md 'Frequently asked questions'
 [techdocs/frontend]:
   https://github.com/spotify/backstage/blob/master/plugins/techdocs
diff --git a/docs/features/techdocs/contributing.md b/docs/features/techdocs/contributing.md
deleted file mode 100644
index 854139a319..0000000000
--- a/docs/features/techdocs/contributing.md
+++ /dev/null
@@ -1 +0,0 @@
-# Contributing
diff --git a/docs/features/techdocs/publishing-documentation.md b/docs/features/techdocs/creating-and-publishing.md
similarity index 80%
rename from docs/features/techdocs/publishing-documentation.md
rename to docs/features/techdocs/creating-and-publishing.md
index 73ac74b458..0ac4f054d7 100644
--- a/docs/features/techdocs/publishing-documentation.md
+++ b/docs/features/techdocs/creating-and-publishing.md
@@ -1,11 +1,21 @@
-# Publishing Documentation
+# Creating and publishing your docs
+
+This section will guide you through:
+
+- Creating a basic setup for your documentation
+- Writing and previewing your documentation in a local Backstage environment
+- Creating a build ready for publication
+- Publishing your documentation and making your Backstage instance read from
+  your published docs.
 
 ## Prerequisities
 
 - [Docker](https://docs.docker.com/get-docker/)
 - Static file hosting
+- A working Backstage instance with TechDocs installed
+  [TechDocs getting started](getting-started.md)
 
-## Create documentation
+## Create a basic documentation setup
 
 Create a directory that contains your documentation. Inside this directory you
 should create a file called `mkdocs.yml`. As an example you can create a
@@ -32,7 +42,23 @@ And then the `~/hello-docs/docs/index.md` should have the following content:
 This is a basic example of documentation.
 ```
 
-## Build documentation
+## Writing and previewing your documentation
+
+Using the `techdocs-cli` you can preview your docs inside a local Backstage
+instance and get automatic recompilation on changes. This is useful for when you
+want to write your documentation.
+
+To do this you can run:
+
+```bash
+cd ~/hello-docs/
+npx techdocs-cli serve
+```
+
+## Build production ready documentation
+
+To get a build suitable for publication you can build your docs using the
+`spotify/techdocs` container.
 
 ```bash
 cd ~/hello-docs/
diff --git a/docs/features/techdocs/debugging.md b/docs/features/techdocs/debugging.md
deleted file mode 100644
index 1e584c954d..0000000000
--- a/docs/features/techdocs/debugging.md
+++ /dev/null
@@ -1 +0,0 @@
-# Debugging
diff --git a/docs/features/techdocs/reading-documentation.md b/docs/features/techdocs/reading-documentation.md
deleted file mode 100644
index f872ed5df8..0000000000
--- a/docs/features/techdocs/reading-documentation.md
+++ /dev/null
@@ -1 +0,0 @@
-# Reading Documentation
diff --git a/docs/features/techdocs/writing-documentation.md b/docs/features/techdocs/writing-documentation.md
deleted file mode 100644
index 5fea01bcad..0000000000
--- a/docs/features/techdocs/writing-documentation.md
+++ /dev/null
@@ -1 +0,0 @@
-# Writing Documentation
diff --git a/lerna.json b/lerna.json
index d5a6d08c6c..1a316638fb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "packages": ["packages/*", "plugins/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.1.1-alpha.15"
+  "version": "0.1.1-alpha.16"
 }
diff --git a/packages/app/package.json b/packages/app/package.json
index 251f7b82c5..4dc2f9c4c1 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,26 +1,26 @@
 {
   "name": "example-app",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": true,
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.15",
-    "@backstage/plugin-circleci": "^0.1.1-alpha.15",
-    "@backstage/plugin-explore": "^0.1.1-alpha.15",
-    "@backstage/plugin-github-actions": "^0.1.1-alpha.15",
-    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.15",
-    "@backstage/plugin-graphiql": "^0.1.1-alpha.15",
-    "@backstage/plugin-lighthouse": "^0.1.1-alpha.15",
-    "@backstage/plugin-register-component": "^0.1.1-alpha.15",
-    "@backstage/plugin-rollbar": "^0.1.1-alpha.15",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.15",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.15",
-    "@backstage/plugin-tech-radar": "^0.1.1-alpha.15",
-    "@backstage/plugin-techdocs": "^0.1.1-alpha.15",
-    "@backstage/plugin-welcome": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.16",
+    "@backstage/plugin-circleci": "^0.1.1-alpha.16",
+    "@backstage/plugin-explore": "^0.1.1-alpha.16",
+    "@backstage/plugin-github-actions": "^0.1.1-alpha.16",
+    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.16",
+    "@backstage/plugin-graphiql": "^0.1.1-alpha.16",
+    "@backstage/plugin-lighthouse": "^0.1.1-alpha.16",
+    "@backstage/plugin-register-component": "^0.1.1-alpha.16",
+    "@backstage/plugin-rollbar": "^0.1.1-alpha.16",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.16",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.16",
+    "@backstage/plugin-tech-radar": "^0.1.1-alpha.16",
+    "@backstage/plugin-techdocs": "^0.1.1-alpha.16",
+    "@backstage/plugin-welcome": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 4ac7aa65cf..5f93574665 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.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -41,7 +41,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/compression": "^1.7.0",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index b040c12554..3a53287648 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -18,18 +18,18 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
     "@backstage/config": "^0.1.1-alpha.13",
     "@backstage/config-loader": "^0.1.1-alpha.13",
-    "@backstage/plugin-auth-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-identity-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.15",
-    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.15",
+    "@backstage/plugin-auth-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-identity-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.16",
+    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.16",
     "@octokit/rest": "^18.0.0",
     "dockerode": "^3.2.0",
     "express": "^4.17.1",
@@ -39,7 +39,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/dockerode": "^2.5.32",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index ad19348cfe..14212e84e0 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,7 +29,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "@types/jest": "^25.2.2",
     "@types/lodash": "^4.14.151",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f99f2a7741..8786229240 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.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public"
diff --git a/packages/core-api/package.json b/packages/core-api/package.json
index 5bd78d7246..0f0251f23c 100644
--- a/packages/core-api/package.json
+++ b/packages/core-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-api",
   "description": "Internal Core API used by Backstage plugins and apps",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.1-alpha.13",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@types/react": "^16.9",
@@ -41,7 +41,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@backstage/test-utils-core": "^0.1.1-alpha.13",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index b111dcd9c1..20a947a202 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.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.1-alpha.13",
-    "@backstage/core-api": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core-api": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -54,8 +54,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx b/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
index 4a404a840f..62760f72fb 100644
--- a/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
+++ b/packages/core/src/components/DismissableBanner/DismissableBanner.stories.tsx
@@ -89,7 +89,7 @@ export const WithLink = () => (
         message={
           <Typography>
             This is a dismissable banner with a link:{' '}
-            <Link href="http://example.com" color="textSecondary">
+            <Link href="http://example.com" color="textPrimary">
               example.com
             </Link>
           </Typography>
diff --git a/packages/core/src/components/DismissableBanner/DismissableBanner.tsx b/packages/core/src/components/DismissableBanner/DismissableBanner.tsx
index eebb884806..747ed06b37 100644
--- a/packages/core/src/components/DismissableBanner/DismissableBanner.tsx
+++ b/packages/core/src/components/DismissableBanner/DismissableBanner.tsx
@@ -18,13 +18,14 @@ import React, { FC, ReactNode, useState, useEffect } from 'react';
 import { useApi, storageApiRef } from '@backstage/core-api';
 import { useObservable } from 'react-use';
 import classNames from 'classnames';
-import { makeStyles, Theme } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core';
+import { BackstageTheme } from '@backstage/theme';
 import Snackbar from '@material-ui/core/Snackbar';
 import SnackbarContent from '@material-ui/core/SnackbarContent';
 import IconButton from '@material-ui/core/IconButton';
 import Close from '@material-ui/icons/Close';
 
-const useStyles = makeStyles((theme: Theme) => ({
+const useStyles = makeStyles((theme: BackstageTheme) => ({
   root: {
     position: 'relative',
     padding: theme.spacing(0),
@@ -46,10 +47,10 @@ const useStyles = makeStyles((theme: Theme) => ({
     alignItems: 'center',
   },
   info: {
-    backgroundColor: theme.palette.primary.main,
+    backgroundColor: theme.palette.banner.info,
   },
   error: {
-    backgroundColor: theme.palette.error.dark,
+    backgroundColor: theme.palette.banner.error,
   },
 }));
 
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 7dcf2216b8..24e54a5cbb 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 528ed5fc31..dafd592bb0 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "description": "Storybook build for core package",
   "private": true,
   "scripts": {
@@ -14,7 +14,7 @@
     ]
   },
   "dependencies": {
-    "@backstage/theme": "^0.1.1-alpha.15"
+    "@backstage/theme": "^0.1.1-alpha.16"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^5.3.17",
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 2665d2ec47..a097284f82 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@techdocs/cli",
   "description": "CLI for running TechDocs locally.",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -44,7 +44,7 @@
     "ext": "ts"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "commander": "^5.1.0",
     "fs-extra": "^9.0.1",
     "http-proxy": "^1.18.1",
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index ec6a02d8ea..ef595f53ed 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils",
   "description": "Utilities to test Backstage plugins and apps.",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/core-api": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/core-api": "^0.1.1-alpha.16",
     "@backstage/test-utils-core": "^0.1.1-alpha.13",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 0732e2d063..144712cfe6 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/theme",
   "description": "material-ui theme for use with Backstage.",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "@material-ui/core": "^4.9.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15"
+    "@backstage/cli": "^0.1.1-alpha.16"
   },
   "files": [
     "dist"
diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts
index c6bff73ef4..e5ebd419a3 100644
--- a/packages/theme/src/themes.ts
+++ b/packages/theme/src/themes.ts
@@ -41,6 +41,10 @@ export const lightTheme = createTheme({
     primary: {
       main: blue[500],
     },
+    banner: {
+      info: '#2E77D0',
+      error: '#E22134',
+    },
     border: '#E6E6E6',
     textContrast: '#000000',
     textVerySubtle: '#DDD',
@@ -90,6 +94,10 @@ export const darkTheme = createTheme({
     primary: {
       main: blue[500],
     },
+    banner: {
+      info: '#2E77D0',
+      error: '#E22134',
+    },
     border: '#E6E6E6',
     textContrast: '#FFFFFF',
     textVerySubtle: '#DDD',
diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts
index fdb9e09869..557af23cd0 100644
--- a/packages/theme/src/types.ts
+++ b/packages/theme/src/types.ts
@@ -58,6 +58,10 @@ type PaletteAdditions = {
     icon: string;
     background: string;
   };
+  banner: {
+    info: string;
+    error: string;
+  };
 };
 
 export type BackstagePalette = Palette & PaletteAdditions;
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index c776a8d9f4..319c74fb90 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@backstage/config": "^0.1.1-alpha.13",
     "@backstage/config-loader": "^0.1.1-alpha.13",
     "@types/express": "^4.17.6",
@@ -49,7 +49,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/jwt-decode": "2.2.1",
diff --git a/plugins/catalog-backend/migrations/20200721115244_location_update_log_latest_deduplicate.js b/plugins/catalog-backend/migrations/20200721115244_location_update_log_latest_deduplicate.js
index df43a22c56..9046f85da0 100644
--- a/plugins/catalog-backend/migrations/20200721115244_location_update_log_latest_deduplicate.js
+++ b/plugins/catalog-backend/migrations/20200721115244_location_update_log_latest_deduplicate.js
@@ -25,7 +25,7 @@ exports.up = function up(knex) {
   ) t2
   ON t1.location_id = t2.location_id
   AND t1.created_at = t2.MAXDATE
-  GROUP BY t1.location_id
+  GROUP BY t1.location_id, t1.id
   ORDER BY created_at DESC;
 `);
 };
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 9c7a18087d..b84267c854 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "mock-data": "./scripts/mock-data.sh"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
@@ -39,7 +39,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/lodash": "^4.14.151",
     "@types/node-fetch": "^2.5.7",
     "@types/supertest": "^2.0.8",
diff --git a/plugins/catalog-backend/src/ingestion/index.ts b/plugins/catalog-backend/src/ingestion/index.ts
index 07e917b97b..4ebb2edc79 100644
--- a/plugins/catalog-backend/src/ingestion/index.ts
+++ b/plugins/catalog-backend/src/ingestion/index.ts
@@ -24,3 +24,4 @@ export type {
   ReadLocationError,
   ReadLocationResult,
 } from './types';
+export * from './processors';
diff --git a/plugins/catalog-backend/src/ingestion/processors/index.ts b/plugins/catalog-backend/src/ingestion/processors/index.ts
new file mode 100644
index 0000000000..ed5dc3bf8e
--- /dev/null
+++ b/plugins/catalog-backend/src/ingestion/processors/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 results from './results';
+
+export { results };
+export * from './types';
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 81a94ae58f..4da687b86e 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,11 +21,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.15",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.16",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -38,9 +38,9 @@
     "swr": "^0.2.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/catalog/src/components/CatalogPage/WelcomeBanner.tsx b/plugins/catalog/src/components/CatalogPage/WelcomeBanner.tsx
index c7a280d106..677b1f7ec5 100644
--- a/plugins/catalog/src/components/CatalogPage/WelcomeBanner.tsx
+++ b/plugins/catalog/src/components/CatalogPage/WelcomeBanner.tsx
@@ -42,7 +42,7 @@ export const WelcomeBanner = () => {
             🎉
           </span>
           Welcome to Backstage! Take a look around and check out our{' '}
-          <Link href="/welcome" color="textSecondary">
+          <Link href="/welcome" color="textPrimary">
             getting started
           </Link>{' '}
           page.
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 7c796e718d..b5dfcb3211 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-circleci",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "postpack": "backstage-cli postpack"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 4a484b5eaf..4dc8542a12 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,9 +32,9 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 9101b13547..ce0068c35a 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/core-api": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/core-api": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 3b9c39e124..80063c6295 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,8 +32,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 963b51f9d4..2d5f727f4e 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.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,8 +31,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -43,9 +43,9 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/identity-backend/package.json b/plugins/identity-backend/package.json
index cd019a3437..2e049b78df 100644
--- a/plugins/identity-backend/package.json
+++ b/plugins/identity-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-identity-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -33,7 +33,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "jest-fetch-mock": "^3.0.3"
   },
   "files": [
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 6b6a437102..f9fd64ee69 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -33,9 +33,9 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 4a12494d3c..2f694382b3 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,7 +19,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@backstage/config": "^0.1.1-alpha.13",
     "@backstage/config-loader": "^0.1.1-alpha.13",
     "@types/express": "^4.17.6",
@@ -35,7 +35,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/node-fetch": "^2.5.7",
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.0.0",
diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json
index fdb1e64046..1dcbb86a9c 100644
--- a/plugins/register-component/package.json
+++ b/plugins/register-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-register-component",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 0a3f3aee2b..2b2577fa73 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "axios": "^0.19.2",
     "camelcase-keys": "^6.2.2",
@@ -36,7 +36,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@types/supertest": "^2.0.8",
     "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 69eb4db5e9..2055cc9525 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -35,9 +35,9 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index ff67b744ef..fef2a3b2c3 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "mock-data": "./scripts/mock-data.sh"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
     "@backstage/config": "^0.1.1-alpha.13",
     "@octokit/rest": "^18.0.0",
     "@types/dockerode": "^2.5.32",
@@ -43,7 +43,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "@octokit/types": "^5.0.1",
     "@types/fs-extra": "^9.0.1",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 0a4604511a..a52acfed43 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.15",
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/catalog-model": "^0.1.1-alpha.16",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -41,9 +41,9 @@
     "swr": "^0.2.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/sentry-backend/package.json b/plugins/sentry-backend/package.json
index 956fd4ce84..04669b5c8b 100644
--- a/plugins/sentry-backend/package.json
+++ b/plugins/sentry-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "axios": "^0.19.2",
     "compression": "^1.7.4",
@@ -34,7 +34,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "jest-fetch-mock": "^3.0.3"
   },
   "files": [
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 9c96463d0a..1557ca409a 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -34,8 +34,8 @@
     "timeago.js": "^4.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/sentry/src/components/SentryPluginWidget/SentryPluginWidget.tsx b/plugins/sentry/src/components/SentryPluginWidget/SentryPluginWidget.tsx
index 0ee32f1bab..8d522df4a7 100644
--- a/plugins/sentry/src/components/SentryPluginWidget/SentryPluginWidget.tsx
+++ b/plugins/sentry/src/components/SentryPluginWidget/SentryPluginWidget.tsx
@@ -34,7 +34,8 @@ export const SentryPluginWidget: FC<{
   const errorApi = useApi<ErrorApi>(errorApiRef);
   const configApi = useApi(configApiRef);
   const org = configApi.getString('sentry.organization');
-  const api = sentryApiFactory(org);
+  const backendBaseUrl = configApi.getString('backend.baseUrl');
+  const api = sentryApiFactory(org, backendBaseUrl);
 
   const { loading, value, error } = useAsync(
     () => api.fetchIssues(sentryProjectId, statsFor),
diff --git a/plugins/sentry/src/data/api-factory.ts b/plugins/sentry/src/data/api-factory.ts
index 32ff4bde5c..88e1148b72 100644
--- a/plugins/sentry/src/data/api-factory.ts
+++ b/plugins/sentry/src/data/api-factory.ts
@@ -17,9 +17,12 @@ import { SentryApi } from './sentry-api';
 import { MockSentryApi } from './mock-api';
 import { ProductionSentryApi } from './production-api';
 
-export function sentryApiFactory(organization: string): SentryApi {
+export function sentryApiFactory(
+  organization: string,
+  backendBaseUrl: string,
+): SentryApi {
   if (process.env.NODE_ENV === 'production') {
-    return new ProductionSentryApi(organization);
+    return new ProductionSentryApi(organization, backendBaseUrl);
   }
   return new MockSentryApi();
 }
diff --git a/plugins/sentry/src/data/production-api.ts b/plugins/sentry/src/data/production-api.ts
index ce4bab5aca..5d21e80604 100644
--- a/plugins/sentry/src/data/production-api.ts
+++ b/plugins/sentry/src/data/production-api.ts
@@ -16,20 +16,21 @@
 import { SentryIssue } from './sentry-issue';
 import { SentryApi } from './sentry-api';
 
-const API_HOST = process.env.API_HOST || 'http://localhost:7000';
-const API_BASE_URL = `${API_HOST}/sentry/api/0/projects/`;
-
 export class ProductionSentryApi implements SentryApi {
   private organization: string;
+  private backendBaseUrl: string;
 
-  constructor(organization: string) {
+  constructor(organization: string, backendBaseUrl: string) {
     this.organization = organization;
+    this.backendBaseUrl = backendBaseUrl;
   }
 
   async fetchIssues(project: string, statsFor: string): Promise<SentryIssue[]> {
     try {
+      const apiBaseUrl = `${this.backendBaseUrl}/sentry/api/0/projects/`;
+
       const response = await fetch(
-        `${API_BASE_URL}/${this.organization}/${project}/issues/?statsFor=${statsFor}`,
+        `${apiBaseUrl}/${this.organization}/${project}/issues/?statsFor=${statsFor}`,
       );
 
       if (response.status >= 400 && response.status < 600) {
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 7130d9c173..1b801beebd 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-radar",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
     "@backstage/test-utils-core": "^0.1.1-alpha.13",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -35,8 +35,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 03a6a8dcb9..528f130e4b 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.15",
+    "@backstage/backend-common": "^0.1.1-alpha.16",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
@@ -28,7 +28,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 0747284964..dfd8393b5f 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,9 +22,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/test-utils": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/test-utils": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "sanitize-html": "^1.27.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 9ae117d64d..71a19d59bc 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-welcome",
-  "version": "0.1.1-alpha.15",
+  "version": "0.1.1-alpha.16",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -21,8 +21,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.15",
-    "@backstage/theme": "^0.1.1-alpha.15",
+    "@backstage/core": "^0.1.1-alpha.16",
+    "@backstage/theme": "^0.1.1-alpha.16",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,8 +32,8 @@
     "react-use": "^14.2.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.15",
-    "@backstage/dev-utils": "^0.1.1-alpha.15",
+    "@backstage/cli": "^0.1.1-alpha.16",
+    "@backstage/dev-utils": "^0.1.1-alpha.16",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",