diff --git a/Dockerfile b/Dockerfile
index 3f08e72..b8f6648 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.15.2 as builder
+FROM golang:1.16 as builder
 
 COPY . /build/mqtt2prometheus
 WORKDIR /build/mqtt2prometheus
 RUN make static_build TARGET_FILE=/bin/mqtt2prometheus
 
-FROM gcr.io/distroless/static-debian10
+FROM gcr.io/distroless/static-debian10:nonroot
 COPY --from=builder /bin/mqtt2prometheus /mqtt2prometheus
 CMD ["/mqtt2prometheus"]