diff --git a/Dockerfile b/Dockerfile
index f939eeb..9fb4eb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.6 as builder
+FROM golang:1.16.0 as builder
 WORKDIR /app
 ENV CGO_ENABLED=0
 ENV GOOS=linux
diff --git a/Dockerfile-goreleaser b/Dockerfile-goreleaser
index 7850756..8b3255c 100644
--- a/Dockerfile-goreleaser
+++ b/Dockerfile-goreleaser
@@ -1,9 +1,10 @@
-FROM alpine:3.12.0
+FROM golang:1.16.0 as builder
 
-RUN   apk update && \
-      apk add --no-cache \
-      ca-certificates
-
-ENTRYPOINT [ "/release-manager-bot" ]
+FROM scratch
+WORKDIR /app
 
+COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY release-manager-bot /
+
+ENTRYPOINT [ "./release-manager-bot" ]