diff --git a/Dockerfile b/Dockerfile
index 7a87451..0a3511c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,29 @@
 FROM node:20-bullseye-slim as base
 
-RUN apt-get update && apt-get install -y make g++ python3
-RUN ln -sf /usr/bin/python3 /usr/bin/python
+FROM base as production_buildstage
 
-RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
 WORKDIR /home/node/app
+COPY package.json package-lock.json ./
 
-FROM base as production
-COPY package*.json ./
-
-USER node
 RUN npm ci
 
 COPY --chown=node:node . ./
 RUN npm run build
 
-EXPOSE 8080
+FROM base as production
+
+ENV NODE_ENV=production
+
+USER node
+WORKDIR /home/node/app
+
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY --from=production_buildstage /home/node/app/dist /home/node/app/dist
 
 ENTRYPOINT ["npm", "run", "start:prod"]
 
 FROM base as development
-USER node
+
+WORKDIR /home/node/app