diff --git a/Dockerfile b/Dockerfile
index 1fe14fe..db4344e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15 as builder
+FROM golang:1.17 as builder
 
 ARG VERSION
 ARG GIT_COMMITSHA
@@ -18,9 +18,9 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/base:nonroot-amd64
+FROM gcr.io/distroless/static
 ENV DISTRO="debian"
 ENV GOARCH="amd64"
 WORKDIR $HOME/.meshery
 COPY --from=builder /build/meshery-nsm .
-ENTRYPOINT ["./meshery-nsm"]
\ No newline at end of file
+ENTRYPOINT ["./meshery-nsm"]