diff --git a/Dockerfile.createctconfig.rh b/Dockerfile.createctconfig.rh
index 53974affc..8462fcd77 100644
--- a/Dockerfile.createctconfig.rh
+++ b/Dockerfile.createctconfig.rh
@@ -1,5 +1,5 @@
 # Build the createctconfig binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /createctconfig
 RUN git config --global --add safe.directory /createctconfig
 
diff --git a/Dockerfile.ctlog-managectroots.rh b/Dockerfile.ctlog-managectroots.rh
index 7dd9dfc20..52e86c408 100644
--- a/Dockerfile.ctlog-managectroots.rh
+++ b/Dockerfile.ctlog-managectroots.rh
@@ -1,5 +1,5 @@
 # Build the managectroots binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /ctlog-managectroots
 RUN git config --global --add safe.directory /ctlog-managectroots
 
diff --git a/Dockerfile.ctlog-verifyfulcio.rh b/Dockerfile.ctlog-verifyfulcio.rh
index c5a3f48c2..7f6c35dbc 100644
--- a/Dockerfile.ctlog-verifyfulcio.rh
+++ b/Dockerfile.ctlog-verifyfulcio.rh
@@ -1,5 +1,5 @@
 # Build the verifyfulcio binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /ctlog-verifyfulcio
 RUN git config --global --add safe.directory /ctlog-verifyfulcio
 
diff --git a/Dockerfile.fulcio-createcerts.rh b/Dockerfile.fulcio-createcerts.rh
index fec5747de..61c796fc5 100644
--- a/Dockerfile.fulcio-createcerts.rh
+++ b/Dockerfile.fulcio-createcerts.rh
@@ -1,5 +1,5 @@
 # Build the createcerts binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /createcerts
 RUN git config --global --add safe.directory /createcerts
 
diff --git a/Dockerfile.trillian-createdb.rh b/Dockerfile.trillian-createdb.rh
index 6c98f6334..a104e9681 100644
--- a/Dockerfile.trillian-createdb.rh
+++ b/Dockerfile.trillian-createdb.rh
@@ -1,5 +1,5 @@
 # Build the createdb binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /createdb
 RUN git config --global --add safe.directory /createdb
 
diff --git a/Dockerfile.trillian-createtree.rh b/Dockerfile.trillian-createtree.rh
index ed7a1cdf5..7e8755db9 100644
--- a/Dockerfile.trillian-createtree.rh
+++ b/Dockerfile.trillian-createtree.rh
@@ -1,5 +1,5 @@
 # Build the createtree binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /createtree
 RUN git config --global --add safe.directory /createtree
 
diff --git a/Dockerfile.tuf-server.rh b/Dockerfile.tuf-server.rh
index e8e81a93e..49ae602ff 100644
--- a/Dockerfile.tuf-server.rh
+++ b/Dockerfile.tuf-server.rh
@@ -1,5 +1,5 @@
 # Build the tuf server binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:98a0ff138c536eee98704d6909699ad5d0725a20573e2c510a60ef462b45cce0 AS build-env
+FROM registry.redhat.io/rhel9/go-toolset@sha256:04be9e51263ab743cbcb778921b23527a3e35d493136fd353a90670d84ac457f AS build-env
 WORKDIR /tuf-server
 RUN git config --global --add safe.directory /tuf-server
 
@@ -9,7 +9,7 @@ RUN go mod vendor
 RUN make build-tuf-server
 
 # Install server
-FROM registry.access.redhat.com/ubi9-minimal@sha256:35a12657ce1bcb2b7667f4e6e0147186c1e0172cc43ece5452ab85afd6532791
+FROM registry.access.redhat.com/ubi9-minimal@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
 COPY --from=build-env /tuf-server/server /usr/local/bin/tuf-server
 RUN chown root:0 /usr/local/bin/tuf-server && chmod g+wx /usr/local/bin/tuf-server