diff --git a/Dockerfile b/Dockerfile
index 6618824151..6e0360ab2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the model-registry binary
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS common
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:9.8 AS common
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Dockerfile.odh b/Dockerfile.odh
index 821d5814b6..f290aae3bd 100644
--- a/Dockerfile.odh
+++ b/Dockerfile.odh
@@ -1,5 +1,5 @@
 # Build the model-registry binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:9.8 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests and workspace file