diff --git a/package.json b/package.json
index 723a8e8f..728a87bc 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,9 @@
   },
   "repository": "https://github.com/Mach30/m30pm",
   "scripts": {
-    "build": "npm run build -w packages/m30pm-lib-common && npm run build -w packages/m30pm-lib-fs && npm run build -w packages/m30pm-lib-cli && shx rm -rf dist && tsc -b",
+    "clean": "shx rm -rf dist",
+    "build": "npm run clean && tsc -b --force",
+    "buildAll": "npm run build -w packages/m30pm-lib-common && npm run build -w packages/m30pm-lib-fs && npm run build -w packages/m30pm-lib-cli && npm run build",
     "lint": "eslint . --ext .ts",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "npm run lint",
diff --git a/packages/m30pm-lib-cli/package.json b/packages/m30pm-lib-cli/package.json
index e21ff092..aa66bfc3 100644
--- a/packages/m30pm-lib-cli/package.json
+++ b/packages/m30pm-lib-cli/package.json
@@ -10,7 +10,8 @@
     "/dist"
   ],
   "scripts": {
-    "build": "shx rm -rf dist/ && tsc -b",
+    "clean": "shx rm -rf dist",
+    "build": "npm run clean && tsc -b --force",
     "test": "nyc mocha --forbid-only"
   },
   "author": "Mach 30",
diff --git a/packages/m30pm-lib-common/package.json b/packages/m30pm-lib-common/package.json
index 7551206f..8956b1e0 100644
--- a/packages/m30pm-lib-common/package.json
+++ b/packages/m30pm-lib-common/package.json
@@ -8,7 +8,8 @@
     "/dist"
   ],
   "scripts": {
-    "build": "shx rm -rf dist/ && tsc -b && shx cp -r src/resources/ dist/",
+    "clean": "shx rm -rf dist",
+    "build": "npm run clean && tsc -b --force && shx cp -r src/resources/ dist/",
     "test": "nyc mocha --forbid-only"
   },
   "author": "Mach 30",
diff --git a/packages/m30pm-lib-fs/package.json b/packages/m30pm-lib-fs/package.json
index 55ce2e17..1f79b359 100644
--- a/packages/m30pm-lib-fs/package.json
+++ b/packages/m30pm-lib-fs/package.json
@@ -8,7 +8,8 @@
     "/dist"
   ],
   "scripts": {
-    "build": "shx rm -rf dist/ && tsc -b",
+    "clean": "shx rm -rf dist",
+    "build": "npm run clean && tsc -b --force",
     "test": "nyc mocha --timeout 10000 --forbid-only"
   },
   "author": "Mach 30",