diff --git a/.changeset/chatty-walls-judge.md b/.changeset/chatty-walls-judge.md
new file mode 100644
index 0000000000..72e636e026
--- /dev/null
+++ b/.changeset/chatty-walls-judge.md
@@ -0,0 +1,123 @@
+---
+'@backstage/app-defaults': patch
+'@backstage/backend-common': patch
+'@backstage/backend-tasks': patch
+'@backstage/backend-test-utils': patch
+'@backstage/catalog-client': patch
+'@backstage/catalog-model': patch
+'@backstage/cli': patch
+'@backstage/cli-common': patch
+'@backstage/codemods': patch
+'@backstage/config': patch
+'@backstage/config-loader': patch
+'@backstage/core-app-api': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/create-app': patch
+'@backstage/dev-utils': patch
+'@backstage/errors': patch
+'@backstage/integration': patch
+'@backstage/integration-react': patch
+'@backstage/release-manifests': patch
+'@backstage/search-common': patch
+'@techdocs/cli': patch
+'@backstage/techdocs-common': patch
+'@backstage/test-utils': patch
+'@backstage/theme': patch
+'@backstage/types': patch
+'@backstage/version-bridge': patch
+'@backstage/plugin-airbrake': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-apache-airflow': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-app-backend': patch
+'@backstage/plugin-auth-backend': patch
+'@backstage/plugin-auth-node': patch
+'@backstage/plugin-azure-devops': patch
+'@backstage/plugin-azure-devops-backend': patch
+'@backstage/plugin-azure-devops-common': patch
+'@backstage/plugin-badges': patch
+'@backstage/plugin-badges-backend': patch
+'@backstage/plugin-bazaar': patch
+'@backstage/plugin-bazaar-backend': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-backend-module-ldap': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-catalog-common': patch
+'@backstage/plugin-catalog-graph': patch
+'@backstage/plugin-catalog-graphql': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-cicd-statistics': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-code-coverage': patch
+'@backstage/plugin-code-coverage-backend': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-cost-insights': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-explore-react': patch
+'@backstage/plugin-firehydrant': patch
+'@backstage/plugin-fossa': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-gocd': patch
+'@backstage/plugin-graphiql': patch
+'@backstage/plugin-graphql-backend': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-jenkins-backend': patch
+'@backstage/plugin-kafka': patch
+'@backstage/plugin-kafka-backend': patch
+'@backstage/plugin-kubernetes': patch
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-kubernetes-common': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-newrelic': patch
+'@backstage/plugin-newrelic-dashboard': patch
+'@backstage/plugin-org': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-permission-common': patch
+'@backstage/plugin-permission-node': patch
+'@backstage/plugin-permission-react': patch
+'@backstage/plugin-proxy-backend': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-rollbar-backend': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+'@backstage/plugin-scaffolder-backend-module-yeoman': patch
+'@backstage/plugin-scaffolder-common': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-search-backend-node': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-sonarqube': patch
+'@backstage/plugin-splunk-on-call': patch
+'@backstage/plugin-tech-insights': patch
+'@backstage/plugin-tech-insights-backend': patch
+'@backstage/plugin-tech-insights-backend-module-jsonfc': patch
+'@backstage/plugin-tech-insights-common': patch
+'@backstage/plugin-tech-insights-node': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-techdocs-backend': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-todo-backend': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/plugin-xcmetrics': patch
+---
+
+Added `backstage.role` to `package.json`
diff --git a/.changeset/polite-bulldogs-repeat.md b/.changeset/polite-bulldogs-repeat.md
new file mode 100644
index 0000000000..c4e3babe30
--- /dev/null
+++ b/.changeset/polite-bulldogs-repeat.md
@@ -0,0 +1,17 @@
+---
+'@backstage/cli': patch
+---
+
+Several changes were made to the new experimental package roles system. Unless you have been experimenting with using this new system, these changes have no affect on your project.
+
+Renamed the `backstage-cli migrate package-role` command to `backstage-cli migrate package-roles`.
+
+Updated the package role definitions by renaming `app` to `frontend`, `plugin-frontend` to `frontend-plugin`, `plugin-frontend-module` to `frontend-plugin-module`, `plugin-backend` to `backend-plugin`, and `plugin-backend-module` to `backend-plugin-module`
+
+The `backstage-cli migrate package-scripts` received several tweaks to make it more accurate. It now tries to maintain existing script arguments, like `--config` parameters for `build` and `start` scripts.
+
+The `script` command category has been renamed to `package`.
+
+The `backstage-cli package build` command set an incorrect target directory for `app` and `backend` packages, which has been fixed.
+
+The `backend:bundle` and `repo build` command for the `backend` role was previously ignoring building of bundled packages that had migrated to use package roles and the standard build script, this has now been fixed.
diff --git a/.changeset/tender-meals-move.md b/.changeset/tender-meals-move.md
new file mode 100644
index 0000000000..03721b37b1
--- /dev/null
+++ b/.changeset/tender-meals-move.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+The `test` command now automatically adds `--passWithNoTests` to the Jest invocation. To revert this behavior, pass `--passWithNoTests=false` or `--no-passWithNoTests`.
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index c7cb87faa4..09c5af2b1c 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/packages/app/package.json b/packages/app/package.json
index c344f78f5d..e853597e9e 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -2,6 +2,9 @@
   "name": "example-app",
   "version": "0.2.64",
   "private": true,
+  "backstage": {
+    "role": "frontend"
+  },
   "bundled": true,
   "dependencies": {
     "@backstage/app-defaults": "^0.1.7",
@@ -89,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 package start",
+    "build": "backstage-cli package build",
+    "clean": "backstage-cli package clean",
+    "test": "backstage-cli package 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 package lint",
     "cy:dev": "cypress open",
     "cy:run": "cypress run"
   },
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 13a34a1d81..2d33daa4d3 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -11,6 +11,9 @@
     "types": "dist/index.d.ts",
     "alphaTypes": "dist/index.alpha.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build --experimental-type-build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.6",
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index 364f1d1380..eca6f64f81 100644
--- a/packages/backend-tasks/package.json
+++ b/packages/backend-tasks/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package 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 8a9767b292..21ff0afc4b 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 35b234aeda..41972c15d2 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -5,6 +5,9 @@
   "types": "src/index.ts",
   "license": "Apache-2.0",
   "private": true,
+  "backstage": {
+    "role": "backend"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -15,12 +18,12 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli backend:bundle",
+    "build": "backstage-cli package 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 package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 3a45a74680..eb24c3100c 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 62e577df4a..9cc8807a29 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -13,6 +13,9 @@
     "types": "dist/index.d.ts",
     "alphaTypes": "dist/index.alpha.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -23,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 package build --experimental-type-build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index cdb4b01b6d..5d259ce2f3 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "devDependencies": {
     "@types/jest": "^26.0.7",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 589ac58646..c39cf261aa 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -6,6 +6,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "backstage": {
+    "role": "cli"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -18,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
     "start": "nodemon --"
   },
   "bin": {
diff --git a/packages/cli/src/commands/build/buildBackend.ts b/packages/cli/src/commands/build/buildBackend.ts
index e32b7956db..0768728f00 100644
--- a/packages/cli/src/commands/build/buildBackend.ts
+++ b/packages/cli/src/commands/build/buildBackend.ts
@@ -49,19 +49,20 @@ export async function buildBackend(options: BuildBackendOptions) {
 
     // We built the target backend package using the regular build process, but the result of
     // that has now been packed into the dist workspace, so clean up the dist dir.
-    await fs.remove(targetDir);
-    await fs.mkdir(targetDir);
+    const distDir = resolvePath(targetDir, 'dist');
+    await fs.remove(distDir);
+    await fs.mkdir(distDir);
 
     // Move out skeleton.tar.gz before we create the main bundle, no point having that included up twice.
     await fs.move(
       resolvePath(tmpDir, SKELETON_FILE),
-      resolvePath(targetDir, SKELETON_FILE),
+      resolvePath(distDir, SKELETON_FILE),
     );
 
     // Create main bundle.tar.gz, with some tweaks to make it more likely hit Docker build cache.
     await tar.create(
       {
-        file: resolvePath(targetDir, BUNDLE_FILE),
+        file: resolvePath(distDir, BUNDLE_FILE),
         cwd: tmpDir,
         portable: true,
         noMtime: true,
diff --git a/packages/cli/src/commands/build/buildApp.ts b/packages/cli/src/commands/build/buildFrontend.ts
similarity index 95%
rename from packages/cli/src/commands/build/buildApp.ts
rename to packages/cli/src/commands/build/buildFrontend.ts
index b0959b2d6a..6d7ca2e6a9 100644
--- a/packages/cli/src/commands/build/buildApp.ts
+++ b/packages/cli/src/commands/build/buildFrontend.ts
@@ -26,7 +26,7 @@ interface BuildAppOptions {
   configPaths: string[];
 }
 
-export async function buildApp(options: BuildAppOptions) {
+export async function buildFrontend(options: BuildAppOptions) {
   const { targetDir, writeStats, configPaths } = options;
   const { name } = await fs.readJson(resolvePath(targetDir, 'package.json'));
   await buildBundle({
diff --git a/packages/cli/src/commands/build/command.ts b/packages/cli/src/commands/build/command.ts
index 1189883b12..5c8065dbb4 100644
--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -18,22 +18,22 @@ import { Command } from 'commander';
 import { buildPackage, Output } from '../../lib/builder';
 import { findRoleFromCommand, getRoleInfo } from '../../lib/role';
 import { paths } from '../../lib/paths';
-import { buildApp } from './buildApp';
+import { buildFrontend } from './buildFrontend';
 import { buildBackend } from './buildBackend';
 
 export async function command(cmd: Command): Promise<void> {
   const role = await findRoleFromCommand(cmd);
 
-  if (role === 'app') {
-    return buildApp({
-      targetDir: paths.resolveTarget('dist'),
+  if (role === 'frontend') {
+    return buildFrontend({
+      targetDir: paths.targetDir,
       configPaths: cmd.config as string[],
       writeStats: Boolean(cmd.stats),
     });
   }
   if (role === 'backend') {
     return buildBackend({
-      targetDir: paths.resolveTarget('dist'),
+      targetDir: paths.targetDir,
       skipBuildDependencies: Boolean(cmd.skipBuildDependencies),
     });
   }
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index 6f534d3e62..d3baa37b3f 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -61,14 +61,17 @@ export function registerRepoCommand(program: CommanderStatic) {
 
 export function registerScriptCommand(program: CommanderStatic) {
   const command = program
-    .command('script [command]', { hidden: true })
-    .description('Lifecycle scripts for Backstage packages [EXPERIMENTAL]');
+    .command('package [command]', { hidden: true })
+    .description('Lifecycle scripts for individual packages [EXPERIMENTAL]');
 
   command
     .command('start')
     .description('Start a package for local development')
     .option(...configOption)
-    .option('--role <name>', 'Run the command with an explicit package role')
+    .option(
+      '--role <name>',
+      'Run the command with an explicit package role [EXPERIMENTAL]',
+    )
     .option('--check', 'Enable type checking and linting if available')
     .option('--inspect', 'Enable debugger in Node.js environments')
     .option(
@@ -80,6 +83,10 @@ export function registerScriptCommand(program: CommanderStatic) {
   command
     .command('build')
     .description('Build a package for production deployment or publishing')
+    .option(
+      '--role <name>',
+      'Run the command with an explicit package role [EXPERIMENTAL]',
+    )
     .option(
       '--minify',
       'Minify the generated code. Does not apply to app or backend packages.',
@@ -104,7 +111,7 @@ export function registerScriptCommand(program: CommanderStatic) {
     )
     .action(lazy(() => import('./build').then(m => m.command)));
 
-  program
+  command
     .command('lint')
     .option(
       '--format <format>',
@@ -115,7 +122,7 @@ export function registerScriptCommand(program: CommanderStatic) {
     .description('Lint a package')
     .action(lazy(() => import('./lint').then(m => m.default)));
 
-  program
+  command
     .command('test')
     .allowUnknownOption(true) // Allows the command to run, but we still need to parse raw args
     .helpOption(', --backstage-cli-help') // Let Jest handle help
@@ -144,7 +151,7 @@ export function registerMigrateCommand(program: CommanderStatic) {
     .description('Migration utilities [EXPERIMENTAL]');
 
   command
-    .command('package-role')
+    .command('package-roles')
     .description(`Add package role field to packages that don't have it`)
     .action(lazy(() => import('./migrate/packageRole').then(m => m.default)));
 
@@ -157,7 +164,7 @@ export function registerMigrateCommand(program: CommanderStatic) {
 }
 
 export function registerCommands(program: CommanderStatic) {
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('app:build')
     .description('Build an app for a production release')
@@ -165,7 +172,7 @@ export function registerCommands(program: CommanderStatic) {
     .option(...configOption)
     .action(lazy(() => import('./app/build').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('app:serve')
     .description('Serve an app for local development')
@@ -173,7 +180,7 @@ export function registerCommands(program: CommanderStatic) {
     .option(...configOption)
     .action(lazy(() => import('./app/serve').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('backend:build')
     .description('Build a backend plugin')
@@ -181,7 +188,7 @@ export function registerCommands(program: CommanderStatic) {
     .option('--experimental-type-build', 'Enable experimental type build')
     .action(lazy(() => import('./backend/build').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('backend:bundle')
     .description('Bundle the backend into a deployment archive')
@@ -191,7 +198,7 @@ export function registerCommands(program: CommanderStatic) {
     )
     .action(lazy(() => import('./backend/bundle').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('backend:dev')
     .description('Start local development server with HMR for the backend')
@@ -240,7 +247,7 @@ export function registerCommands(program: CommanderStatic) {
       lazy(() => import('./create-plugin/createPlugin').then(m => m.default)),
     );
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('plugin:build')
     .description('Build a plugin')
@@ -248,7 +255,7 @@ export function registerCommands(program: CommanderStatic) {
     .option('--experimental-type-build', 'Enable experimental type build')
     .action(lazy(() => import('./plugin/build').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('plugin:serve')
     .description('Serves the dev/ folder of a plugin')
@@ -263,7 +270,7 @@ export function registerCommands(program: CommanderStatic) {
     .description('Diff an existing plugin with the creation template')
     .action(lazy(() => import('./plugin/diff').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('build')
     .description('Build a package for publishing')
@@ -272,7 +279,7 @@ export function registerCommands(program: CommanderStatic) {
     .option('--experimental-type-build', 'Enable experimental type build')
     .action(lazy(() => import('./oldBuild').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('lint')
     .option(
@@ -284,7 +291,7 @@ export function registerCommands(program: CommanderStatic) {
     .description('Lint a package')
     .action(lazy(() => import('./lint').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('test')
     .allowUnknownOption(true) // Allows the command to run, but we still need to parse raw args
@@ -370,19 +377,19 @@ export function registerCommands(program: CommanderStatic) {
     .description('Check Backstage package versioning')
     .action(lazy(() => import('./versions/lint').then(m => m.default)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('prepack')
     .description('Prepares a package for packaging before publishing')
     .action(lazy(() => import('./pack').then(m => m.pre)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('postpack')
     .description('Restores the changes made by the prepack command')
     .action(lazy(() => import('./pack').then(m => m.post)));
 
-  // TODO(Rugvip): Deprecate in favor of script variant
+  // TODO(Rugvip): Deprecate in favor of package variant
   program
     .command('clean')
     .description('Delete cache directories')
diff --git a/packages/cli/src/commands/migrate/packageScripts.ts b/packages/cli/src/commands/migrate/packageScripts.ts
index a3fdd20018..c7dab9466b 100644
--- a/packages/cli/src/commands/migrate/packageScripts.ts
+++ b/packages/cli/src/commands/migrate/packageScripts.ts
@@ -19,6 +19,8 @@ import { resolve as resolvePath } from 'path';
 import { PackageGraph } from '../../lib/monorepo';
 import { getRoleFromPackage, getRoleInfo, PackageRole } from '../../lib/role';
 
+const configArgPattern = /--config[=\s][^\s$]+/;
+
 const noStartRoles: PackageRole[] = ['cli', 'common-library'];
 
 export async function command() {
@@ -33,17 +35,52 @@ export async function command() {
 
       const roleInfo = getRoleInfo(role);
       const hasStart = !noStartRoles.includes(role);
-      const isBundled = roleInfo.output.includes('bundle');
+      const needsPack = !(roleInfo.output.includes('bundle') || role === 'cli');
+      const scripts = packageJson.scripts ?? {};
+
+      const startCmd = ['start'];
+      if (scripts.start?.includes('--check')) {
+        startCmd.push('--check');
+      }
+      if (scripts.start?.includes('--config')) {
+        startCmd.push(...(scripts.start.match(configArgPattern) ?? []));
+      }
+
+      const buildCmd = ['build'];
+      if (scripts.build?.includes('--minify')) {
+        buildCmd.push('--minify');
+      }
+      if (scripts.build?.includes('--experimental-type-build')) {
+        buildCmd.push('--experimental-type-build');
+      }
+      if (scripts.build?.includes('--config')) {
+        buildCmd.push(...(scripts.build.match(configArgPattern) ?? []));
+      }
+
+      // For test scripts we keep all existing flags except for --passWithNoTests, since that's now default
+      const testCmd = ['test'];
+      if (scripts.test?.startsWith('backstage-cli test')) {
+        const args = scripts.test
+          .slice('backstage-cli test'.length)
+          .split(' ')
+          .filter(Boolean);
+        if (args.includes('--passWithNoTests')) {
+          args.splice(args.indexOf('--passWithNoTests'), 1);
+        }
+        testCmd.push(...args);
+      }
 
       const expectedScripts = {
-        ...(hasStart && { start: 'backstage-cli script start' }),
-        build: 'backstage-cli script build',
-        lint: 'backstage-cli script lint',
-        test: 'backstage-cli script test',
-        clean: 'backstage-cli script clean',
-        ...(!isBundled && {
-          postpack: 'backstage-cli script postpack',
-          prepack: 'backstage-cli script prepack',
+        ...(hasStart && {
+          start: `backstage-cli package ${startCmd.join(' ')}`,
+        }),
+        build: `backstage-cli package ${buildCmd.join(' ')}`,
+        lint: 'backstage-cli package lint',
+        test: `backstage-cli package ${testCmd.join(' ')}`,
+        clean: 'backstage-cli package clean',
+        ...(needsPack && {
+          postpack: 'backstage-cli package postpack',
+          prepack: 'backstage-cli package prepack',
         }),
       };
 
@@ -52,7 +89,12 @@ export async function command() {
         (packageJson.scripts = packageJson.scripts || {});
 
       for (const [name, value] of Object.entries(expectedScripts)) {
-        if (currentScripts[name] !== value) {
+        const currentScript = currentScripts[name];
+
+        const isMissing = !currentScript;
+        const isDifferent = currentScript !== value;
+        const isBackstageScript = currentScript?.includes('backstage-cli');
+        if (isMissing || (isDifferent && isBackstageScript)) {
           changed = true;
           currentScripts[name] = value;
         }
diff --git a/packages/cli/src/commands/repo/build.ts b/packages/cli/src/commands/repo/build.ts
index 9c32386304..ceb468ebfa 100644
--- a/packages/cli/src/commands/repo/build.ts
+++ b/packages/cli/src/commands/repo/build.ts
@@ -23,7 +23,7 @@ import { ExtendedPackage } from '../../lib/monorepo/PackageGraph';
 import { runParallelWorkers } from '../../lib/parallel';
 import { paths } from '../../lib/paths';
 import { detectRoleFromPackage } from '../../lib/role';
-import { buildApp } from '../build/buildApp';
+import { buildFrontend } from '../build/buildFrontend';
 import { buildBackend } from '../build/buildBackend';
 
 function createScriptOptionsParser(anyCmd: Command, commandPath: string[]) {
@@ -43,7 +43,9 @@ function createScriptOptionsParser(anyCmd: Command, commandPath: string[]) {
   }
 
   if (!targetCmd) {
-    throw new Error(`Could not find script command '${commandPath.join(' ')}'`);
+    throw new Error(
+      `Could not find package command '${commandPath.join(' ')}'`,
+    );
   }
   const cmd = targetCmd;
 
@@ -80,7 +82,7 @@ export async function command(cmd: Command): Promise<void> {
   const apps = new Array<ExtendedPackage>();
   const backends = new Array<ExtendedPackage>();
 
-  const parseBuildScript = createScriptOptionsParser(cmd, ['script', 'build']);
+  const parseBuildScript = createScriptOptionsParser(cmd, ['package', 'build']);
 
   const options = packages.flatMap(pkg => {
     const role =
@@ -90,7 +92,7 @@ export async function command(cmd: Command): Promise<void> {
       return [];
     }
 
-    if (role === 'app') {
+    if (role === 'frontend') {
       apps.push(pkg);
       return [];
     } else if (role === 'backend') {
@@ -137,7 +139,7 @@ export async function command(cmd: Command): Promise<void> {
           );
           return;
         }
-        await buildApp({
+        await buildFrontend({
           targetDir: pkg.dir,
           configPaths: (buildOptions.config as string[]) ?? [],
           writeStats: Boolean(buildOptions.stats),
diff --git a/packages/cli/src/commands/start/command.ts b/packages/cli/src/commands/start/command.ts
index 6615d5fd46..7a11028800 100644
--- a/packages/cli/src/commands/start/command.ts
+++ b/packages/cli/src/commands/start/command.ts
@@ -31,19 +31,19 @@ export async function command(cmd: Command): Promise<void> {
 
   switch (role) {
     case 'backend':
-    case 'plugin-backend':
-    case 'plugin-backend-module':
+    case 'backend-plugin':
+    case 'backend-plugin-module':
     case 'node-library':
       return startBackend(options);
-    case 'app':
+    case 'frontend':
       return startFrontend({
         ...options,
         entry: 'src/index',
         verifyVersions: true,
       });
     case 'web-library':
-    case 'plugin-frontend':
-    case 'plugin-frontend-module':
+    case 'frontend-plugin':
+    case 'frontend-plugin-module':
       return startFrontend({ entry: 'dev/index', ...options });
     default:
       throw new Error(
diff --git a/packages/cli/src/commands/testCommand.ts b/packages/cli/src/commands/testCommand.ts
index 24a4e06f9e..7165b20925 100644
--- a/packages/cli/src/commands/testCommand.ts
+++ b/packages/cli/src/commands/testCommand.ts
@@ -29,7 +29,11 @@ function includesAnyOf(hayStack: string[], ...needles: string[]) {
 
 export default async (cmd: Command) => {
   // all args are forwarded to jest
-  const rawArgs = cmd.parent.rawArgs as string[];
+  let parent = cmd;
+  while (parent.parent) {
+    parent = parent.parent;
+  }
+  const rawArgs = parent.rawArgs as string[];
   const args = rawArgs.slice(rawArgs.indexOf('test') + 1);
 
   // Only include our config if caller isn't passing their own config
@@ -37,6 +41,10 @@ export default async (cmd: Command) => {
     args.push('--config', paths.resolveOwn('config/jest.js'));
   }
 
+  if (!includesAnyOf(args, '--no-passWithNoTests', '--passWithNoTests=false')) {
+    args.push('--passWithNoTests');
+  }
+
   // Run in watch mode unless in CI, coverage mode, or running all tests
   if (
     !process.env.CI &&
diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts
index 5bd90e3d22..55e9cddd3d 100644
--- a/packages/cli/src/lib/diff/handlers.ts
+++ b/packages/cli/src/lib/diff/handlers.ts
@@ -173,6 +173,14 @@ class PackageJsonHandler {
       return;
     }
 
+    // Skip diffing package scripts that have been migrated to the new commands
+    const hasNewScript = Object.values(targetScripts).some(script =>
+      String(script).includes('backstage-cli package '),
+    );
+    if (hasNewScript) {
+      return;
+    }
+
     for (const key of Object.keys(pkgScripts)) {
       await this.syncField(key, pkgScripts, targetScripts, 'scripts');
     }
diff --git a/packages/cli/src/lib/packager/createDistWorkspace.ts b/packages/cli/src/lib/packager/createDistWorkspace.ts
index 15ccda30c2..bce6c5c14c 100644
--- a/packages/cli/src/lib/packager/createDistWorkspace.ts
+++ b/packages/cli/src/lib/packager/createDistWorkspace.ts
@@ -38,6 +38,7 @@ import {
   Output,
 } from '../builder';
 import { copyPackageDist } from './copyPackageDist';
+import { getRoleInfo } from '../role';
 
 // These packages aren't safe to pack in parallel since the CLI depends on them
 const UNSAFE_PACKAGES = [
@@ -131,7 +132,9 @@ export async function createDistWorkspace(
       }
       const role = pkg.packageJson.backstage?.role;
       if (!role) {
-        console.warn(`Ignored ${pkg.packageJson.name} because it has no role`);
+        console.warn(
+          `Building ${pkg.packageJson.name} separately because it has no role`,
+        );
         customBuild.push(pkg.packageJson.name);
         continue;
       }
@@ -142,9 +145,17 @@ export async function createDistWorkspace(
         continue;
       }
 
-      if (!buildScript.startsWith('backstage-cli script build')) {
+      if (!buildScript.startsWith('backstage-cli package build')) {
         console.warn(
-          `Ignored ${pkg.packageJson.name} because it has a custom build script, '${buildScript}'`,
+          `Building ${pkg.packageJson.name} separately because it has a custom build script, '${buildScript}'`,
+        );
+        customBuild.push(pkg.packageJson.name);
+        continue;
+      }
+
+      if (getRoleInfo(role).output.includes('bundle')) {
+        console.warn(
+          `Building ${pkg.packageJson.name} separately because it is a bundled package`,
         );
         customBuild.push(pkg.packageJson.name);
         continue;
@@ -216,7 +227,7 @@ export async function createDistWorkspace(
 const FAST_PACK_SCRIPTS = [
   undefined,
   'backstage-cli prepack',
-  'backstage-cli script prepack',
+  'backstage-cli package prepack',
 ];
 
 async function moveToDistWorkspace(
diff --git a/packages/cli/src/lib/role/packageRoles.test.ts b/packages/cli/src/lib/role/packageRoles.test.ts
index f6c9fb418a..759be462d2 100644
--- a/packages/cli/src/lib/role/packageRoles.test.ts
+++ b/packages/cli/src/lib/role/packageRoles.test.ts
@@ -31,8 +31,8 @@ describe('getRoleInfo', () => {
       output: ['types', 'esm'],
     });
 
-    expect(getRoleInfo('app')).toEqual({
-      role: 'app',
+    expect(getRoleInfo('frontend')).toEqual({
+      role: 'frontend',
       platform: 'web',
       output: ['bundle'],
     });
@@ -56,10 +56,10 @@ describe('getRoleFromPackage', () => {
     expect(
       getRoleFromPackage({
         backstage: {
-          role: 'app',
+          role: 'frontend',
         },
       }),
-    ).toEqual('app');
+    ).toEqual('frontend');
 
     expect(() =>
       getRoleFromPackage({
@@ -135,7 +135,7 @@ describe('detectRoleFromPackage', () => {
           'cy:run': 'cypress run',
         },
       }),
-    ).toEqual('app');
+    ).toEqual('frontend');
   });
 
   it('detects the role of example-backend', () => {
@@ -180,7 +180,7 @@ describe('detectRoleFromPackage', () => {
           clean: 'backstage-cli clean',
         },
       }),
-    ).toEqual('plugin-frontend');
+    ).toEqual('frontend-plugin');
   });
 
   it('detects the role of @backstage/plugin-catalog-backend', () => {
@@ -204,7 +204,7 @@ describe('detectRoleFromPackage', () => {
           clean: 'backstage-cli clean',
         },
       }),
-    ).toEqual('plugin-backend');
+    ).toEqual('backend-plugin');
   });
 
   it('detects the role of @backstage/plugin-catalog-react', () => {
@@ -274,7 +274,7 @@ describe('detectRoleFromPackage', () => {
           clean: 'backstage-cli clean',
         },
       }),
-    ).toEqual('plugin-backend-module');
+    ).toEqual('backend-plugin-module');
   });
 
   it('detects the role of @backstage/plugin-permission-node', () => {
@@ -323,6 +323,6 @@ describe('detectRoleFromPackage', () => {
           clean: 'backstage-cli clean',
         },
       }),
-    ).toEqual('plugin-frontend-module');
+    ).toEqual('frontend-plugin-module');
   });
 });
diff --git a/packages/cli/src/lib/role/packageRoles.ts b/packages/cli/src/lib/role/packageRoles.ts
index 7c855ee0fd..a33a7d715a 100644
--- a/packages/cli/src/lib/role/packageRoles.ts
+++ b/packages/cli/src/lib/role/packageRoles.ts
@@ -22,7 +22,7 @@ import { PackageRole, PackageRoleInfo } from './types';
 
 const packageRoleInfos: PackageRoleInfo[] = [
   {
-    role: 'app',
+    role: 'frontend',
     platform: 'web',
     output: ['bundle'],
   },
@@ -52,22 +52,22 @@ const packageRoleInfos: PackageRoleInfo[] = [
     output: ['types', 'esm', 'cjs'],
   },
   {
-    role: 'plugin-frontend',
+    role: 'frontend-plugin',
     platform: 'web',
     output: ['types', 'esm'],
   },
   {
-    role: 'plugin-frontend-module',
+    role: 'frontend-plugin-module',
     platform: 'web',
     output: ['types', 'esm'],
   },
   {
-    role: 'plugin-backend',
+    role: 'backend-plugin',
     platform: 'node',
     output: ['types', 'cjs'],
   },
   {
-    role: 'plugin-backend-module',
+    role: 'backend-plugin-module',
     platform: 'node',
     output: ['types', 'cjs'],
   },
@@ -147,22 +147,22 @@ export function detectRoleFromPackage(
   const pkg = detectionSchema.parse(pkgJson);
 
   if (pkg.scripts?.start?.includes('app:serve')) {
-    return 'app';
+    return 'frontend';
   }
   if (pkg.scripts?.build?.includes('backend:bundle')) {
     return 'backend';
   }
   if (pkg.name?.includes('plugin-') && pkg.name?.includes('-backend-module-')) {
-    return 'plugin-backend-module';
+    return 'backend-plugin-module';
   }
   if (pkg.name?.includes('plugin-') && pkg.name?.includes('-module-')) {
-    return 'plugin-frontend-module';
+    return 'frontend-plugin-module';
   }
   if (pkg.scripts?.start?.includes('plugin:serve')) {
-    return 'plugin-frontend';
+    return 'frontend-plugin';
   }
   if (pkg.scripts?.start?.includes('backend:dev')) {
-    return 'plugin-backend';
+    return 'backend-plugin';
   }
 
   const mainEntry = pkg.publishConfig?.main || pkg.main;
diff --git a/packages/cli/src/lib/role/types.ts b/packages/cli/src/lib/role/types.ts
index 6a89f7bdaf..a3961544f4 100644
--- a/packages/cli/src/lib/role/types.ts
+++ b/packages/cli/src/lib/role/types.ts
@@ -15,16 +15,16 @@
  */
 
 export type PackageRole =
-  | 'app'
+  | 'frontend'
   | 'backend'
   | 'cli'
   | 'web-library'
   | 'node-library'
   | 'common-library'
-  | 'plugin-frontend'
-  | 'plugin-frontend-module'
-  | 'plugin-backend'
-  | 'plugin-backend-module';
+  | 'frontend-plugin'
+  | 'frontend-plugin-module'
+  | 'backend-plugin'
+  | 'backend-plugin-module';
 
 export type PackagePlatform = 'node' | 'web' | 'common';
 export type PackageOutputType = 'bundle' | 'types' | 'esm' | 'cjs';
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index dc1fe6a537..eef854868c 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -7,6 +7,9 @@
     "access": "public",
     "main": "dist/index.cjs.js"
   },
+  "backstage": {
+    "role": "cli"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -20,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "prepack": "backstage-cli prepack",
     "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "clean": "backstage-cli package clean"
   },
   "bin": {
     "backstage-codemods": "bin/backstage-codemods"
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index b374a02fbf..22323643b0 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -9,6 +9,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/cli-common": "^0.1.6",
diff --git a/packages/config/package.json b/packages/config/package.json
index 02c63af2b5..b3cbc14988 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -9,6 +9,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/types": "^0.1.1",
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 04e87b5d0c..b23eedd7c9 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index ecb910c50b..e7d92b3c26 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 47d880b974..b4b94fbe7e 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 4ab263abfd..fc1ccc1803 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -6,6 +6,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "backstage": {
+    "role": "cli"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package 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 9d55d17592..40f6eef595 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/app-defaults": "^0.1.7",
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index bbf55fac17..bbbeed2312 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -3,6 +3,9 @@
   "description": "E2E test for verifying Backstage packages",
   "version": "0.2.0",
   "private": true,
+  "backstage": {
+    "role": "cli"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -16,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 package lint",
+    "test": "backstage-cli package test",
+    "test:e2e": "yarn start",
+    "build": "backstage-cli package build",
+    "clean": "backstage-cli package clean"
   },
   "bin": {
     "e2e-test": "bin/e2e-test"
diff --git a/packages/errors/package.json b/packages/errors/package.json
index f97adef8e1..17d32d7cd9 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/types": "^0.1.1",
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 8413442b3d..ce7c402c77 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -11,14 +11,17 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/integration/package.json b/packages/integration/package.json
index d6d0edd77a..be6a5e6a87 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/release-manifests/package.json b/packages/release-manifests/package.json
index 8ddbb73bca..a8990be2f0 100644
--- a/packages/release-manifests/package.json
+++ b/packages/release-manifests/package.json
@@ -11,6 +11,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "cross-fetch": "^3.1.5"
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index 10b03ab663..d4df8921f7 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -25,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 975bfef43b..10b329ac80 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -2,6 +2,9 @@
   "name": "techdocs-cli-embedded-app",
   "version": "0.2.63",
   "private": true,
+  "backstage": {
+    "role": "frontend"
+  },
   "bundled": true,
   "dependencies": {
     "@backstage/app-defaults": "^0.1.7",
@@ -39,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 package start --config ./app-config.yaml",
+    "build": "backstage-cli package build --config ./app-config.yaml",
+    "clean": "backstage-cli package clean",
+    "test": "backstage-cli package test",
+    "lint": "backstage-cli package 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 19514b63d2..647ce6bdea 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -6,6 +6,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "backstage": {
+    "role": "cli"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "clean": "backstage-cli package clean",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package 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 f45f842100..fd2e34b413 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -25,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 67b68e08cc..efde532268 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 2846db2805..24529d8c0d 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start",
+    "test": "backstage-cli package test"
   },
   "dependencies": {
     "@material-ui/core": "^4.12.2"
diff --git a/packages/types/package.json b/packages/types/package.json
index ae18fe519d..84237250b4 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {},
   "devDependencies": {
diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json
index 6989aec3cf..cdf0858d38 100644
--- a/packages/version-bridge/package.json
+++ b/packages/version-bridge/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "peerDependencies": {
     "@types/react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json
index a914013d77..40735c91ca 100644
--- a/plugins/airbrake/package.json
+++ b/plugins/airbrake/package.json
@@ -9,15 +9,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 5ea3129746..767d4c5cf1 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -11,15 +11,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 0b0c3a6cdc..c82ad9eefc 100644
--- a/plugins/analytics-module-ga/package.json
+++ b/plugins/analytics-module-ga/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json
index e36e925fcb..7f740efcf5 100644
--- a/plugins/apache-airflow/package.json
+++ b/plugins/apache-airflow/package.json
@@ -9,15 +9,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 3b92cdf17e..7a0d04e85c 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -20,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 52da00fed3..d04afa6874 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 5d40523895..84ba85e8a9 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/plugin-auth-node": "^0.1.0",
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 4e059c5e19..83b4a45d71 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -10,13 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package 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 a87a48046e..1264cbe069 100644
--- a/plugins/azure-devops-backend/package.json
+++ b/plugins/azure-devops-backend/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 02faebca61..fa1bb87d16 100644
--- a/plugins/azure-devops-common/package.json
+++ b/plugins/azure-devops-common/package.json
@@ -11,6 +11,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "devDependencies": {
     "@backstage/cli": "^0.13.2-next.0"
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index a34686d856..8aa97a85ab 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -17,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index b5fc38f289..f8b2a75a3a 100644
--- a/plugins/badges-backend/package.json
+++ b/plugins/badges-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 5250318164..5fe0eb14b8 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -17,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json
index 71980acea4..728a1a3ac6 100644
--- a/plugins/bazaar-backend/package.json
+++ b/plugins/bazaar-backend/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index bfdcb18ca3..4cc3d72db7 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index 8b50459a84..2ddada7f6b 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 a499049265..315d04252a 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package 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 7fd0a2d319..84bdb9599a 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@azure/msal-node": "^1.1.0",
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index be60857204..e4718afcd0 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 4b94809ed5..5f77133215 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/plugin-permission-common": "^0.4.0"
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 541d21f319..ad7161eb93 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index b757790275..a1920b76a3 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
     "generate:types": "graphql-codegen",
-    "clean": "backstage-cli clean"
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 7ce6f8524f..1e62395e64 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index f63d334be4..967ad8ba0b 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index a2492aaba7..5f6caf65d7 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.6.0",
diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json
index a058917b09..6b9d21753d 100644
--- a/plugins/cicd-statistics/package.json
+++ b/plugins/cicd-statistics/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "devDependencies": {
     "@types/react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 58df662e68..12a313219b 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
     "diff": "backstage-cli plugin:diff",
-    "start": "backstage-cli plugin:serve",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack"
+    "start": "backstage-cli package start",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 7ed6f48f71..6f57c0a0a7 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 c5c77f9873..2148c3cddb 100644
--- a/plugins/code-coverage-backend/package.json
+++ b/plugins/code-coverage-backend/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 49f092bf25..213e64cb3b 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 46e030dbc8..8cfe6b2a6f 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 45178cb475..4b3c93d2a8 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json
index 3da9de5e08..714474ce06 100644
--- a/plugins/explore-react/package.json
+++ b/plugins/explore-react/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/core-plugin-api": "^0.6.0"
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 7cb22f5782..7c76e88a59 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package 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 package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 81272e2b6d..974e3cc9e7 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -11,15 +11,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 53e40aae96..2d9674f0f7 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 079b1d2d71..d8b23960fe 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 381ca0dd24..19e71b3bb8 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index cb112fedb1..a383771924 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -23,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index e4c3e4917c..c8f37f5121 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 1cadbc8d65..851bc2501e 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json
index 86802a43f2..3cefcd9a82 100644
--- a/plugins/gocd/package.json
+++ b/plugins/gocd/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -18,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 185e273c3f..269302f1bb 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -8,6 +8,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://github.com/backstage/backstage/tree/master/plugins/graphiql#readme",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json
index a13a901646..029963cdf6 100644
--- a/plugins/graphql-backend/package.json
+++ b/plugins/graphql-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 80754d33c8..204faa57bd 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://github.com/backstage/backstage/tree/master/plugins/home#readme",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 4c6581553c..5f741b5a49 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
index 52e8862fae..b21fdc794f 100644
--- a/plugins/jenkins-backend/package.json
+++ b/plugins/jenkins-backend/package.json
@@ -11,15 +11,18 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 7b1283cd23..719ed70615 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index 01b23ba696..8a35006feb 100644
--- a/plugins/kafka-backend/package.json
+++ b/plugins/kafka-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -23,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 12dd578daa..eb0ab12232 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index feb6a4defd..9ce1634f83 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -23,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index cd12eb3519..041032f0e1 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -11,6 +11,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -24,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 1a60997405..1d9f9c1821 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 618202b54c..3bb06ac0cf 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,14 +25,14 @@
     "lighthouse"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package 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 package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json
index dba9cc1148..f0b3d29680 100644
--- a/plugins/newrelic-dashboard/package.json
+++ b/plugins/newrelic-dashboard/package.json
@@ -9,15 +9,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 9f9d51eae3..7f0b2e6c26 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 947d5e8a0b..c5a52e14e5 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 7912a32f15..2c9e0bc79d 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index e1a4e10c5c..6b7817f10b 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -9,14 +9,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index d3054fe9fe..a3d099d1a8 100644
--- a/plugins/permission-common/package.json
+++ b/plugins/permission-common/package.json
@@ -10,6 +10,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -27,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index 04a567f16b..1c3e711dfc 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "node-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index ce6e2dbf54..b62a681c06 100644
--- a/plugins/permission-react/package.json
+++ b/plugins/permission-react/package.json
@@ -9,6 +9,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "web-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -19,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 5336bbb098..5b2e9a5713 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -20,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 36683ef66a..bd2c548a3c 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 5767f26c5e..764a4dc036 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 cee138b576..e3386ee7a4 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 5f32dbadd8..edf8c1cc84 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -11,14 +11,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 b2ce1bf571..5a82f2df32 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/config": "^0.1.13",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 3161448562..ff2063bfca 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
     "build:assets": "node scripts/build-nunjucks.js"
   },
   "dependencies": {
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index 6b03a7c884..92e54d87f5 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -12,6 +12,9 @@
     "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -25,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "bugs": {
     "url": "https://github.com/backstage/backstage/issues"
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 0e31d6c4a5..1c9baafd48 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 8a0e0d9d2c..51df462b8a 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 392b9af73a..979d60a9bc 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 e2d83d0f4f..eaa1e171cf 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/search-common": "^0.2.2",
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 117e484c62..db91541ccd 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -10,14 +10,17 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 34baf41306..8832d41332 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -20,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 48137dc5e1..f87f140cb4 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index d3bcb14f15..43a5da6efb 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index fb2de64ffe..40863c7cbd 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -23,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 1bc8948d95..fe0e050209 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 fc2c6b7add..9dfa01769a 100644
--- a/plugins/tech-insights-backend-module-jsonfc/package.json
+++ b/plugins/tech-insights-backend-module-jsonfc/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 5a60e478d8..96f253519e 100644
--- a/plugins/tech-insights-backend/package.json
+++ b/plugins/tech-insights-backend/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package 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 a0b840da74..35e0c956e3 100644
--- a/plugins/tech-insights-common/package.json
+++ b/plugins/tech-insights-common/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "common-library"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@types/luxon": "^2.0.5",
diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json
index 05c6f10071..4290d2fc1b 100644
--- a/plugins/tech-insights-node/package.json
+++ b/plugins/tech-insights-node/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index b7b1b6877c..d364fa3b40 100644
--- a/plugins/tech-insights/package.json
+++ b/plugins/tech-insights/package.json
@@ -9,15 +9,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 29601d1755..590c5cbd78 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,14 +24,14 @@
     "backstage"
   ],
   "scripts": {
-    "build": "backstage-cli plugin:build",
-    "lint": "backstage-cli lint",
-    "test": "backstage-cli test",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package 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 package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 37b15ffbe0..27d2a952d9 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 794e386136..6e8594a33b 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -22,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index 3371dbbecc..90fcee6e55 100644
--- a/plugins/todo-backend/package.json
+++ b/plugins/todo-backend/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "backend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -17,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 package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
   },
   "dependencies": {
     "@backstage/backend-common": "^0.10.7",
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 8282772d90..274ada538f 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -10,6 +10,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -17,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.10",
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 4c33a1ac50..ad8fa2142d 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -11,6 +11,9 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "role": "frontend-plugin"
+  },
   "homepage": "https://backstage.io",
   "repository": {
     "type": "git",
@@ -21,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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index b765a1be2d..e9cf5d80ea 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -10,15 +10,18 @@
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
+  "backstage": {
+    "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 package build",
+    "start": "backstage-cli package start",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
     "diff": "backstage-cli plugin:diff",
-    "prepack": "backstage-cli prepack",
-    "postpack": "backstage-cli postpack",
-    "clean": "backstage-cli clean"
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean"
   },
   "dependencies": {
     "@backstage/core-components": "^0.8.8",