diff --git a/Dockerfile-server-arm b/Dockerfile-server-arm
index 2685669..98a1b18 100644
--- a/Dockerfile-server-arm
+++ b/Dockerfile-server-arm
@@ -22,7 +22,7 @@
 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
 ARG BASE_TAG=8.8-860
 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset
-ARG BUILDER_TAG=1.19.9-2
+ARG BUILDER_TAG=1.21.9-3.1716505664
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_ARCHIVE="downloads/9.3.3.1-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxARM64.tar.gz"
 
diff --git a/Dockerfile-server-x64 b/Dockerfile-server-x64
index abe7b60..ebb4a7e 100644
--- a/Dockerfile-server-x64
+++ b/Dockerfile-server-x64
@@ -22,7 +22,7 @@
 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
 ARG BASE_TAG=8.8-860
 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset
-ARG BUILDER_TAG=1.19.9-2
+ARG BUILDER_TAG=1.21.9-3.1716505664
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_ARCHIVE="downloads/9.3.3.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"