diff --git a/packages/cli/src/commands/create-plugin/createPlugin.ts b/packages/cli/src/commands/create-plugin/createPlugin.ts
index 37c026ecae..cbaf956bdb 100644
--- a/packages/cli/src/commands/create-plugin/createPlugin.ts
+++ b/packages/cli/src/commands/create-plugin/createPlugin.ts
@@ -272,7 +272,7 @@ export default async (cmd: Command) => {
     Task.section('Building the plugin');
     await buildPlugin(pluginDir);
 
-    if ((await fs.pathExists(appPackage)) && !backend) {
+    if ((await fs.pathExists(appPackage)) && !cmd.backend) {
       Task.section('Adding plugin as dependency in app');
       await addPluginDependencyToApp(paths.targetRoot, name, version);
 
diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs
index 2ecdbcef01..a4b6e7aaf9 100644
--- a/packages/cli/templates/default-backend-plugin/package.json.hbs
+++ b/packages/cli/templates/default-backend-plugin/package.json.hbs
@@ -36,7 +36,7 @@
       "@backstage/cli": "^{{version}}",
       "@types/supertest": "^2.0.8",
       "supertest": "^4.0.2",
-      "msw": "^0.19.5"
+      "msw": "^0.20.5"
     },
     "files": [
       "dist"
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index 7597d3dc28..0d26339843 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -41,7 +41,7 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "msw": "^0.19.5"
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 378ceb2d08..254dc9aba0 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -49,7 +49,8 @@
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
     "@types/swagger-ui-react": "^3.23.3",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index c4738c7105..2854425e75 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.22",
     "@types/supertest": "^2.0.8",
-    "msw": "^0.19.5",
+    "msw": "^0.20.5",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 91fe08c0fa..aff6470e71 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -58,7 +58,8 @@
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
     "@types/passport-saml": "^1.1.2",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist",
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index c508215f29..505f7bb4df 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -40,7 +40,7 @@
     "@graphql-codegen/typescript-resolvers": "^1.17.7",
     "ts-node": "^8.10.2",
     "eslint-plugin-graphql": "^4.0.0",
-    "msw": "^0.19.5",
+    "msw": "^0.20.5",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 10278fc065..47600d5452 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -46,7 +46,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react-lazylog": "^4.5.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index c889f96153..f094c4f908 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -41,7 +41,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index b71cebf6e4..fa72f0e66d 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -39,7 +39,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 9d1538ce99..1ee1e44074 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -47,7 +47,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index cb25167ba6..7805f35f85 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -39,7 +39,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index e6122eb38b..5747ff5726 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -53,7 +53,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "jest-fetch-mock": "^3.0.3",
-    "react-router-dom": "6.0.0-beta.0"
+    "react-router-dom": "6.0.0-beta.0",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/identity-backend/package.json b/plugins/identity-backend/package.json
index a34049fb91..ab006d3ecc 100644
--- a/plugins/identity-backend/package.json
+++ b/plugins/identity-backend/package.json
@@ -34,7 +34,8 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.22",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 398161f270..07ec728b34 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -44,7 +44,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/testing-library__jest-dom": "^5.9.1",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index c5522ae67a..ea73010491 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -42,7 +42,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 0cadf440f7..63a6d0a1b4 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -38,7 +38,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json
index 8ccaae9914..c2d9709643 100644
--- a/plugins/register-component/package.json
+++ b/plugins/register-component/package.json
@@ -43,7 +43,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index cb37c6187a..c2154a2c85 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -47,7 +47,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index ab95e83201..21b95a6aaf 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -49,7 +49,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 6e7daea15c..1fd836b83f 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -43,7 +43,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index f25ec752e1..36318be766 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -45,7 +45,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index d2f99cb824..d467f8ef5f 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -48,7 +48,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "canvas": "^2.6.1",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 741a680cd9..7784d8ff97 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -39,7 +39,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3"
+    "jest-fetch-mock": "^3.0.3",
+    "msw": "^0.20.5"
   },
   "files": [
     "dist"