diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0311fbd0..d78cfc11 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,6 +42,6 @@ jobs:
       - name: Install
         run: yarn install
       - name: Build
-        run: yarn build
+        run: yarn build:all
       - name: Test
         run: yarn test
diff --git a/package.json b/package.json
index 536b0808..445d0372 100644
--- a/package.json
+++ b/package.json
@@ -13,23 +13,22 @@
     "app"
   ],
   "scripts": {
-    "start": "concurrently -n camel-model,hawtio,app \"yarn build:packages:watch\" \"yarn start:app\"",
+    "start": "concurrently -n hawtio,app \"yarn build:hawtio:watch\" \"yarn start:app\"",
     "start:app": "yarn workspace app start",
-    "build": "yarn build:packages && yarn build:app",
-    "build:packages": "yarn workspaces foreach --include @hawtio/camel-model --include @hawtio/react run build",
-    "build:packages:watch": "concurrently -n camel-model,hawtio \"yarn workspace @hawtio/camel-model build:watch\" \"yarn workspace @hawtio/react build:watch\"",
+    "build": "yarn build:hawtio",
+    "build:all": "yarn workspaces foreach -v -pt run build",
     "build:app": "yarn workspace app build",
     "build:camel-model": "yarn workspace @hawtio/camel-model build",
-    "build:hawtio": "yarn workspace @hawtio-react build",
-    "test": "yarn workspaces foreach run test",
-    "test:packages": "yarn workspaces foreach --include @hawtio/camel-model --include @hawtio/react run test",
-    "test:app": "yarn workspace app test",
+    "build:hawtio": "yarn workspace @hawtio/react build",
+    "build:hawtio:watch": "yarn workspace @hawtio/react build:watch",
+    "test": "yarn workspaces foreach -v -pt run test",
+    "test:hawtio": "yarn workspace @hawtio/react test",
     "lint": "yarn eslint packages/hawtio/src/ packages/hawtio/utils/ app/src/",
     "lint:fix": "yarn lint --fix",
     "format:check": "yarn prettier --check .",
     "format:fix": "yarn prettier --write .",
-    "release:camel-model": "yarn workspace @hawtio/camel-model npm publish",
-    "release:hawtio": "yarn workspace @hawtio/react npm publish"
+    "release:camel-model": "yarn workspace @hawtio/camel-model npm publish --tolerate-republish",
+    "release:hawtio": "yarn workspace @hawtio/react npm publish --tolerate-republish"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.50.0",