diff --git a/Dockerfile b/Dockerfile
index c907e39d..9f6bb72d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,20 +2,21 @@ FROM node:18-alpine3.18 as builder
 RUN apk add --no-cache git curl
 
 WORKDIR /builder
+
+COPY package.json yarn.lock ./
+RUN npm i -g yarn && yarn install
+
 COPY . .
-RUN npm i -g yarn
-RUN yarn install
 RUN yarn build
 
 # Create image by copying build artifacts
 FROM node:18-alpine3.18 as runner
-RUN npm i -g yarn
 
 USER node
-ARG PORT=3000
 
 WORKDIR /home/node
 COPY --chown=node:node  --from=builder /builder/ ./
 
+ARG PORT=3000
 EXPOSE ${PORT}
 CMD ["yarn", "start"]