diff --git a/package.json b/package.json
index 9f5a8773..ec457576 100644
--- a/package.json
+++ b/package.json
@@ -81,27 +81,11 @@
   "scripts": {
     "postinstall": "lerna bootstrap",
     "precommit-msg": "Git precommit hook is running... & exit 0",
-    "test": "run-p -sn test:test-serializer test:uhk-common",
-    "test:test-serializer": "lerna exec --scope test-serializer npm test",
-    "test:uhk-common": "lerna exec --scope uhk-common npm test",
-    "test:uhk-web": "lerna exec --scope uhk-web npm test",
-    "lint": "run-s -scn lint:ts lint:style",
-    "lint:ts": "run-p -sn lint:ts:electron-main lint:ts:electron-renderer lint:ts:web lint:ts:test-serializer lint:ts:uhk-usb",
-    "lint:ts:electron-main": "tslint --project ./packages/uhk-agent/tsconfig.json",
-    "lint:ts:electron-renderer": "tslint --project ./packages/uhk-web/src/tsconfig.renderer.json",
-    "lint:ts:web": "tslint --project ./packages/uhk-web/src/tsconfig.app.json",
-    "lint:ts:test-serializer": "tslint --project ./packages/test-serializer/tsconfig.json",
-    "lint:ts:uhk-usb": "tslint --project ./packages/uhk-usb/tsconfig.json",
-    "lint:style": "stylelint \"packages/uhk-agent/src/**/*.scss\" \"packages/uhk-web/src/**/*.scss\" --syntax scss",
+    "test": "lerna run test",
+    "lint": "lerna run lint",
     "e2e": "lerna run e2e --scope uhk-web",
     "prebuild": "check-node-version --package",
-    "build": "run-s build:common build:usb build:web build:electron",
-    "build:web": "lerna exec --scope uhk-web npm run build",
-    "build:electron": "cross-env AOT_BUILD=true run-s -sn build:electron:renderer build:electron:main",
-    "build:electron:main": "lerna exec --scope uhk-agent npm run build",
-    "build:electron:renderer": "lerna exec --scope uhk-web npm run build:renderer",
-    "build:common": "lerna exec --scope uhk-common npm run build",
-    "build:usb": "lerna exec --scope uhk-usb npm run build",
+    "build": "lerna run build",
     "server:web": "lerna exec --scope uhk-web npm start",
     "server:electron": "lerna exec --scope uhk-web npm run server:renderer",
     "electron": "lerna exec --scope uhk-agent npm start",
@@ -111,7 +95,7 @@
     "sprites": "node ./scripts/generate-svg-sprites",
     "release": "node ./scripts/release.js",
     "clean": "lerna exec rimraf ./node_modules ./dist && rimraf ./node_modules ./dist",
-    "predeploy-gh-pages": "run-s build:web",
+    "predeploy-gh-pages": "lerna run build:web --scope=uhk-web",
     "deploy-gh-pages": "gh-pages -d packages/uhk-web/dist"
   },
   "dependencies": {}
diff --git a/packages/test-serializer/package.json b/packages/test-serializer/package.json
index 65fa3338..b09d20b8 100644
--- a/packages/test-serializer/package.json
+++ b/packages/test-serializer/package.json
@@ -19,6 +19,7 @@
   "devDependencies": {
   },
   "scripts": {
-    "test": "jasmine-ts --config=jasmine.json"
+    "test": "jasmine-ts --config=jasmine.json",
+    "lint": "tslint --project tsconfig.json"
   }
 }
diff --git a/packages/uhk-agent/package.json b/packages/uhk-agent/package.json
index 042edb17..cb3f6b43 100644
--- a/packages/uhk-agent/package.json
+++ b/packages/uhk-agent/package.json
@@ -34,6 +34,7 @@
     "electron:spe": "electron ./dist/electron-main.js --spe",
     "build": "webpack && npm run install:build-deps && npm run build:usb && npm run download-firmware && npm run copy-to-tmp-folder",
     "build:usb": "electron-rebuild -w node-hid -p -m ./dist",
+    "lint": "tslint --project tsconfig.json",
     "install:build-deps": "cd ./dist && npm i",
     "download-firmware": "node ../../scripts/download-firmware.js",
     "copy-to-tmp-folder": "node ../../scripts/copy-to-tmp-folder.js"
diff --git a/packages/uhk-common/package.json b/packages/uhk-common/package.json
index c38b2e37..aacc8ae3 100644
--- a/packages/uhk-common/package.json
+++ b/packages/uhk-common/package.json
@@ -16,7 +16,8 @@
     "copy:scancodes": "copyfiles ./src/config-serializer/config-items/scancodes.json dist",
     "copy:secondary-roles": "copyfiles ./src/config-serializer/config-items/secondaryRole.json dist",
     "test": "jasmine-ts --config=jasmine.json",
-    "coverage": "nyc jasmine-ts --config=jasmine.json"
+    "coverage": "nyc jasmine-ts --config=jasmine.json",
+    "lint": "tslint --project tsconfig.json"
   },
   "dependencies": {
     "tslib": "1.9.3"
diff --git a/packages/uhk-usb/package.json b/packages/uhk-usb/package.json
index 6d836858..cb68923f 100644
--- a/packages/uhk-usb/package.json
+++ b/packages/uhk-usb/package.json
@@ -5,7 +5,8 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "lint": "tslint --project tsconfig.json"
   },
   "devDependencies": {
     "@types/node": "8.0.28"
diff --git a/packages/uhk-web/package.json b/packages/uhk-web/package.json
index 5444199d..ccf0a5b7 100644
--- a/packages/uhk-web/package.json
+++ b/packages/uhk-web/package.json
@@ -5,13 +5,17 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build --prod --aot --base-href=\"\"",
-    "test": "ng test --watch false",
-    "lint": "ng lint",
-    "e2e": "ng e2e",
-    "build:renderer": "webpack --config webpack.config.js",
+    "build": "run-p -sn build:*",
+    "build:web": "ng build --prod --aot --base-href=\"\"",
+    "build:renderer": "cross-env AOT_BUILD=true webpack --config webpack.config.js",
     "server:renderer": "webpack --config webpack.config.js --watch",
-    "pree2e": "webdriver-manager update --standalone false --gecko false --quiet"
+    "test-skip": "ng test --watch false",
+    "lint": "run-p -snc lint:*",
+    "lint:ng": "ng lint",
+    "lint:renderer": "tslint --project src/tsconfig.renderer.json",
+    "lint:style": "stylelint \"src/**/*.scss\" --syntax scss",
+    "pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
+    "e2e": "ng e2e"
   },
   "private": true,
   "devDependencies": {