diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fbca7fb0..89a52f14 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,5 @@
-# [Choice] Go version: 1, 1.16, 1.15
-ARG VARIANT=1.17
-FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
+ARG GO_VERSION=1.17
+FROM mcr.microsoft.com/vscode/devcontainers/go:0-${GO_VERSION}
 
 # install mage
 RUN git clone https://github.com/magefile/mage && \
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 88004ed8..6680ccb0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -15,6 +15,6 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.x
+        go-version: 1.17.2
     - name: Test
       run: go test ./...
diff --git a/interceptor/Dockerfile b/interceptor/Dockerfile
index 649a830b..bf8ac1e6 100644
--- a/interceptor/Dockerfile
+++ b/interceptor/Dockerfile
@@ -1,6 +1,6 @@
 # adapted from Athens
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.17.2
 ARG GOARCH=amd64
 ARG GOOS=linux
 
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 957e7279..6a1f08ac 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -1,6 +1,6 @@
 # adapted from Athens 
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.17.2
 ARG GOARCH=amd64
 ARG GOOS=linux
 
diff --git a/scaler/Dockerfile b/scaler/Dockerfile
index e4d390ca..7f2ff929 100644
--- a/scaler/Dockerfile
+++ b/scaler/Dockerfile
@@ -1,10 +1,9 @@
 # taken from Athens
 # https://github.com/gomods/athens/blob/main/cmd/proxy/Dockerfile
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.17.2
 ARG GOARCH=amd64
 ARG GOOS=linux
 
-
 FROM golang:${GOLANG_VERSION}-alpine AS builder
 
 WORKDIR $GOPATH/src/github.com/kedacore/http-add-on