diff --git a/1.22/Dockerfile b/1.22/Dockerfile
index 95f9c8a..c7382e7 100644
--- a/1.22/Dockerfile
+++ b/1.22/Dockerfile
@@ -9,7 +9,7 @@ FROM cimg/base:2024.07
 
 LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
-ENV GO_VER="1.22.6"
+ENV GO_VER="1.22.7"
 
 # Install packages needed for CGO
 RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
@@ -27,7 +27,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 # renovate: datasource=github-releases depName=gotestyourself/gotestsum
 ENV GOTESTSUM_VERSION=1.12.0
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-ENV GOCI_LINT_VERSION=1.59.1
+ENV GOCI_LINT_VERSION=1.60.1
 # renovate: datasource=github-releases depName=golang/vuln
 ENV GOVULNCHECK_VERSION=1.1.3
 
diff --git a/1.22/browsers/Dockerfile b/1.22/browsers/Dockerfile
index 52fbb01..7c7fb30 100644
--- a/1.22/browsers/Dockerfile
+++ b/1.22/browsers/Dockerfile
@@ -1,6 +1,6 @@
 # vim:set ft=dockerfile:
 
-FROM cimg/go:1.22.6-node
+FROM cimg/go:1.22.7-node
 
 LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"
 
diff --git a/1.22/node/Dockerfile b/1.22/node/Dockerfile
index bd20517..4b6e72f 100644
--- a/1.22/node/Dockerfile
+++ b/1.22/node/Dockerfile
@@ -1,6 +1,6 @@
 # vim:set ft=dockerfile:
 
-FROM cimg/go:1.22.6
+FROM cimg/go:1.22.7
 
 LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
 
diff --git a/1.23/Dockerfile b/1.23/Dockerfile
index f73755a..55dd9b1 100644
--- a/1.23/Dockerfile
+++ b/1.23/Dockerfile
@@ -9,7 +9,7 @@ FROM cimg/base:2024.07
 
 LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
-ENV GO_VER="1.23.0"
+ENV GO_VER="1.23.1"
 
 # Install packages needed for CGO
 RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
@@ -20,8 +20,8 @@ RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
 	curl -sSL "https://go.dev/dl/go${GO_VER}.linux-${ARCH}.tar.gz" | sudo tar -xz -C /usr/local/ && \
 	mkdir -p /home/circleci/go/bin
 
-ENV GOPATH="/home/circleci/go"
-ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"
+ENV GOPATH /home/circleci/go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
 # Install related tools
 # renovate: datasource=github-releases depName=gotestyourself/gotestsum
diff --git a/1.23/browsers/Dockerfile b/1.23/browsers/Dockerfile
index 646bca6..3a4bbab 100644
--- a/1.23/browsers/Dockerfile
+++ b/1.23/browsers/Dockerfile
@@ -1,6 +1,6 @@
 # vim:set ft=dockerfile:
 
-FROM cimg/go:1.23.0-node
+FROM cimg/go:1.23.1-node
 
 LABEL maintainer="CircleCI Community & Partner Engineering Team <community-partner@circleci.com>"
 
diff --git a/1.23/node/Dockerfile b/1.23/node/Dockerfile
index 36432d3..ce07275 100644
--- a/1.23/node/Dockerfile
+++ b/1.23/node/Dockerfile
@@ -1,6 +1,6 @@
 # vim:set ft=dockerfile:
 
-FROM cimg/go:1.23.0
+FROM cimg/go:1.23.1
 
 LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
 
diff --git a/GEN-CHECK b/GEN-CHECK
index 25f78da..23a14ac 100644
--- a/GEN-CHECK
+++ b/GEN-CHECK
@@ -1 +1 @@
-GEN_CHECK=(1.23.0)
+GEN_CHECK=(1.23.1 1.22.7)
diff --git a/build-images.sh b/build-images.sh
index 37acdca..db6babe 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -4,6 +4,9 @@ set -eo pipefail
 
 docker context create cimg
 docker buildx create --use cimg
-docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/Dockerfile -t cimg/go:1.23.0 -t cimg/go:1.23 --push .
-docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/node/Dockerfile -t cimg/go:1.23.0-node -t cimg/go:1.23-node --push .
-docker buildx build --platform=linux/amd64 --file 1.23/browsers/Dockerfile -t cimg/go:1.23.0-browsers -t cimg/go:1.23-browsers --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/Dockerfile -t cimg/go:1.23.1 -t cimg/go:1.23 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.23/node/Dockerfile -t cimg/go:1.23.1-node -t cimg/go:1.23-node --push .
+docker buildx build --platform=linux/amd64 --file 1.23/browsers/Dockerfile -t cimg/go:1.23.1-browsers -t cimg/go:1.23-browsers --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.22/Dockerfile -t cimg/go:1.22.7 -t cimg/go:1.22 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.22/node/Dockerfile -t cimg/go:1.22.7-node -t cimg/go:1.22-node --push .
+docker buildx build --platform=linux/amd64 --file 1.22/browsers/Dockerfile -t cimg/go:1.22.7-browsers -t cimg/go:1.22-browsers --push .