diff --git a/Dockerfile b/Dockerfile
index ebd4d06..4dbae64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,26 +13,29 @@ COPY server/config/*.go ./config/
 COPY server/routes/*.go ./routes/
 COPY server/services/*.go ./services/
 COPY server/middleware/*.go ./middleware/
+COPY server/database ./database/
 
 RUN go build -o /basic-sensor-receiver
 RUN mkdir /data
 
 ## Build client
-FROM node:alpine AS build-client
+FROM node:20-alpine AS build-client
 
 WORKDIR /app
 
 COPY client/package.json ./
-COPY client/package-lock.json ./
+COPY client/yarn.lock ./
+COPY client/.yarn/releases ./.yarn/releases
+COPY client/.yarnrc.yml ./
 
-RUN npm install
+RUN yarn
 
 COPY client/tsconfig.json ./
 COPY client/vite.config.js ./
 COPY client/src ./src
 COPY client/index.html ./
 
-RUN npm run build
+RUN yarn build
 
 ## Deploy
 FROM gcr.io/distroless/base-debian10