diff --git a/Dockerfile b/Dockerfile
index 9c7cd0e4c..c5f189199 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.20.12 AS builder
+FROM registry.redhat.io/ubi9/go-toolset:1.21.13 AS builder
 
 ENV S2I_GIT_VERSION="" \
     S2I_GIT_MAJOR="" \
diff --git a/images/release/Dockerfile b/images/release/Dockerfile
index 8fa1f07a9..60633741c 100644
--- a/images/release/Dockerfile
+++ b/images/release/Dockerfile
@@ -3,7 +3,7 @@
 #
 # The standard name for this image is openshift/sti-release
 #
-FROM registry.redhat.io/ubi9/go-toolset:1.20.12 AS builder
+FROM registry.redhat.io/ubi9/go-toolset:1.21.13 AS builder
 
 USER root
 ENV S2I_VERSION_FILE=/opt/app-root/src/source-to-image/sti-version-defs