diff --git a/packages/twenty-docker/prod/twenty-docs/Dockerfile b/packages/twenty-docker/prod/twenty-docs/Dockerfile
index 9f265f64a..38a115132 100644
--- a/packages/twenty-docker/prod/twenty-docs/Dockerfile
+++ b/packages/twenty-docker/prod/twenty-docs/Dockerfile
@@ -9,7 +9,8 @@ COPY ./yarn.lock .
 COPY ./.yarnrc.yml .
 COPY ./.yarn/releases /app/.yarn/releases
 COPY ./packages/twenty-docs/package.json /app/packages/twenty-docs/package.json
-RUN yarn 
+COPY ./packages/twenty-emails /app/packages/twenty-emails
+RUN yarn
 
 COPY ./packages/twenty-docs /app/packages/twenty-docs
 RUN yarn nx build twenty-docs
diff --git a/packages/twenty-docker/prod/twenty-front/Dockerfile b/packages/twenty-docker/prod/twenty-front/Dockerfile
index 05a916c03..9f4323538 100644
--- a/packages/twenty-docker/prod/twenty-front/Dockerfile
+++ b/packages/twenty-docker/prod/twenty-front/Dockerfile
@@ -11,11 +11,15 @@ COPY ./yarn.lock .
 COPY ./.yarnrc.yml .
 COPY ./.yarn/releases /app/.yarn/releases
 COPY ./tools/eslint-rules /app/tools/eslint-rules
-COPY ./packages/twenty-front /app/packages/twenty-front
+COPY ./packages/twenty-emails /app/packages/twenty-emails
+COPY ./packages/twenty-front/package.json /app/packages/twenty-front/package.json
 
 RUN yarn
+
+COPY ./packages/twenty-front /app/packages/twenty-front
 RUN yarn nx build twenty-front
 
+
 FROM node:18.17.1-alpine as twenty-front
 
 WORKDIR /app/packages/twenty-front
diff --git a/packages/twenty-docker/prod/twenty-server/Dockerfile b/packages/twenty-docker/prod/twenty-server/Dockerfile
index 9202ac5ef..26ec01928 100644
--- a/packages/twenty-docker/prod/twenty-server/Dockerfile
+++ b/packages/twenty-docker/prod/twenty-server/Dockerfile
@@ -7,15 +7,18 @@ COPY ./yarn.lock .
 COPY ./.yarnrc.yml .
 COPY ./.yarn/releases /app/.yarn/releases
 COPY ./tools/eslint-rules /app/tools/eslint-rules
-COPY ./packages/twenty-server /app/packages/twenty-server
+COPY ./packages/twenty-server/package.json /app/packages/twenty-server/package.json
+COPY ./packages/twenty-server/patches /app/packages/twenty-server/patches
 COPY ./packages/twenty-emails /app/packages/twenty-emails
 
-WORKDIR /app/packages/twenty-server
+WORKDIR /app/packages/twenty-emails
 RUN yarn workspaces focus
-
 RUN yarn build
 
 WORKDIR /app/packages/twenty-server
+COPY ./packages/twenty-server /app/packages/twenty-server
+RUN yarn workspaces focus
+RUN yarn build
 
 LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
 LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend, ensuring it deploys faster and runs the same way regardless of the deployment environment."
diff --git a/packages/twenty-emails/package.json b/packages/twenty-emails/package.json
index 679802f08..bb043c537 100644
--- a/packages/twenty-emails/package.json
+++ b/packages/twenty-emails/package.json
@@ -10,6 +10,12 @@
     "nx": "NX_DEFAULT_PROJECT=twenty-emails node ../../node_modules/nx/bin/nx.js",
     "build": "tsup"
   },
+  "devDependencies": {
+    "@react-email/components": "0.0.12",
+    "@types/react": "^18.2.39",
+    "tsup": "^8.0.1",
+    "typescript": "^5.3.3"
+  },
   "engines": {
     "node": "^18.17.1",
     "npm": "please-use-yarn",
diff --git a/yarn.lock b/yarn.lock
index 4a3e85421..6810d53ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42370,6 +42370,11 @@ __metadata:
 "twenty-emails@workspace:*, twenty-emails@workspace:packages/twenty-emails":
   version: 0.0.0-use.local
   resolution: "twenty-emails@workspace:packages/twenty-emails"
+  dependencies:
+    "@react-email/components": "npm:0.0.12"
+    "@types/react": "npm:^18.2.39"
+    tsup: "npm:^8.0.1"
+    typescript: "npm:^5.3.3"
   languageName: unknown
   linkType: soft