diff --git a/packages/twenty-docker/prod/twenty-server/Dockerfile b/packages/twenty-docker/prod/twenty-server/Dockerfile
index fe952b31a..12d281538 100644
--- a/packages/twenty-docker/prod/twenty-server/Dockerfile
+++ b/packages/twenty-docker/prod/twenty-server/Dockerfile
@@ -13,10 +13,15 @@ COPY ./packages/twenty-server /app/packages/twenty-server
 RUN yarn
 
 RUN npx nx reset
+RUN npx nx run twenty-server:build
+RUN mv /app/packages/twenty-server/dist /app/packages/twenty-server/build
 RUN npx nx run twenty-server:build:packageJson
 RUN mv /app/packages/twenty-server/dist/package.json /app/packages/twenty-server/package.json
-RUN npx nx run twenty-server:build
-RUN yarn workspaces focus twenty-emails twenty-server
+RUN rm -rf /app/packages/twenty-server/dist
+RUN mv /app/packages/twenty-server/build /app/packages/twenty-server/dist
+
+WORKDIR /app
+RUN yarn workspaces focus --production twenty-emails twenty-server
 
 FROM node:18.17.1-alpine as twenty-server
 
diff --git a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
index 62cc97c89..028e8a319 100644
--- a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
+++ b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
@@ -165,6 +165,7 @@ export class EnvironmentVariables {
 
   @ValidateIf((env) => env.STORAGE_TYPE === StorageDriverType.S3)
   @IsString()
+  @IsOptional()
   STORAGE_S3_ENDPOINT: string;
 
   @IsString()