diff --git a/packages/cli/package.json b/packages/cli/package.json
index 48aaa0dd73..7612ab1c35 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -7,8 +7,8 @@
   "scripts": {
     "exec": "npx ts-node ./src",
     "build": "tsc --outDir dist --noEmit false --module CommonJS",
-    "lint": "web-scripts lint",
-    "test": "web-scripts test",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
     "start": "nodemon ."
   },
   "devDependencies": {
diff --git a/packages/core/package.json b/packages/core/package.json
index ba4186339a..b6ceeb42f2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -7,11 +7,10 @@
   "types": "dist/cjs/index.d.ts",
   "scripts": {
     "build": "tsc --outDir dist/cjs --noEmit false --module CommonJS",
-    "lint": "web-scripts lint",
-    "test": "web-scripts test"
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test"
   },
   "dependencies": {
-    "@spotify-backstage/cli": "^0.1.0",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@types/google-protobuf": "^3.7.2",
@@ -27,7 +26,7 @@
     "recompose": "0.30.0"
   },
   "devDependencies": {
-    "@spotify/web-scripts": "^6.0.0",
+    "@spotify-backstage/cli": "^0.1.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",