diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml
index 6bbec6ad920c9..01a293e8ee172 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13-local-gateway.yaml
@@ -1,12 +1,8 @@
 base_images:
-  base:
+  ocp_4.14_base-rhel9:
     name: "4.14"
     namespace: ocp
-    tag: base
-  ocp_4.14_cli:
-    name: "4.14"
-    namespace: ocp
-    tag: cli
+    tag: base-rhel9
   ocp_builder_rhel-9-golang-1.19-openshift-4.14:
     name: builder
     namespace: ocp
@@ -14,25 +10,26 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.base
-  from: base
-  to: ovn-kubernetes-base
-- from: ovn-kubernetes-base
+- dockerfile_path: Dockerfile.base.rhel9
   inputs:
-    ocp_4.14_cli:
+    ocp_4.14_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:cli
-    ocp_builder_rhel-8-golang-1.19-openshift-4.13:
+      - registry.ci.openshift.org/ocp/4.14:base-rhel9
+  to: ovn-kubernetes-base-rhel-9
+- dockerfile_path: Dockerfile.rhel9
+  from: ovn-kubernetes-base-rhel-9
+  inputs:
+    ocp_builder_rhel-9-golang-1.19-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14
-  to: ovn-kubernetes
-- dockerfile_path: Dockerfile.microshift
-  from: ovn-kubernetes-base
+  to: ovn-kubernetes-rhel-9
+- dockerfile_path: Dockerfile.microshift.rhel9
+  from: ovn-kubernetes-base-rhel-9
   inputs:
     ocp_builder_rhel-9-golang-1.19-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14
-  to: ovn-kubernetes-microshift
+  to: ovn-kubernetes-microshift-rhel-9
 releases:
   initial:
     candidate:
diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml
index b620a4f318480..2703b54a543c7 100644
--- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml
+++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master__4.14-upgrade-from-stable-4.13.yaml
@@ -1,12 +1,8 @@
 base_images:
-  base:
+  ocp_4.14_base-rhel9:
     name: "4.14"
     namespace: ocp
-    tag: base
-  ocp_4.14_cli:
-    name: "4.14"
-    namespace: ocp
-    tag: cli
+    tag: base-rhel9
   ocp_builder_rhel-9-golang-1.19-openshift-4.14:
     name: builder
     namespace: ocp
@@ -14,25 +10,26 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.base
-  from: base
-  to: ovn-kubernetes-base
-- from: ovn-kubernetes-base
+- dockerfile_path: Dockerfile.base.rhel9
   inputs:
-    ocp_4.14_cli:
+    ocp_4.14_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:cli
+      - registry.ci.openshift.org/ocp/4.14:base-rhel9
+  to: ovn-kubernetes-base-rhel-9
+- dockerfile_path: Dockerfile.rhel9
+  from: ovn-kubernetes-base-rhel-9
+  inputs:
     ocp_builder_rhel-9-golang-1.19-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14
-  to: ovn-kubernetes
-- dockerfile_path: Dockerfile.microshift
-  from: ovn-kubernetes-base
+  to: ovn-kubernetes-rhel-9
+- dockerfile_path: Dockerfile.microshift.rhel9
+  from: ovn-kubernetes-base-rhel-9
   inputs:
     ocp_builder_rhel-9-golang-1.19-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14
-  to: ovn-kubernetes-microshift
+  to: ovn-kubernetes-microshift-rhel-9
 releases:
   initial:
     candidate: