diff --git a/ci-operator/config/openshift/api/openshift-api-master.yaml b/ci-operator/config/openshift/api/openshift-api-master.yaml
index dee0727279849..e8a6ee2545871 100644
--- a/ci-operator/config/openshift/api/openshift-api-master.yaml
+++ b/ci-operator/config/openshift/api/openshift-api-master.yaml
@@ -19,7 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile.rhel8
+- dockerfile_path: Dockerfile.ocp
   inputs:
     ocp_4.16_base-rhel9:
       as:
@@ -100,24 +100,24 @@ tests:
   container:
     from: bin
 - as: e2e-aws-ovn
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws
 - as: e2e-aws-ovn-techpreview
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     env:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws
 - as: e2e-aws-serial
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     workflow: openshift-e2e-aws-serial
 - as: e2e-aws-serial-techpreview
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     env:
@@ -126,30 +126,30 @@ tests:
     workflow: openshift-e2e-aws-serial
 - as: e2e-gcp
   optional: true
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: gcp
     workflow: openshift-e2e-gcp
 - as: e2e-azure
   optional: true
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: azure4
     workflow: openshift-e2e-azure
 - as: e2e-upgrade
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     workflow: openshift-upgrade-aws
 - as: e2e-upgrade-minor
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: aws
     dependencies:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial-minor
     workflow: openshift-upgrade-aws
 - as: e2e-aws-ovn-hypershift
-  run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+  run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
   steps:
     cluster_profile: hypershift
     workflow: hypershift-aws-e2e-external
diff --git a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
index 28a7fbe74756f..52efd51389a27 100644
--- a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
@@ -68,7 +68,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-aws-ovn
     rerun_command: /test e2e-aws-ovn
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -147,7 +147,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-aws-ovn-hypershift
     rerun_command: /test e2e-aws-ovn-hypershift
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -226,7 +226,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-aws-ovn-techpreview
     rerun_command: /test e2e-aws-ovn-techpreview
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -305,7 +305,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-aws-serial
     rerun_command: /test e2e-aws-serial
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -384,7 +384,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-aws-serial-techpreview
     rerun_command: /test e2e-aws-serial-techpreview
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -464,7 +464,7 @@ presubmits:
     name: pull-ci-openshift-api-master-e2e-azure
     optional: true
     rerun_command: /test e2e-azure
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -544,7 +544,7 @@ presubmits:
     name: pull-ci-openshift-api-master-e2e-gcp
     optional: true
     rerun_command: /test e2e-gcp
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -627,7 +627,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-upgrade
     rerun_command: /test e2e-upgrade
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args:
@@ -706,7 +706,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-api-master-e2e-upgrade-minor
     rerun_command: /test e2e-upgrade-minor
-    run_if_changed: ^Dockerfile\.rhel8$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
+    run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$
     spec:
       containers:
       - args: