diff --git a/package.json b/package.json
index 5e7116121..f99d690c4 100644
--- a/package.json
+++ b/package.json
@@ -83,10 +83,14 @@
   },
   "scripts": {
     "postinstall": "npm --prefix client install",
-    "build": "gulp build; webpack --config ./client/webpack/prod.config.js",
+    "build": "npm run gulp:prod:build && npm run webpack:prod:build",
     "dist": "NODE_ENV=production npm run build",
-    "watch": "webpack --config ./client/webpack/dev.config.js & gulp watch",
+    "watch": "npm-run-all --parallel gulp:dev:watch webpack:dev:watch",
     "start": "npm run watch",
+    "gulp:dev:watch": "gulp watch",
+    "gulp:prod:build": "gulp build",
+    "webpack:dev:watch": "webpack --config ./client/webpack/dev.config.js",
+    "webpack:prod:build": "webpack --config ./client/webpack/prod.config.js",
     "lint:js": "eslint --max-warnings 16 ./client",
     "lint:css": "stylelint **/*.scss",
     "lint": "npm run lint:js",