diff --git a/package.json b/package.json
index 7a67b2fe21f..93cde7c82c7 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,7 @@
     "clean": "rm -rf ./packages/*/lib ./packages/*/*.tsbuildinfo",
     "build": "lerna run build",
     "build:docs": "lerna run build:refdocs && ./scripts/prepare-docs.sh",
-    "build:lib:watch": "lerna run build:lib:watch",
-    "build:types:watch": "lerna run build:types:watch",
-    "build:watch": "run-p build:lib:watch build:types:watch",
+    "build:watch": "lerna exec --parallel -- 'yarn run build:watch'",
     "build:ifchanged": "lerna exec -- ../../scripts/build_if_changed.sh",
     "lint": "eslint --color --ext .ts packages/*/src packages/*/test",
     "check-build": "lerna run check-build",
diff --git a/packages/api/package.json b/packages/api/package.json
index 608b5b15f79..67993c90209 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -56,6 +56,7 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json
index 70774ea6646..b1104d2db75 100644
--- a/packages/beacon-node/package.json
+++ b/packages/beacon-node/package.json
@@ -68,9 +68,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "coverage": "codecov -F lodestar",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9d778075c0e..13af2bf8f07 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -23,8 +23,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json && yarn write-git-data",
     "build:release": "yarn clean && yarn run build",
-    "build:lib:watch": "yarn run build:lib --watch",
-    "build:types:watch": "yarn run build:types --watch",
+    "build:watch": "tsc -p tsconfig.build.json --watch",
     "build:refdocs": "ts-node --esm ./docsgen/index.ts docs/cli.md",
     "write-git-data": "node lib/util/gitData/writeGitData.js",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\" lodestar --help",
diff --git a/packages/config/package.json b/packages/config/package.json
index c976501f705..0f6ff21c8e2 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -44,8 +44,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
     "build:release": "yarn run clean && yarn run build",
-    "build:types:watch": "yarn run build:types --watch",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/",
diff --git a/packages/db/package.json b/packages/db/package.json
index 4da895ad7fa..fb7d902ea91 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -24,9 +24,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "coverage": "codecov -F lodestar-fork-choice",
diff --git a/packages/flare/package.json b/packages/flare/package.json
index 1ad5630d2ab..0a8b56108a8 100644
--- a/packages/flare/package.json
+++ b/packages/flare/package.json
@@ -38,8 +38,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
     "build:release": "yarn run clean && yarn run build",
-    "build:types:watch": "yarn run build:types --watch",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\" flare --help",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/",
diff --git a/packages/fork-choice/package.json b/packages/fork-choice/package.json
index 4ac2e403ac0..71d8f439dad 100644
--- a/packages/fork-choice/package.json
+++ b/packages/fork-choice/package.json
@@ -25,9 +25,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "coverage": "codecov -F lodestar-fork-choice",
diff --git a/packages/light-client/package.json b/packages/light-client/package.json
index f5ba11bab6e..36cf9fb8661 100644
--- a/packages/light-client/package.json
+++ b/packages/light-client/package.json
@@ -50,6 +50,7 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index f89e09cd72c..3b1f0e56bb2 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -49,9 +49,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/params/package.json b/packages/params/package.json
index 8212c898b54..7cfa8d9e160 100644
--- a/packages/params/package.json
+++ b/packages/params/package.json
@@ -47,8 +47,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
     "build:release": "yarn clean && yarn build",
-    "build:lib:watch": "yarn run build:lib --watch",
-    "build:types:watch": "yarn run build:types --watch",
+    "build:watch": "yarn run build --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/prover/package.json b/packages/prover/package.json
index dfc950a1ec2..eb6c75f028b 100644
--- a/packages/prover/package.json
+++ b/packages/prover/package.json
@@ -43,6 +43,7 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
@@ -59,7 +60,7 @@
   },
   "dependencies": {
     "@ethereumjs/block": "^4.2.2",
-    "@ethereumjs/common": "^3.1.2",  
+    "@ethereumjs/common": "^3.1.2",
     "@ethereumjs/rlp": "^4.0.1",
     "@ethereumjs/trie": "^5.0.5",
     "@ethereumjs/util": "^8.0.6",
diff --git a/packages/reqresp/package.json b/packages/reqresp/package.json
index 65ec5b9986c..627b1d15ae3 100644
--- a/packages/reqresp/package.json
+++ b/packages/reqresp/package.json
@@ -41,6 +41,7 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn run build",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
diff --git a/packages/spec-test-util/package.json b/packages/spec-test-util/package.json
index f8fb6a3e484..b32f9847fc8 100644
--- a/packages/spec-test-util/package.json
+++ b/packages/spec-test-util/package.json
@@ -25,8 +25,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
     "build:release": "yarn clean && yarn build",
-    "build:types:watch": "yarn run build:types --watch",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/state-transition/package.json b/packages/state-transition/package.json
index fc81685ec29..1c5e7f0eb39 100644
--- a/packages/state-transition/package.json
+++ b/packages/state-transition/package.json
@@ -46,9 +46,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/types/package.json b/packages/types/package.json
index 47c96e38836..295a4b5462c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -55,9 +55,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index b613e2108f3..bed58ac4804 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -24,9 +24,8 @@
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
-    "build:lib:watch": "yarn run build:lib --watch",
+    "build:watch": "yarn run build --watch",
     "build:release": "yarn clean && yarn build",
-    "build:types:watch": "yarn run build:types --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",
diff --git a/packages/validator/package.json b/packages/validator/package.json
index 6cdee420e1c..c0f2921cae1 100644
--- a/packages/validator/package.json
+++ b/packages/validator/package.json
@@ -22,8 +22,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json",
     "build:release": "yarn clean && yarn run build",
-    "build:lib:watch": "yarn run build:lib --watch",
-    "build:types:watch": "yarn run build:types --watch",
+    "build:watch": "yarn run build --watch",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
     "lint": "eslint --color --ext .ts src/ test/",