diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index c2cd246..e9b44ff 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,5 +1,5 @@
 # Author: Satish Gaikwad <satish@satishweb.com>
-FROM golang:1.13-alpine AS doh-build
+FROM golang:1.17-alpine AS doh-build
 LABEL MAINTAINER satish@satishweb.com
 
 RUN apk add --no-cache git make jq curl
@@ -18,7 +18,7 @@ RUN set -x ;\
     && cp doh-server/doh-server /dist/doh-server \
     && echo ${DOH_VERSION_LATEST} > /dist/doh-server.version
 
-FROM alpine:3.9
+FROM alpine:3
 LABEL MAINTAINER satish@satishweb.com
 
 COPY --from=doh-build /dist /server
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 1fc1b49..8609702 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,5 +1,5 @@
 # Author: Satish Gaikwad <satish@satishweb.com>
-FROM golang:1.13-buster AS doh-build
+FROM golang:1.17-buster AS doh-build
 LABEL MAINTAINER satish@satishweb.com
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -26,7 +26,7 @@ RUN set -x ;\
     && cp doh-server/doh-server /dist/doh-server \
     && echo ${DOH_VERSION_LATEST} > /dist/doh-server.version
 
-FROM ubuntu:20.04
+FROM ubuntu
 LABEL MAINTAINER satish@satishweb.com
 
 ENV DEBIAN_FRONTEND noninteractive