diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 184b284ec9db..0348a5240965 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -12,7 +12,7 @@ on:
 
 env:
   # Golang version to use across CI steps
-  GOLANG_VERSION: '1.17.6'
+  GOLANG_VERSION: '1.17'
 
 jobs:
   check-go:
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 767c2e1f1fe2..93c7b3ceded0 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -10,7 +10,7 @@ on:
     types: [ labeled, unlabeled, opened, synchronize, reopened ]
 
 env:
-  GOLANG_VERSION: '1.17.6'
+  GOLANG_VERSION: '1.17'
 
 jobs:
   publish:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 2f3c5ac1e3fc..33d19f6ec387 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ on:
       - '!release-v0*'
 
 env:
-    GOLANG_VERSION: '1.17.6'
+    GOLANG_VERSION: '1.17'
 
 jobs:
   prepare-release:
diff --git a/Dockerfile b/Dockerfile
index 571d1d588dbd..e35f30b60945 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=docker.io/library/ubuntu:21.10
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
 # Also used as the image in CI jobs so needs all dependencies
 ####################################################################################################
-FROM docker.io/library/golang:1.17.6 as builder
+FROM docker.io/library/golang:1.17 as builder
 
 RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
 
@@ -99,7 +99,7 @@ RUN HOST_ARCH='amd64' NODE_ENV='production' NODE_ONLINE_ENV='online' NODE_OPTION
 ####################################################################################################
 # Argo CD Build stage which performs the actual build of Argo CD binaries
 ####################################################################################################
-FROM --platform=$BUILDPLATFORM  docker.io/library/golang:1.17.6 as argocd-build
+FROM --platform=$BUILDPLATFORM  docker.io/library/golang:1.17 as argocd-build
 
 WORKDIR /go/src/github.com/argoproj/argo-cd
 
diff --git a/test/container/Dockerfile b/test/container/Dockerfile
index 2754b9458f98..da13986acd02 100644
--- a/test/container/Dockerfile
+++ b/test/container/Dockerfile
@@ -2,7 +2,7 @@ FROM redis:6.2.6 as redis
 
 FROM node:12.18.4 as node
 
-FROM golang:1.17.6 as golang
+FROM golang:1.17 as golang
 
 FROM registry:2.7.1 as registry
 
diff --git a/test/remote/Dockerfile b/test/remote/Dockerfile
index b9e144a38b92..a16d85fc8878 100644
--- a/test/remote/Dockerfile
+++ b/test/remote/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.6 AS go
+FROM golang:1.17 AS go
 
 RUN go install github.com/mattn/goreman@latest && \
     go install github.com/kisielk/godepgraph@latest