diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index db0eea8303..a5c89553ba 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/packages/app/package.json b/packages/app/package.json
index 3f870970bd..8ebfdd6bff 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -92,13 +92,13 @@
     "start-server-and-test": "^1.10.11"
   },
   "scripts": {
-    "start": "backstage-cli app:serve",
-    "build": "backstage-cli app:build",
-    "clean": "backstage-cli clean",
-    "test": "backstage-cli test",
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "clean": "backstage-cli script clean",
+    "test": "backstage-cli script test",
     "test:e2e": "start-server-and-test start http://localhost:3000 cy:dev",
     "test:e2e:ci": "start-server-and-test start http://localhost:3000 cy:run",
-    "lint": "backstage-cli lint",
+    "lint": "backstage-cli script lint",
     "cy:dev": "cypress open",
     "cy:run": "cypress run"
   },
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 41408330a6..9f0efc8785 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -25,12 +25,13 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build --experimental-type-build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build --experimental-type-build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.6",
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index 8f11561c41..624f37858d 100644
--- a/packages/backend-tasks/package.json
+++ b/packages/backend-tasks/package.json
@@ -24,12 +24,13 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 5cffa1130d..5916c25adb 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -25,12 +25,13 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index e0b97c8510..80f88b5325 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -18,12 +18,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli backend:bundle",
+    "build": "backstage-cli script build",
     "build-image": "docker build ../.. -f Dockerfile --tag example-backend",
-    "start": "backstage-cli backend:dev",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "clean": "backstage-cli clean",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "clean": "backstage-cli script clean",
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 6bf8869f72..5c8b36b9b0 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -25,12 +25,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 6af022ee88..3ba52f0929 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -26,12 +26,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build --experimental-type-build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build --experimental-type-build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index 453fa85bf9..5e1f31795f 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -24,12 +24,13 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "devDependencies": {
     "@types/jest": "^26.0.7",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 934b97c124..87b3ad599c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -21,10 +21,10 @@
   "license": "Apache-2.0",
   "main": "dist/index.cjs.js",
   "scripts": {
-    "build": "backstage-cli build --outputs cjs",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "clean": "backstage-cli clean",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "clean": "backstage-cli script clean",
     "start": "nodemon --"
   },
   "bin": {
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index aa74584114..bc6eac7a0d 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -23,12 +23,12 @@
   "main": "src/index.ts",
   "scripts": {
     "start": "nodemon --",
-    "build": "backstage-cli build --outputs cjs",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "clean": "backstage-cli script clean"
   },
   "bin": {
     "backstage-codemods": "bin/backstage-codemods"
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 10e9b447ae..dccb21c9eb 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -25,12 +25,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.6",
diff --git a/packages/config/package.json b/packages/config/package.json
index 72ddeb054a..de1e72350f 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -25,12 +25,12 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/types": "^0.1.1",
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 60801bae79..84ec66f60c 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 54a8e0c114..b65392f4c6 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 0f9a815b35..003dea2698 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 064664465c..3b57096a52 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -24,10 +24,10 @@
     "backstage-create-app": "bin/backstage-create-app"
   },
   "scripts": {
-    "build": "backstage-cli build --outputs cjs",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "clean": "backstage-cli clean",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "clean": "backstage-cli script clean",
     "prepack": "node scripts/prepack.js",
     "postpack": "node scripts/postpack.js",
     "start": "nodemon --"
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 4af8ec1c17..86fcb20bd0 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/app-defaults": "^0.1.7",
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 70a3e68327..7d6a979a8c 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -19,9 +19,11 @@
   "main": "src/index.ts",
   "scripts": {
     "start": "nodemon --",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "test:e2e": "yarn start"
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "test:e2e": "yarn start",
+    "build": "backstage-cli script build",
+    "clean": "backstage-cli script clean"
   },
   "bin": {
     "e2e-test": "bin/e2e-test"
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 345e304646..4c8a985932 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -25,12 +25,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/types": "^0.1.1",
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index ed26937f7e..148b64c39d 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -15,13 +15,13 @@
     "role": "web-library"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 694c12fd4a..dff83ef042 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -25,12 +25,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/release-manifests/package.json b/packages/release-manifests/package.json
index d3000688c2..3a5a41d8b5 100644
--- a/packages/release-manifests/package.json
+++ b/packages/release-manifests/package.json
@@ -25,12 +25,12 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "cross-fetch": "^3.1.5"
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index 2f885ca874..5e1bd56609 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -28,12 +28,12 @@
     "dist"
   ],
   "scripts": {
-    "build": "backstage-cli build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index aa2d2d5457..75e2b280d5 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -42,11 +42,11 @@
     "start-server-and-test": "^1.10.11"
   },
   "scripts": {
-    "start": "backstage-cli app:serve --config ./app-config.yaml",
-    "build": "backstage-cli app:build --config ./app-config.yaml",
-    "clean": "backstage-cli clean",
-    "test": "backstage-cli test",
-    "lint": "backstage-cli lint",
+    "start": "backstage-cli script start --config ./app-config.yaml",
+    "build": "backstage-cli script build --config ./app-config.yaml",
+    "clean": "backstage-cli script clean",
+    "test": "backstage-cli script test",
+    "lint": "backstage-cli script lint",
     "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
     "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
     "cy:dev": "cypress open",
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index ce408e814c..9d65d8d51c 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -24,10 +24,10 @@
   "types": "",
   "scripts": {
     "start": "nodemon --",
-    "build": "backstage-cli build --outputs cjs",
-    "clean": "backstage-cli clean",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test --testPathIgnorePatterns=src/e2e.test.ts",
+    "build": "backstage-cli script build",
+    "clean": "backstage-cli script clean",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test --testPathIgnorePatterns=src/e2e.test.ts",
     "test:e2e": "backstage-cli test src/e2e.test.ts",
     "test:e2e:ci": "backstage-cli test --watchAll=false --ci src/e2e.test.ts",
     "prepack": "./scripts/prepack.sh"
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index 0078b1ab65..402254ff8b 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -28,12 +28,13 @@
     "dist"
   ],
   "scripts": {
-    "build": "backstage-cli build --outputs cjs,types",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 0cf9c4a245..006a893500 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 5090836437..446fca4029 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -24,11 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start",
+    "test": "backstage-cli script test"
   },
   "dependencies": {
     "@material-ui/core": "^4.12.2"
diff --git a/packages/types/package.json b/packages/types/package.json
index 8c452d0b87..a8225838a1 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -25,12 +25,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {},
   "devDependencies": {
diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json
index ff14d07be0..f52f12ed53 100644
--- a/packages/version-bridge/package.json
+++ b/packages/version-bridge/package.json
@@ -24,12 +24,13 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli build --outputs types,esm",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "peerDependencies": {
     "@types/react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json
index a8cfc938d0..33cc354b9f 100644
--- a/plugins/airbrake/package.json
+++ b/plugins/airbrake/package.json
@@ -13,14 +13,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 197b57f978..1e61c8b500 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -15,14 +15,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/analytics-module-ga/package.json b/plugins/analytics-module-ga/package.json
index 600f59a4e2..8ae8f11132 100644
--- a/plugins/analytics-module-ga/package.json
+++ b/plugins/analytics-module-ga/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin-module"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json
index 4872b8f406..c54857eb93 100644
--- a/plugins/apache-airflow/package.json
+++ b/plugins/apache-airflow/package.json
@@ -13,14 +13,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 5dd27e005b..cbbeb1d3ce 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -23,14 +23,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@asyncapi/react-component": "1.0.0-next.32",
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index 582ad10a56..7ae736161f 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -24,13 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 40e24ab723..8b80adeb34 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -24,13 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/plugin-auth-node": "^0.1.0",
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 7646385f04..401391df9e 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -14,12 +14,13 @@
     "role": "node-library"
   },
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json
index 4d7cfa5fbb..8415c82fef 100644
--- a/plugins/azure-devops-backend/package.json
+++ b/plugins/azure-devops-backend/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/azure-devops-common/package.json b/plugins/azure-devops-common/package.json
index f38ee26755..af59bc42a6 100644
--- a/plugins/azure-devops-common/package.json
+++ b/plugins/azure-devops-common/package.json
@@ -24,12 +24,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test --passWithNoTests",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.13.2-next.0"
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index a8e6233990..e26bf294c2 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -20,14 +20,14 @@
     "directory": "plugins/azure-devops"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index 433d03ce8e..496fa2b4f5 100644
--- a/plugins/badges-backend/package.json
+++ b/plugins/badges-backend/package.json
@@ -25,13 +25,13 @@
     "badges"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 9567c3c40e..cd3049e325 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -20,14 +20,14 @@
     "directory": "plugins/badges"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json
index afe1f5ef16..7904913cb5 100644
--- a/plugins/bazaar-backend/package.json
+++ b/plugins/bazaar-backend/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index 02df40bc83..952a910c32 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index 11215adb49..29c1b045f8 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 26a53e7858..2af4c02715 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -24,12 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 7285fb2f12..56e9f94886 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -24,12 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@azure/msal-node": "^1.1.0",
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 67560f49f8..ebf86fc505 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -24,13 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 61e9f47b63..367049212a 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -25,12 +25,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test --passWithNoTests",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/plugin-permission-common": "^0.4.0"
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index d0ba2ae4a8..e54bd28ca2 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 49dab8aaa8..4ad28de016 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -24,14 +24,14 @@
     "graphql"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
     "generate:types": "graphql-codegen",
-    "clean": "backstage-cli clean"
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 0160618dd9..0e6176e537 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 4d5177e4d9..23e25628ba 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -24,12 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 72951945e0..256c3343d1 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json
index 1860fdc1a6..89ce3da557 100644
--- a/plugins/cicd-statistics/package.json
+++ b/plugins/cicd-statistics/package.json
@@ -24,12 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "devDependencies": {
     "@types/react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index f3f78db349..4109d554e4 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -25,14 +25,14 @@
     "circleci"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "clean": "backstage-cli clean",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "clean": "backstage-cli script clean",
     "diff": "backstage-cli plugin:diff",
-    "start": "backstage-cli plugin:serve",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack"
+    "start": "backstage-cli script start",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 9e79a59a7f..bd3707f0aa 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -24,14 +24,14 @@
     "google cloud"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json
index 128fea3f3c..acbaf05214 100644
--- a/plugins/code-coverage-backend/package.json
+++ b/plugins/code-coverage-backend/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index f88661dd92..16ffd6c057 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index c796508452..1b6dfeb603 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 74f5788a55..e65da6296e 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json
index aea81d17d6..946c5922a0 100644
--- a/plugins/explore-react/package.json
+++ b/plugins/explore-react/package.json
@@ -24,12 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "clean": "backstage-cli clean",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "clean": "backstage-cli script clean",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/core-plugin-api": "^0.6.0"
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 5e19ef8b2a..e8f03a2bf3 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "clean": "backstage-cli clean",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "start": "backstage-cli plugin:serve"
+    "clean": "backstage-cli script clean",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 474d5f69a8..0cd7029d49 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -15,14 +15,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 27329a50ea..2e9d9a19c1 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -25,14 +25,14 @@
     "fossa"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 6be44b609a..d372b116dd 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -24,14 +24,14 @@
     "google cloud"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index e0400ac022..9406ac5fb8 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 5d9b0688d2..53fa0a469f 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -26,14 +26,14 @@
     "github actions"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index dcdb13b038..37dea0059d 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 0f47ac32f6..13dd6de689 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -25,14 +25,14 @@
     "gitops"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json
index b82e1f12ee..4bd089c380 100644
--- a/plugins/gocd/package.json
+++ b/plugins/gocd/package.json
@@ -21,14 +21,14 @@
     "directory": "plugins/gocd"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 781bfcf063..3dac4ccc37 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -24,14 +24,14 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json
index 31df1a5571..d60bdbc41e 100644
--- a/plugins/graphql-backend/package.json
+++ b/plugins/graphql-backend/package.json
@@ -25,13 +25,13 @@
     "graphql"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 404482a3bd..5685f876f0 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -24,14 +24,14 @@
     "homepage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index ccff499504..2018122bb3 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
index 8662abcbcf..c920f3f9c0 100644
--- a/plugins/jenkins-backend/package.json
+++ b/plugins/jenkins-backend/package.json
@@ -16,13 +16,13 @@
   },
   "configSchema": "config.d.ts",
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index c3220221d1..88881df2eb 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -25,14 +25,14 @@
     "jenkins"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index aa164ae85e..f09fac9072 100644
--- a/plugins/kafka-backend/package.json
+++ b/plugins/kafka-backend/package.json
@@ -26,13 +26,13 @@
   ],
   "configSchema": "config.d.ts",
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index ca35e0d3e0..5dac7c9e99 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index e1162622f3..b4f5137434 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -26,13 +26,13 @@
   ],
   "configSchema": "schema.d.ts",
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index db0276e6a3..b10167ba27 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -27,12 +27,12 @@
     "dist"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test --passWithNoTests",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 2408bc6fda..43175593f3 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -24,14 +24,14 @@
     "kubernetes"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index b60c3fd9d5..7ecefbac45 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -25,14 +25,14 @@
     "lighthouse"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "clean": "backstage-cli clean",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "start": "backstage-cli plugin:serve"
+    "clean": "backstage-cli script clean",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json
index e96ebeb744..656780c9d3 100644
--- a/plugins/newrelic-dashboard/package.json
+++ b/plugins/newrelic-dashboard/package.json
@@ -13,14 +13,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 4aa18b744e..4cdef7899e 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -25,14 +25,14 @@
     "newrelic"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 52bab0e3a2..be7537c18b 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 166fcab5b3..8ba97477dc 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -24,14 +24,14 @@
     "pagerduty"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index c1e945f42c..d8ba786979 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -13,13 +13,13 @@
     "role": "backend-plugin"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index 13955b09b8..350810fe2b 100644
--- a/plugins/permission-common/package.json
+++ b/plugins/permission-common/package.json
@@ -30,12 +30,12 @@
   ],
   "configSchema": "config.d.ts",
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index b88ad71dd1..902ea01138 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -24,12 +24,13 @@
     "permissions"
   ],
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index b687761828..3a56ccafe6 100644
--- a/plugins/permission-react/package.json
+++ b/plugins/permission-react/package.json
@@ -22,12 +22,13 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index f6450296ef..8585c600e6 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -23,13 +23,13 @@
     "backstage"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 248248ad42..247ccd4513 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -25,13 +25,13 @@
     "rollbar"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 7cf9fc3a7f..2da664a70e 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -25,14 +25,14 @@
     "rollbar"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 235432aadc..42478fc07e 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin-module"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index c0463782c7..e1512bcaee 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -15,13 +15,13 @@
     "role": "backend-plugin-module"
   },
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "start": "backstage-cli backend:dev",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 98c56c7174..f5c0fdda66 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin-module"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 4b3290cffd..9085c6db10 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -24,13 +24,13 @@
     "backstage"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
     "build:assets": "node scripts/build-nunjucks.js"
   },
   "dependencies": {
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index 95e0f3153e..909807c665 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -28,12 +28,12 @@
     "dist"
   ],
   "scripts": {
-    "build": "backstage-cli build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index ceb549014a..350d8ff267 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index a7227a2e7f..97007c3998 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin-module"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index 767ec5a9c2..c1e37aa4ce 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin-module"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 82af4f79df..8598d1befe 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -14,13 +14,13 @@
     "role": "node-library"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/search-common": "^0.2.2",
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 9cde417263..00dad48f70 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -14,13 +14,13 @@
     "role": "backend-plugin"
   },
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 8c2664c604..1c03faa5f9 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -23,14 +23,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 03489c166f..b833c1b235 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -25,14 +25,14 @@
     "sentry"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index 9fafc63e4a..4f250e668e 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 149219eb38..a61e721fef 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -26,14 +26,14 @@
     "sonarcloud"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 38f57bb727..23b345390c 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -24,14 +24,14 @@
     "splunk-on-call"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/tech-insights-backend-module-jsonfc/package.json b/plugins/tech-insights-backend-module-jsonfc/package.json
index 53c059e9bf..c446d745d1 100644
--- a/plugins/tech-insights-backend-module-jsonfc/package.json
+++ b/plugins/tech-insights-backend-module-jsonfc/package.json
@@ -25,13 +25,13 @@
     "scorecard"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/tech-insights-backend/package.json b/plugins/tech-insights-backend/package.json
index 67484263b7..d7f0e80963 100644
--- a/plugins/tech-insights-backend/package.json
+++ b/plugins/tech-insights-backend/package.json
@@ -25,13 +25,13 @@
     "reporting"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/tech-insights-common/package.json b/plugins/tech-insights-common/package.json
index bc77a4b1f5..b7c02e979a 100644
--- a/plugins/tech-insights-common/package.json
+++ b/plugins/tech-insights-common/package.json
@@ -25,12 +25,12 @@
   ],
   "scripts": {
     "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@types/luxon": "^2.0.5",
diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json
index c9e115db92..c439231e02 100644
--- a/plugins/tech-insights-node/package.json
+++ b/plugins/tech-insights-node/package.json
@@ -24,13 +24,13 @@
     "tech-insights"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index e002bf6a3a..194d2141a2 100644
--- a/plugins/tech-insights/package.json
+++ b/plugins/tech-insights/package.json
@@ -13,14 +13,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 7ac2531d6d..8e7dfc2b13 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean",
-    "start": "backstage-cli plugin:serve"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 47479a44a0..981bc4d93d 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -25,13 +25,13 @@
     "techdocs"
   ],
   "scripts": {
-    "start": "backstage-cli backend:dev",
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "start": "backstage-cli script start",
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index ac5cdbdde1..917cff9c39 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -25,14 +25,14 @@
     "techdocs"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index 1239aa6cc3..7572522090 100644
--- a/plugins/todo-backend/package.json
+++ b/plugins/todo-backend/package.json
@@ -20,12 +20,13 @@
     "directory": "plugins/todo-backend"
   },
   "scripts": {
-    "build": "backstage-cli backend:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "build": "backstage-cli script build",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean",
+    "start": "backstage-cli script start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 3825f5cbfc..ad17d1ca51 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -20,14 +20,14 @@
     "directory": "plugins/todo"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 1109fe7125..a5521cd8e9 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -24,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index e8e67e02bf..a547c752c3 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -14,14 +14,14 @@
     "role": "frontend-plugin"
   },
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "start": "backstage-cli plugin:serve",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli script build",
+    "start": "backstage-cli script start",
+    "lint": "backstage-cli script lint",
+    "test": "backstage-cli script test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli script prepack",
+    "postpack": "backstage-cli script postpack",
+    "clean": "backstage-cli script clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",