diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index caafd21f4..c175ca657 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -29,12 +29,11 @@
     "url": "https://github.com/NativeScript/nativescript-dev-webpack.git"
   },
   "scripts": {
-    "clean": "npx rimraf -- node_modules package-lock.json && npm i --ignore-scripts",
+    "clean": "git clean -f -X -d",
     "tsc": "tsc",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js",
-    "postpack": "rm -rf node_modules",
-    "setup": "npm run clean && npm run build",
+    "setup": "npm run clean && npm i --ignore-scripts && npm run build",
     "build": "npm run tsc && npm run jasmine",
     "test": "npm run build",
     "jasmine": "jasmine --config=jasmine-config/jasmine.json",
diff --git a/workspace.json b/workspace.json
index 418719bf4..96713bbaf 100644
--- a/workspace.json
+++ b/workspace.json
@@ -237,7 +237,7 @@
 				"test": {
 					"builder": "@nrwl/workspace:run-commands",
 					"options": {
-						"commands": ["npm run tsc", "npm run jasmine"],
+						"commands": ["npm run test"],
 						"cwd": "packages/webpack",
 						"parallel": false
 					}
@@ -246,7 +246,7 @@
 					"builder": "@nrwl/workspace:run-commands",
 					"outputs": ["dist/packages"],
 					"options": {
-						"commands": ["npm run setup", "mkdir -p ../../dist/packages", "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"],
+						"commands": ["npm run setup", "npx mkdirp ../../dist/packages", "npm pack", "mv *.tgz ../../dist/packages/nativescript-webpack.tgz"],
 						"cwd": "packages/webpack",
 						"parallel": false
 					}