diff --git a/package.json b/package.json
index 4425d7c1bbf..a364e23b216 100644
--- a/package.json
+++ b/package.json
@@ -146,9 +146,9 @@
     "prettier:write": "prettier --list-different \"**/*.{ts,tsx,scss}\" --write",
     "precommit": "grafana-toolkit precommit",
     "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
-    "packages:versionBump": "lerna version --no-git-tag-version --no-push",
-    "packages:prepare": "lerna run clean && lerna run prep",
-    "packages:publish": "lerna publish from-package --contents dist --dist-tag next --no-git-tag-version --no-push"
+    "packages:prepare": "npm run test && lerna version --tag-version-prefix=\"packages@\" -m \"Packages: publish %s\" --no-push",
+    "packages:build": "lerna run clean && lerna run build",
+    "packages:publish": "lerna publish from-package --contents dist --tag-version-prefix=\"packages@\" --dist-tag next"
   },
   "husky": {
     "hooks": {
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index b7304f840ba..0e309350501 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -10,8 +10,8 @@
     "tslint": "tslint -c tslint.json --project tsconfig.json",
     "typecheck": "tsc --noEmit",
     "clean": "rimraf ./dist ./compiled",
-    "build": "rollup -c rollup.config.ts",
-    "prep": "grafana-toolkit package:build --scope=data"
+    "bundle": "rollup -c rollup.config.ts",
+    "build": "grafana-toolkit package:build --scope=data"
   },
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -39,6 +39,5 @@
   },
   "resolutions": {
     "@types/lodash": "4.14.119"
-  },
-  "gitHead": "eef02dc9b15ddd8923ec3571955a47e0f40d6562"
+  }
 }
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index c5996900528..f01a0081202 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -12,8 +12,8 @@
     "tslint": "tslint -c tslint.json --project tsconfig.json",
     "typecheck": "tsc --noEmit",
     "clean": "rimraf ./dist ./compiled",
-    "build": "rollup -c rollup.config.ts",
-    "prep": "grafana-toolkit package:build --scope=runtime"
+    "bundle": "rollup -c rollup.config.ts",
+    "build": "grafana-toolkit package:build --scope=runtime"
   },
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -37,6 +37,5 @@
   },
   "resolutions": {
     "@types/lodash": "4.14.119"
-  },
-  "gitHead": "eef02dc9b15ddd8923ec3571955a47e0f40d6562"
+  }
 }
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 86ec6dfb2aa..a007233495f 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -15,7 +15,7 @@
     "typecheck": "tsc --noEmit",
     "precommit": "npm run tslint & npm run typecheck",
     "clean": "rimraf ./dist ./compiled",
-    "prep": "grafana-toolkit toolkit:build"
+    "build": "grafana-toolkit toolkit:build"
   },
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -79,6 +79,5 @@
   "devDependencies": {
     "@types/glob": "^7.1.1",
     "@types/prettier": "^1.16.4"
-  },
-  "gitHead": "eef02dc9b15ddd8923ec3571955a47e0f40d6562"
+  }
 }
diff --git a/packages/grafana-toolkit/src/cli/tasks/package.build.ts b/packages/grafana-toolkit/src/cli/tasks/package.build.ts
index 88c391b79a4..fcf1e75472d 100644
--- a/packages/grafana-toolkit/src/cli/tasks/package.build.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/package.build.ts
@@ -17,7 +17,7 @@ export const clean = useSpinner<void>('Cleaning', async () => await execa('npm',
 const compile = useSpinner<void>('Compiling sources', () => execa('tsc', ['-p', './tsconfig.build.json']));
 
 // @ts-ignore
-const rollup = useSpinner<void>('Bundling', () => execa('npm', ['run', 'build']));
+const rollup = useSpinner<void>('Bundling', () => execa('npm', ['run', 'bundle']));
 
 interface SavePackageOptions {
   path: string;
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 27bab6548b6..db83d12cd9e 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -14,8 +14,8 @@
     "storybook": "start-storybook -p 9001 -c .storybook",
     "storybook:build": "build-storybook -o ./dist/storybook -c .storybook",
     "clean": "rimraf ./dist ./compiled",
-    "build": "rollup -c rollup.config.ts",
-    "prep": "grafana-toolkit package:build --scope=ui"
+    "bundle": "rollup -c rollup.config.ts",
+    "build": "grafana-toolkit package:build --scope=ui"
   },
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -79,6 +79,5 @@
   },
   "resolutions": {
     "@types/lodash": "4.14.119"
-  },
-  "gitHead": "eef02dc9b15ddd8923ec3571955a47e0f40d6562"
+  }
 }