diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 3142de03ffba9..0cccf81516587 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -91,7 +91,7 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
index 09a60a1fbe3e0..716216abd90a6 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
@@ -70,7 +70,7 @@ images:
 - build_args:
   - name: TAGS
     value: fcos
-  dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+  dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - build_args:
   - name: TAGS
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
index 199601f862382..b1148ed745683 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
@@ -91,7 +91,7 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml
index ae2ba355ad822..16c7206e3964a 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml
@@ -70,7 +70,7 @@ images:
 - build_args:
   - name: TAGS
     value: fcos
-  dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+  dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - build_args:
   - name: TAGS
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
index d9dd2d3300ac2..3b75109b62caa 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
@@ -91,7 +91,7 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml
index 93c7f6e9db0c2..9f40330c2b030 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml
@@ -70,7 +70,7 @@ images:
 - build_args:
   - name: TAGS
     value: fcos
-  dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+  dockerfile_path: images/installer/Dockerfile.upi.ci
   to: upi-installer
 - build_args:
   - name: TAGS