diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4bafe0d7..25c2ebb1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -66,6 +66,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./api/
+          target: production
           file: ./api/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
diff --git a/api/Dockerfile b/api/Dockerfile
index 7e90a7a4..a8a9f544 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -4,32 +4,46 @@ WORKDIR /app
 
 COPY . .  
 
-FROM node:18-alpine AS installer
-
-WORKDIR /app
-
-COPY --from=builder /app/package*.json ./
-
-COPY --from=builder /app/merge-extensions-deps.js ./
-
-COPY --from=builder /app/src/extensions ./src/extensions
-
-COPY --from=builder /app/patches ./patches
-
 RUN npm update -g npm
 
 RUN npm config set registry https://registry.npmjs.com/
 
+RUN npm run preinstall
+
 RUN npm i --verbose --maxsockets 6
 
-FROM node:18-alpine AS runner
+RUN npm run build
+
+
+FROM node:18-alpine AS production
 
 WORKDIR /app
 
-COPY --from=installer /app/ .
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/ .
+COPY --from=builder /app/node_modules ./node_modules
 
-COPY . .
+ENV NODE_ENV=production
+
+# Run npm prune to remove dev dependencies
+RUN npm prune --production
 
 EXPOSE 3000
 
-CMD [ "npm", "run" , "start:dev" ]
+CMD ["npm", "run", "start:prod"]
+
+
+FROM node:18-alpine AS development
+
+WORKDIR /app
+
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/ .
+
+ENV NODE_ENV=development
+
+RUN npm install
+
+EXPOSE 3000
+
+CMD ["npm", "run", "start:dev"]
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index afa04d2f..e577e8b8 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -13,6 +13,7 @@ services:
   api:
     build:
       context: ../api
+      target: development
     pull_policy: build
     ports:
       - ${API_PORT}:3000