diff --git a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.18.yaml b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.18.yaml
index b769a0f34d454..bbf85b6f11d5e 100644
--- a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.18.yaml
+++ b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.18.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.22
+    tag: rhel-9-release-golang-1.24-openshift-4.20
 images:
 - build_args:
   - name: TARGETARCH
diff --git a/ci-operator/config/devfile/registry/devfile-registry-main__v4.16.yaml b/ci-operator/config/devfile/registry/devfile-registry-main__v4.16.yaml
index d1606a6063a23..de28438c95db3 100644
--- a/ci-operator/config/devfile/registry/devfile-registry-main__v4.16.yaml
+++ b/ci-operator/config/devfile/registry/devfile-registry-main__v4.16.yaml
@@ -7,7 +7,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.23
+    tag: rhel-9-release-golang-1.24-openshift-4.20
 images:
 - dockerfile_path: .ci/Dockerfile
   to: registry