diff --git a/Dockerfile b/Dockerfile
index 86fc5d6a71c0ba5c94bd2afa0024121eda91c6e9..8c62a560378ebbf90d11ae328125b9b82b5adc19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,9 @@
 
 FROM golang:alpine as server-builder
 
-RUN apk update && apk upgrade && \
-    apk add --no-cache bash git openssh build-base && \
-    apk add --no-cache git ca-certificates tzdata libcap mailcap && \
-    update-ca-certificates
+RUN apk update && \
+    # apk add --no-cache bash git openssh build-base && \
+    apk add --no-cache git ca-certificates tzdata libcap mailcap && update-ca-certificates
 
 # Create appuser
 ENV USER=appuser
@@ -28,8 +27,11 @@ RUN chown -Rf "${UID}" ./*
 
 RUN go version
 RUN go get -d -v && \
-    go test ./... && \
-    go build -o /app/server
+    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test ./...
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
+    -ldflags='-w -s -extldflags "-static"' -a \
+    -o /app/server .
 
 RUN setcap cap_net_bind_service=+ep /app/server