diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
index ee9bd04eb..5576ed98f 100644
--- a/.github/actions/run-tests/Dockerfile
+++ b/.github/actions/run-tests/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
-ARG XX_VERSION=1.0.0-rc.2
+ARG GO_VERSION=1.16.12
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1
diff --git a/Dockerfile b/Dockerfile
index 8b818e9c7..8cad1e180 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
-ARG XX_VERSION=1.0.0-rc.2
+ARG GO_VERSION=1.16.12
+ARG GO_LATEST=1.17.5
+ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
 ARG LIBGIT2_TAG=libgit2-1.1.1-1
@@ -9,7 +10,7 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
-FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
+FROM --platform=$BUILDPLATFORM golang:${GO_LATEST}-${BASE_VARIANT} AS golatest
 
 FROM gostable AS go-linux