diff --git a/Dockerfile b/Dockerfile
index fed0789..fc402f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:14-alpine as builder
 
 RUN apk update && apk add --no-cache nano curl
 
@@ -18,6 +18,12 @@ RUN mkdir -p ./public ./data \
     && mv ./client/build/* ./public \
     && rm -rf ./client
 
+FROM node:14-alpine
+
+COPY --from=builder /app /app
+
+WORKDIR /app
+
 EXPOSE 5005
 
 ENV NODE_ENV=production
diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch
index 20ff6c2..ea1e6ea 100644
--- a/Dockerfile.multiarch
+++ b/Dockerfile.multiarch
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:14-alpine as builder
 
 RUN apk update && apk add --no-cache nano curl
 
@@ -20,8 +20,14 @@ RUN mkdir -p ./public ./data \
     && rm -rf ./client \
     && apk del build-dependencies
 
+FROM node:14-alpine
+
+COPY --from=builder /app /app
+
+WORKDIR /app
+
 EXPOSE 5005
 
 ENV NODE_ENV=production
 
-CMD ["node", "server.js"]
\ No newline at end of file
+CMD ["node", "server.js"]