diff --git a/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0.yaml b/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0.yaml
index c62b92ff5d380..25d3913c25fba 100644
--- a/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0.yaml
+++ b/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0.yaml
@@ -11,19 +11,19 @@ images:
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    dockerfile_path: operator/Dockerfile
+    dockerfile_path: openshift/Containerfile.operator.rhel
     from: base
     to: custom-metrics-autoscaler-http-add-on-operator
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    dockerfile_path: interceptor/Dockerfile
+    dockerfile_path: openshift/Containerfile.interceptor.rhel
     from: base
     to: custom-metrics-autoscaler-http-add-on-interceptor
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    dockerfile_path: scaler/Dockerfile
+    dockerfile_path: openshift/Containerfile.scaler.rhel
     from: base
     to: custom-metrics-autoscaler-http-add-on-scaler
 promotion:
diff --git a/ci-operator/config/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0.yaml b/ci-operator/config/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0.yaml
index c4b365ea72558..4e82d36d8918f 100644
--- a/ci-operator/config/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0.yaml
+++ b/ci-operator/config/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0.yaml
@@ -1,8 +1,3 @@
-base_images:
-  base:
-    name: "5.0"
-    namespace: ocp
-    tag: base
 build_root:
   from_repository: true
 images:
@@ -10,17 +5,17 @@ images:
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    from: base
+    dockerfile_path: openshift/Containerfile.rhel
     to: custom-metrics-autoscaler
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    dockerfile_path: Dockerfile.webhooks
+    dockerfile_path: openshift/Containerfile.webhooks.rhel
     to: custom-metrics-autoscaler-webhooks
   - build_args:
     - name: GIT_COMMIT
       value: dummy-ci-commit-value
-    dockerfile_path: Dockerfile.adapter
+    dockerfile_path: openshift/Containerfile.adapter.rhel
     to: custom-metrics-autoscaler-adapter
   - dockerfile_path: Dockerfile.tests
     to: custom-metrics-autoscaler-tests
diff --git a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-postsubmits.yaml b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-postsubmits.yaml
index de24e7099f2aa..5d2fc3fcf446d 100644
--- a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-postsubmits.yaml
@@ -9,9 +9,9 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - interceptor/Dockerfile
-      - operator/Dockerfile
-      - scaler/Dockerfile
+      - openshift/Containerfile.interceptor.rhel
+      - openshift/Containerfile.operator.rhel
+      - openshift/Containerfile.scaler.rhel
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
diff --git a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-presubmits.yaml
index 1ab3c42e5d02c..b8718523007d8 100644
--- a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-release-5.0-presubmits.yaml
@@ -11,9 +11,9 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - interceptor/Dockerfile
-      - operator/Dockerfile
-      - scaler/Dockerfile
+      - openshift/Containerfile.interceptor.rhel
+      - openshift/Containerfile.operator.rhel
+      - openshift/Containerfile.scaler.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-postsubmits.yaml b/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-postsubmits.yaml
index 3cea89fc275cb..e5e824253137d 100644
--- a/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-postsubmits.yaml
@@ -9,10 +9,10 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
diff --git a/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-presubmits.yaml
index 59aa18058a080..d7d7933c1fd02 100644
--- a/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/kedacore-keda/openshift-kedacore-keda-release-5.0-presubmits.yaml
@@ -11,10 +11,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -80,10 +80,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -149,10 +149,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -218,10 +218,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -287,10 +287,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -348,10 +348,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
@@ -435,10 +435,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci-operator.openshift.io/cloud: gcp
       ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
@@ -522,10 +522,10 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - .ci-operator.yaml
-      - Dockerfile
-      - Dockerfile.adapter
       - Dockerfile.tests
-      - Dockerfile.webhooks
+      - openshift/Containerfile.adapter.rhel
+      - openshift/Containerfile.rhel
+      - openshift/Containerfile.webhooks.rhel
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"