diff --git a/backend.Dockerfile b/backend.Dockerfile
index 134882d..bc20c35 100644
--- a/backend.Dockerfile
+++ b/backend.Dockerfile
@@ -1,11 +1,14 @@
-FROM rust
-
-WORKDIR /app
+FROM rust as builder
 
+WORKDIR /build
 COPY ./backend .
-
 RUN cargo build --release
 
+#####################################
+FROM phusion/baseimage:0.11
+
+COPY --from=builder /build/target/release/telemetry /usr/local/bin
+
 EXPOSE 8000
 
-ENTRYPOINT [ "./target/release/telemetry" ]
\ No newline at end of file
+ENTRYPOINT [ "telemetry" ]
diff --git a/frontend.Dockerfile b/frontend.Dockerfile
index eeabc1d..2ffb8d0 100644
--- a/frontend.Dockerfile
+++ b/frontend.Dockerfile
@@ -8,4 +8,4 @@ COPY ./scripts ./scripts
 COPY ./packages ./packages
 COPY ./package.json ./yarn.lock ./tsconfig.json ./
 
-RUN yarn 
+RUN yarn && yarn cache clean