diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml
index 08de2e8a..a9bd62d8 100644
--- a/.github/workflows/image-build.yaml
+++ b/.github/workflows/image-build.yaml
@@ -20,8 +20,10 @@ jobs:
       registry: "ghcr.io"
       image_name: "${{ github.repository_owner }}/trustify-ui"
       containerfile: "./Containerfile"
-      architectures: '[ "amd64" ]'
+      architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
       extra-args: "--ulimit nofile=4096:4096"
+      pre_build_cmd: |
+        sed -i '/RUN npm clean-install/i RUN npm install -g npm@9' Containerfile
     secrets:
       registry_username: ${{ github.actor }}
       registry_password: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/Containerfile b/Containerfile
index a1d7a9cf..253d0f3a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi9/nodejs-20:latest as builder
 
 USER 1001
 COPY --chown=1001 . .
-RUN npm clean-install && npm run build && npm run dist
+RUN npm clean-install --ignore-scripts && npm run build && npm run dist
 
 # Runner image
 FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:latest
diff --git a/package-lock.json b/package-lock.json
index 18051289..9c81eb4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
         "@rollup/plugin-run": "^3.0.2",
         "@rollup/plugin-typescript": "^11.1.6",
         "@rollup/plugin-virtual": "^3.0.2",
-        "@rollup/wasm-node": "^4.12.0",
         "@tanstack/eslint-plugin-query": "^4.34.1",
         "@types/jest": "^29.5.4",
         "@types/node": "^20.11.25",
@@ -41,6 +40,7 @@
         "lint-staged": "^14.0.1",
         "prettier": "^3.0.2",
         "rimraf": "^4.4.1",
+        "rollup": "^3.29.4",
         "rollup-plugin-copy": "^3.5.0",
         "ts-jest": "^29.1.1",
         "ts-node": "^10.9.1",
@@ -49,7 +49,7 @@
       },
       "engines": {
         "node": "^20",
-        "npm": ">=10.2.0"
+        "npm": ">=9.5.0"
       }
     },
     "client": {
@@ -2069,25 +2069,6 @@
         }
       }
     },
-    "node_modules/@rollup/wasm-node": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/wasm-node/-/wasm-node-4.12.0.tgz",
-      "integrity": "sha512-sqy3+YvV/uWX6bPZOR5PlEdH6xyMPXoelllRQ/uZ13tzy9f4pXZTbajnoWN8IHHXwTNKPiLzsePLiDEVmkxMNw==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/@segment/analytics-core": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/@segment/analytics-core/-/analytics-core-1.4.1.tgz",
@@ -10363,6 +10344,20 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -16545,6 +16540,22 @@
         "node": ">=18.0"
       }
     },
+    "node_modules/rollup": {
+      "version": "3.29.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
     "node_modules/rollup-plugin-copy": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
diff --git a/package.json b/package.json
index fded1be3..96c6ab0a 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   ],
   "engines": {
     "node": "^20",
-    "npm": ">=10.2.0"
+    "npm": ">=9.5.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -40,7 +40,6 @@
     "@rollup/plugin-run": "^3.0.2",
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/plugin-virtual": "^3.0.2",
-    "@rollup/wasm-node": "^4.12.0",
     "@tanstack/eslint-plugin-query": "^4.34.1",
     "@types/jest": "^29.5.4",
     "@types/node": "^20.11.25",
@@ -61,6 +60,7 @@
     "lint-staged": "^14.0.1",
     "prettier": "^3.0.2",
     "rimraf": "^4.4.1",
+    "rollup": "^3.29.4",
     "rollup-plugin-copy": "^3.5.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",