diff --git a/nx.json b/nx.json
index 339b51dcf2..5ce8784f6a 100644
--- a/nx.json
+++ b/nx.json
@@ -14,7 +14,7 @@
           "test:build",
           "build"
         ],
-        "parallel": 3,
+        "parallel": 5,
         "accessToken": "ZDdkNDA4MGEtYjNmYi00MWI4LWE1N2QtYTdlNmYxMGJlZWM2fHJlYWQ="
       }
     }
diff --git a/package.json b/package.json
index 4767694c26..8e485df1ff 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "test:types": "nx affected --target=test:types",
     "build": "nx affected --target=build",
     "build:all": "nx run-many --exclude=examples/** --target=build",
-    "watch": "concurrently --kill-others \"pnpm -r build:rollup -w\" \"pnpm -r build:types --watch\"",
+    "watch": "pnpm run build:all && nx watch --all -- pnpm run build:all",
     "dev": "pnpm run watch",
     "prettier": "prettier --plugin-search-dir . \"{packages,examples,scripts}/**/*.{md,js,jsx,cjs,ts,tsx,json,vue,svelte}\"",
     "prettier:write": "pnpm run prettier --write",