diff --git a/group.yml b/group.yml
index 076717c455..eca28be4b3 100644
--- a/group.yml
+++ b/group.yml
@@ -64,7 +64,7 @@ assemblies:
   enabled: true
 
 cachito:
-  enabled: false # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206
+  enabled: true
 
 rhcos:
   payload_tags:
diff --git a/images/baremetal-machine-controller.yml b/images/baremetal-machine-controller.yml
index 93edfa5bd3..c1fb9aacaa 100644
--- a/images/baremetal-machine-controller.yml
+++ b/images/baremetal-machine-controller.yml
@@ -1,5 +1,3 @@
-cachito:
-  enabled: false # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206
 content:
   source:
     dockerfile: Dockerfile.rhel
diff --git a/images/baremetal-runtimecfg.yml b/images/baremetal-runtimecfg.yml
index e77acc6b2c..8893045f4c 100644
--- a/images/baremetal-runtimecfg.yml
+++ b/images/baremetal-runtimecfg.yml
@@ -1,12 +1,10 @@
-cachito:
-  enabled: false # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206
 content:
   source:
     dockerfile: Dockerfile.openshift
     git:
       branch:
-        target: release-{MAJOR}.{MINOR}
-      url: git@github.com:openshift-priv/baremetal-runtimecfg.git
+        target: dcb68b39e65f8b0ea803caf8e2e9297374605353
+      url: git@github.com:thegreyd/baremetal-runtimecfg.git
       web: https://github.com/openshift/baremetal-runtimecfg
     ci_alignment:
       streams_prs:
diff --git a/images/cluster-etcd-operator.yml b/images/cluster-etcd-operator.yml
index 6daad3fc33..fcb2e4a8a3 100644
--- a/images/cluster-etcd-operator.yml
+++ b/images/cluster-etcd-operator.yml
@@ -1,5 +1,3 @@
-cachito:
-  enabled: false # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206
 content:
   source:
     dockerfile: Dockerfile.ocp
diff --git a/images/nmstate-console-plugin.yml b/images/nmstate-console-plugin.yml
index 5df502da17..01d73d9cfe 100644
--- a/images/nmstate-console-plugin.yml
+++ b/images/nmstate-console-plugin.yml
@@ -1,5 +1,5 @@
 cachito:
-  enabled: true  # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206, explicitly enabling for nodejs
+  enabled: true
 content:
   source:
     dockerfile: Dockerfile.art
diff --git a/images/openshift-enterprise-console.yml b/images/openshift-enterprise-console.yml
index a77647202a..3aa9d56161 100644
--- a/images/openshift-enterprise-console.yml
+++ b/images/openshift-enterprise-console.yml
@@ -7,7 +7,7 @@ content:
       url: git@github.com:openshift-priv/console.git
       web: https://github.com/openshift/console
     pkg_managers:
-    #- gomod Take out go.mod processing because of STONEBLD-2479 not being supported
+    - gomod
     - yarn
     artifacts:
       from_urls:
diff --git a/images/ose-baremetal-operator.yml b/images/ose-baremetal-operator.yml
index 51282fd330..4824b0a583 100644
--- a/images/ose-baremetal-operator.yml
+++ b/images/ose-baremetal-operator.yml
@@ -3,14 +3,15 @@ content:
     dockerfile: Dockerfile.ocp
     git:
       branch:
-        target: release-{MAJOR}.{MINOR}
-      url: git@github.com:openshift-priv/baremetal-operator.git
+        target: e257b27fbfd89a4658803c805b8219120a23b5bd
+      url: git@github.com:thegreyd/baremetal-operator.git
       web: https://github.com/openshift/baremetal-operator
     ci_alignment:
       streams_prs:
         ci_build_root:
           stream: rhel-9-golang-ci-build-root
-    pkg_managers: []  # STONEBLD-2302: Cachito is on 1.21.0, and cannot deal with 1.21.6 in go.mod's toolchain directive
+    pkg_managers:
+    - gomod
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-baremetal-operator-container
diff --git a/images/ose-olm-operator-controller.yml b/images/ose-olm-operator-controller.yml
index d4b995b2f7..aa2f8caf58 100644
--- a/images/ose-olm-operator-controller.yml
+++ b/images/ose-olm-operator-controller.yml
@@ -1,5 +1,3 @@
-cachito:
-  enabled: false # Cachito does not work with go 1.22 https://issues.redhat.com/browse/STONEBLD-2206
 content:
   source:
     dockerfile: openshift/operator-controller.Dockerfile