diff --git a/nx.json b/nx.json
index 4563761a555..7be94a5d32c 100644
--- a/nx.json
+++ b/nx.json
@@ -11,6 +11,13 @@
   "targetDefaults": {
     "build": {
       "outputs": ["{projectRoot}/dist"]
+    },
+    "pack": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"",
+        "cwd": "{projectRoot}"
+      }
     }
   },
   "release": {
@@ -19,7 +26,6 @@
       "grafanaPackages": {
         "projects": [
           "@grafana/data",
-          "@grafana/e2e",
           "@grafana/e2e-selectors",
           "@grafana/flamegraph",
           "@grafana/prometheus",
diff --git a/package.json b/package.json
index ae2824da8a6..642dcdf0919 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,8 @@
     "lint:fix": "yarn lint:ts --fix",
     "packages:build": "nx run-many -t build --projects='tag:scope:package'",
     "packages:clean": "rimraf ./npm-artifacts && nx run-many -t clean --projects='tag:scope:package' --maxParallel=100",
-    "packages:prepare": "nx release version --no-git-commit --no-git-tag --no-stage-changes --group fixed",
-    "packages:pack": "mkdir -p ./npm-artifacts && yarn workspaces foreach --no-private --include='@grafana/*' -A exec yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"",
+    "packages:prepare": "nx release version --no-git-commit --no-git-tag --no-stage-changes --group grafanaPackages",
+    "packages:pack": "mkdir -p ./npm-artifacts && nx run-many -t pack --projects='tag:scope:package'",
     "packages:typecheck": "nx run-many -t typecheck --projects='tag:scope:package'",
     "prettier:check": "prettier --check --list-different=false --log-level=warn \"**/*.{ts,tsx,scss,md,mdx,json,js}\"",
     "prettier:checkDocs": "prettier --check --list-different=false --log-level=warn \"docs/**/*.md\" \"*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx,json}\"",