diff --git a/.dockerignore b/.dockerignore
index ce4738ec2e..92e6a0cd78 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,3 +9,4 @@
 !CHANGELOG.md
 !LICENSE
 !README.md
+!frontend
diff --git a/frontend/package.json b/frontend/package.json
index a14a4f6371..b82de40a1e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -31,7 +31,6 @@
     "start:enterprise": "UNLEASH_API=https://unleash4.herokuapp.com yarn run start",
     "start:demo": "UNLEASH_BASE_PATH=/demo/ yarn start",
     "test": "vitest",
-    "prepare": "yarn run build",
     "fmt": "prettier src --write --loglevel warn",
     "fmt:check": "prettier src --check",
     "e2e": "yarn run cypress open --config baseUrl='http://localhost:3000' --env AUTH_USER=admin,AUTH_PASSWORD=unleash4all",
diff --git a/package.json b/package.json
index d9dbac81fe..80e167c863 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
   ],
   "files": [
     "dist",
-    "docs"
+    "docs",
+    "frontend/build"
   ],
   "repository": {
     "type": "git",
@@ -32,12 +33,14 @@
     "copy-templates": "copyfiles -u 1 src/mailtemplates/**/*.mustache dist/",
     "db-migrate": "db-migrate --migrations-dir ./src/migrations",
     "lint": "eslint ./src",
-    "local:package": "del-cli --force build && mkdir build && cp -r dist docs CHANGELOG.md LICENSE README.md package.json build",
+    "local:package": "del-cli --force build && mkdir build && cp -r dist docs CHANGELOG.md LICENSE README.md package.json build && mkdir -p build/frontend && cp -r frontend/build build/frontend",
     "prebuild:watch": "yarn run clean",
     "build:watch": "tsc -w",
     "prebuild": "yarn run clean",
-    "build": "yarn run copy-templates && tsc --pretty",
-    "prepare": "node scripts/husky-install && yarn run build",
+    "build": "yarn build:frontend && yarn build:backend",
+    "build:backend": "yarn run copy-templates && tsc --pretty",
+    "build:frontend": "cd frontend && yarn build",
+    "prepare": "node scripts/husky-install && yarn run build && yarn build:frontend",
     "test": "NODE_ENV=test PORT=4243 jest",
     "test:unit": "NODE_ENV=test PORT=4243 jest --testPathIgnorePatterns=src/test/e2e/**",
     "test:docker": "./scripts/docker-postgres.sh",