diff --git a/Dockerfile b/Dockerfile
index a6fb4e2..e8453c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,18 @@
-FROM paulcager/go-base:latest
+FROM paulcager/go-base:latest as build
 
+WORKDIR /go
+
+COPY go.mod *.go ./src/osgrid-server/
+RUN cd /go/src/osgrid-server && \
+    go install -v ./... && \
+    sha256sum /go/bin/osgrid-server
+
+FROM debian:stable-slim
+RUN apt-get update && apt-get -y upgrade
+WORKDIR /app
+COPY --from=build /go/bin/osgrid-server .
 EXPOSE 9090
-WORKDIR /go/src/osgrid-server
 
-COPY go.mod *.go ./
-RUN go install -v ./... && sha256sum /go/bin/osgrid-server && cd /go && rm -rf /go/src /go/pkg
-
-CMD [ "/go/bin/osgrid-server" ]
+CMD [ "/app/osgrid-server" ]