diff --git a/.dockerignore b/.dockerignore
index 0bac7f13a..37c369561 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,4 +2,7 @@
 readme.md
 typeshare.toml
 LICENSE
-*.code-workspace
\ No newline at end of file
+*.code-workspace
+
+*/node_modules
+*/dist
\ No newline at end of file
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
deleted file mode 100644
index 76add878f..000000000
--- a/frontend/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-dist
\ No newline at end of file
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 3b8e1cd50..ac751644a 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,6 +1,11 @@
 FROM node:alpine
 
-COPY . .
-RUN yarn && yarn build
+WORKDIR /app
 
-CMD yarn preview --host
+COPY ./frontend ./frontend
+COPY ./client/ts ./client
+
+RUN cd client && yarn && yarn build && yarn link
+RUN cd frontend && yarn link @monitor/client && yarn && yarn build
+
+CMD cd frontend && yarn preview --host
\ No newline at end of file