diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index 83ab172ad..ee40ea6a6 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,5 +1,5 @@
 feature: ['feature/*', 'feat/*']
-fix: ['fix/*', 'bug/*']
+fix: ['fix/*', 'bug/*', 'bugfix/*']
 chore: chore/*
 documentation: docs/*
 refactor: refactor/*
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 8293cf06a..38cb20897 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -14,7 +14,8 @@ jobs:
         env:
           NODE_ENV: development
         with:
-          build-script: "build:bundle"
+          build-script: "build:bundle:prod"
+          clean-script: "clean:build"
           pattern: "./build/**/*.js"
           strip-hash: \d+\.\d+\.\d+[-\S+]*\/
-          exclude: "{./build/**/i18n/*.js,./build/**/legacy/**,./build/**/tmp/**,**/*.map,**/node_modules/**}"
+          exclude: "{./build/**/i18n/*.js,./build/**/legacy/**,./build/**/tmp/**,**/node_modules/**}"
diff --git a/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml b/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml
index 4a2d29199..460fa5f5e 100644
--- a/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml
+++ b/.github/workflows/on-pr-and-trunk_one-app-unit-and-lint-tests.yml
@@ -30,9 +30,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
       - name: npm install
-        run: NODE_ENV=development npm ci
+        run: npm ci
         env:
+          NODE_ENV: development
           HUSKY: 0
+      - name: npm run build
+        run: npm run build
+        env:
+          NODE_ENV: production
       - name: npm unit test
         run:  npm run test:unit
       - name: npm lint test
diff --git a/.github/workflows/on-pr_dangerJS.yml b/.github/workflows/on-pr_dangerJS.yml
index cbb80c70f..b3f345909 100644
--- a/.github/workflows/on-pr_dangerJS.yml
+++ b/.github/workflows/on-pr_dangerJS.yml
@@ -16,10 +16,12 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-node-
     - name: npm install
-      run: NODE_ENV=development npm ci
+      run: npm ci
       env:
-          HUSKY: 0
+        NODE_ENV: development
+        HUSKY: 0
     - name: Danger
-      run: NODE_ENV=production npm run test:danger
+      run: npm run test:danger
       env:
+        NODE_ENV: production
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/on-pr_one-app-integration-tests.yml b/.github/workflows/on-pr_one-app-integration-tests.yml
index 1f046881a..bb3b2384a 100644
--- a/.github/workflows/on-pr_one-app-integration-tests.yml
+++ b/.github/workflows/on-pr_one-app-integration-tests.yml
@@ -16,8 +16,9 @@ jobs:
         with:
           node-version-file: .nvmrc
       - name: npm install
-        run: NODE_ENV=development npm ci
+        run: npm ci
         env:
+          NODE_ENV: development
           HUSKY: 0
       - name: Build docker image
         run: docker build -t one-app:at-test . --build-arg USER=root --build-arg VERSION=$(cat .nvmrc)
diff --git a/.github/workflows/release-step-1_manual_create-release-pr.yml b/.github/workflows/release-step-1_manual_create-release-pr.yml
index ad6a6bc02..11687e974 100644
--- a/.github/workflows/release-step-1_manual_create-release-pr.yml
+++ b/.github/workflows/release-step-1_manual_create-release-pr.yml
@@ -32,13 +32,14 @@ jobs:
       - name: One App release
         id: vars
         run: |
-          NODE_ENV=development npm ci
+          npm ci
           git config --local user.email "one.amex@aexp.com"
           git config --local user.name "OneAmexBot"
           npm run release
           git add .
           git commit -m "docs(changelog): update"
         env:
+          NODE_ENV: development
           HUSKY: 0
       - name: Create release pull request
         uses: peter-evans/create-pull-request@v6
diff --git a/package.json b/package.json
index ec10e503a..97c6f7891 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,12 @@
     "npm": ">=8"
   },
   "scripts": {
-    "preinstall": "npx check-engines@1",
     "rimraf": "node -e \"process.argv.slice(1).forEach(path => require('node:fs').rmSync(path, { recursive: true, force: true }));\" --",
     "clean": "npm run clean:build && npm run clean:test",
     "clean:build": "npm run rimraf dist lib build lastBuild.json stats.json",
     "clean:test": "npm run rimraf test-results",
     "prebuild": "npm run clean:build",
+    "build:bundle:prod": "cross-env NODE_ENV=production npm run build:bundle",
     "build:bundle": "cross-env \"NODE_OPTIONS=--max-old-space-size=4096 --openssl-legacy-provider\" bundle-one-app",
     "build:server": "cross-env BABEL_ENV=server babel src --out-dir lib --ignore \"**/__mocks__\"",
     "build:service-workers": "node scripts/build-service-workers.js",
@@ -42,7 +42,6 @@
     "drop-module": "drop-module",
     "set-middleware": "set-middleware",
     "set-dev-endpoints": "node scripts/set-dev-endpoints.js",
-    "postinstall": "npm run build",
     "release:standard-version": "standard-version -n",
     "release:changelog": "echo \"$(head -3 CHANGELOG.md)\n\n$(node_modules/.bin/conventional-changelog -p angular)\n\n$(tail -n +4 CHANGELOG.md)\" > CHANGELOG.md",
     "release": "npm run release:standard-version && npm run release:changelog",