diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml
index b9fb134357d45..0c97f28920707 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master.yaml
@@ -4,6 +4,11 @@ base_images:
     name: "4.5"
     namespace: ocp
     tag: base
+  ubi8:
+    cluster: https://api.ci.openshift.org
+    name: ubi
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     cluster: https://api.ci.openshift.org
@@ -14,6 +19,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: baremetal-runtimecfg
+- dockerfile_path: Dockerfile
+  from: ubi8
+  to: baremetal-runtimecfg-ubi8
 promotion:
   name: "4.5"
   namespace: ocp
diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml
index 806f4f5a95957..0c4ddf5c620e1 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.4.yaml
@@ -4,6 +4,11 @@ base_images:
     name: "4.4"
     namespace: ocp
     tag: base
+  ubi8:
+    cluster: https://api.ci.openshift.org
+    name: ubi
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     cluster: https://api.ci.openshift.org
@@ -14,6 +19,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: baremetal-runtimecfg
+- dockerfile_path: Dockerfile
+  from: ubi8
+  to: baremetal-runtimecfg-ubi8
 promotion:
   name: "4.4"
   namespace: ocp
diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.5.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.5.yaml
index ed39b8d6c001c..4fed391c0d074 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.5.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.5.yaml
@@ -4,6 +4,11 @@ base_images:
     name: "4.5"
     namespace: ocp
     tag: base
+  ubi8:
+    cluster: https://api.ci.openshift.org
+    name: ubi
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     cluster: https://api.ci.openshift.org
@@ -14,6 +19,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: baremetal-runtimecfg
+- dockerfile_path: Dockerfile
+  from: ubi8
+  to: baremetal-runtimecfg-ubi8
 promotion:
   disabled: true
   name: "4.5"
diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.6.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.6.yaml
index 71d2059300169..4c8cf4053f174 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.6.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.6.yaml
@@ -4,6 +4,11 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: base
+  ubi8:
+    cluster: https://api.ci.openshift.org
+    name: ubi
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     cluster: https://api.ci.openshift.org
@@ -14,6 +19,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   to: baremetal-runtimecfg
+- dockerfile_path: Dockerfile
+  from: ubi8
+  to: baremetal-runtimecfg-ubi8
 promotion:
   name: "4.6"
   namespace: ocp
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_4 b/core-services/image-mirroring/openshift/mapping_origin_4_4
index 225b1958e57b1..a4930dc8b702c 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_4
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_4
@@ -10,6 +10,7 @@ registry.svc.ci.openshift.org/origin/4.4:baremetal-installer quay.io/openshift/o
 registry.svc.ci.openshift.org/origin/4.4:baremetal-machine-controllers quay.io/openshift/origin-baremetal-machine-controllers:4.4 quay.io/openshift/origin-baremetal-machine-controllers:4.4.0
 registry.svc.ci.openshift.org/origin/4.4:baremetal-operator quay.io/openshift/origin-baremetal-operator:4.4 quay.io/openshift/origin-baremetal-operator:4.4.0
 registry.svc.ci.openshift.org/origin/4.4:baremetal-runtimecfg quay.io/openshift/origin-baremetal-runtimecfg:4.4 quay.io/openshift/origin-baremetal-runtimecfg:4.4.0
+registry.svc.ci.openshift.org/origin/4.4:baremetal-runtimecfg-ubi8 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.4 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.4.0
 registry.svc.ci.openshift.org/origin/4.4:base quay.io/openshift/origin-base:4.4 quay.io/openshift/origin-base:4.4.0
 registry.svc.ci.openshift.org/origin/4.4:branding quay.io/openshift/origin-branding:4.4 quay.io/openshift/origin-branding:4.4.0
 registry.svc.ci.openshift.org/origin/4.4:certman-operator quay.io/openshift/origin-certman-operator:4.4 quay.io/openshift/origin-certman-operator:4.4.0
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_5 b/core-services/image-mirroring/openshift/mapping_origin_4_5
index e39e470a715d8..a80ae64c019b0 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_5
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_5
@@ -7,6 +7,7 @@ registry.svc.ci.openshift.org/origin/4.5:aws-account-operator quay.io/openshift/
 registry.svc.ci.openshift.org/origin/4.5:aws-machine-controllers quay.io/openshift/origin-aws-machine-controllers:4.5 quay.io/openshift/origin-aws-machine-controllers:4.5.0 quay.io/openshift/origin-aws-machine-controllers:latest
 registry.svc.ci.openshift.org/origin/4.5:azure-machine-controllers quay.io/openshift/origin-azure-machine-controllers:4.5 quay.io/openshift/origin-azure-machine-controllers:4.5.0 quay.io/openshift/origin-azure-machine-controllers:latest
 registry.svc.ci.openshift.org/origin/4.5:baremetal-runtimecfg quay.io/openshift/origin-baremetal-runtimecfg:4.5 quay.io/openshift/origin-baremetal-runtimecfg:4.5.0 quay.io/openshift/origin-baremetal-runtimecfg:latest
+registry.svc.ci.openshift.org/origin/4.5:baremetal-runtimecfg-ubi8 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.5 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.5.0 quay.io/openshift/origin-baremetal-runtimecfg-ubi:latest
 registry.svc.ci.openshift.org/origin/4.5:base quay.io/openshift/origin-base:4.5 quay.io/openshift/origin-base:4.5.0 quay.io/openshift/origin-base:latest
 registry.svc.ci.openshift.org/origin/4.5:certman-operator quay.io/openshift/origin-certman-operator:4.5 quay.io/openshift/origin-certman-operator:4.5.0 quay.io/openshift/origin-certman-operator:latest
 registry.svc.ci.openshift.org/origin/4.5:cli quay.io/openshift/origin-cli:4.5 quay.io/openshift/origin-cli:4.5.0 quay.io/openshift/origin-cli:latest
diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_6 b/core-services/image-mirroring/openshift/mapping_origin_4_6
index e5c9441cd1754..a759190decafb 100644
--- a/core-services/image-mirroring/openshift/mapping_origin_4_6
+++ b/core-services/image-mirroring/openshift/mapping_origin_4_6
@@ -10,6 +10,7 @@ registry.svc.ci.openshift.org/ocp/4.6:baremetal-installer quay.io/openshift/orig
 registry.svc.ci.openshift.org/ocp/4.6:baremetal-machine-controllers quay.io/openshift/origin-baremetal-machine-controllers:4.6 quay.io/openshift/origin-baremetal-machine-controllers:4.6.0
 registry.svc.ci.openshift.org/ocp/4.6:baremetal-operator quay.io/openshift/origin-baremetal-operator:4.6 quay.io/openshift/origin-baremetal-operator:4.6.0
 registry.svc.ci.openshift.org/ocp/4.6:baremetal-runtimecfg quay.io/openshift/origin-baremetal-runtimecfg:4.6 quay.io/openshift/origin-baremetal-runtimecfg:4.6.0
+registry.svc.ci.openshift.org/ocp/4.6:baremetal-runtimecfg-ubi8 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.6 quay.io/openshift/origin-baremetal-runtimecfg-ubi8:4.6.0
 registry.svc.ci.openshift.org/ocp/4.6:base quay.io/openshift/origin-base:4.6 quay.io/openshift/origin-base:4.6.0
 registry.svc.ci.openshift.org/ocp/4.6:certman-operator quay.io/openshift/origin-certman-operator:4.6 quay.io/openshift/origin-certman-operator:4.6.0
 registry.svc.ci.openshift.org/ocp/4.6:cli quay.io/openshift/origin-cli:4.6 quay.io/openshift/origin-cli:4.6.0