diff --git a/Dockerfile b/Dockerfile
index 3b66c6475..c5c82eb71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add make git
 COPY ui /src/ui
 RUN make -C /src/ui build
 
-FROM golang:1.16.7-alpine as go-builder
+FROM golang:1.17.0-alpine as go-builder
 RUN apk add make git
 COPY Makefile /src/Makefile
 COPY make /src/make
diff --git a/demo/Dockerfile b/demo/Dockerfile
index dbc43845b..27813a665 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add make git
 COPY ui /src/ui
 RUN make -C /src/ui build
 
-FROM golang:1.16.7-alpine as go-builder
+FROM golang:1.17.0-alpine as go-builder
 RUN apk add make git
 COPY Makefile /src/Makefile
 COPY make /src/make