diff --git a/images/coredns.yml b/images/coredns.yml
index ffc553f976..f172179a93 100644
--- a/images/coredns.yml
+++ b/images/coredns.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.openshift.rhel7
+    dockerfile: Dockerfile.openshift.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/csi-attacher.yml b/images/csi-attacher.yml
index b22bbff532..8ba5c6754a 100644
--- a/images/csi-attacher.yml
+++ b/images/csi-attacher.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.openshift.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/csi-livenessprobe.yml b/images/csi-livenessprobe.yml
index 6b909d1fb4..7ff0c50b6b 100644
--- a/images/csi-livenessprobe.yml
+++ b/images/csi-livenessprobe.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.openshift.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/openshift-enterprise-ansible-operator.yml b/images/openshift-enterprise-ansible-operator.yml
index e5b324e022..ba0f9307e0 100644
--- a/images/openshift-enterprise-ansible-operator.yml
+++ b/images/openshift-enterprise-ansible-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: release/ansible/Dockerfile.ocp
-    dockerfile_fallback: release/ansible/Dockerfile.rhel8
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/openshift-enterprise-cluster-capacity.yml b/images/openshift-enterprise-cluster-capacity.yml
index e7c00e15ef..882374b1e2 100644
--- a/images/openshift-enterprise-cluster-capacity.yml
+++ b/images/openshift-enterprise-cluster-capacity.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: images/cluster-capacity/Dockerfile.ocp
-    dockerfile_fallback: images/cluster-capacity/Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/openshift-enterprise-console-operator.yml b/images/openshift-enterprise-console-operator.yml
index 5c524b3f7a..e909274930 100644
--- a/images/openshift-enterprise-console-operator.yml
+++ b/images/openshift-enterprise-console-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/openshift-enterprise-registry.yml b/images/openshift-enterprise-registry.yml
index 373eef729b..4e815f0578 100644
--- a/images/openshift-enterprise-registry.yml
+++ b/images/openshift-enterprise-registry.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-aws-pod-identity-webhook.yml b/images/ose-aws-pod-identity-webhook.yml
index 7f1bd9b45c..5a9019e4c7 100644
--- a/images/ose-aws-pod-identity-webhook.yml
+++ b/images/ose-aws-pod-identity-webhook.yml
@@ -4,7 +4,6 @@ arches:
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-config-api.yml b/images/ose-cluster-config-api.yml
index 7e4b91106c..47cc3484e3 100644
--- a/images/ose-cluster-config-api.yml
+++ b/images/ose-cluster-config-api.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel8
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-config-operator.yml b/images/ose-cluster-config-operator.yml
index 4b157d6dc4..eee3a99c2e 100644
--- a/images/ose-cluster-config-operator.yml
+++ b/images/ose-cluster-config-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-csi-snapshot-controller-operator.yml b/images/ose-cluster-csi-snapshot-controller-operator.yml
index 0f939bc991..9863de5c14 100644
--- a/images/ose-cluster-csi-snapshot-controller-operator.yml
+++ b/images/ose-cluster-csi-snapshot-controller-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-kube-apiserver-operator.yml b/images/ose-cluster-kube-apiserver-operator.yml
index c8095a9604..e1597ff837 100644
--- a/images/ose-cluster-kube-apiserver-operator.yml
+++ b/images/ose-cluster-kube-apiserver-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-kube-controller-manager-operator.yml b/images/ose-cluster-kube-controller-manager-operator.yml
index df5d940e28..ac9c1c50c4 100644
--- a/images/ose-cluster-kube-controller-manager-operator.yml
+++ b/images/ose-cluster-kube-controller-manager-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-cluster-kube-scheduler-operator.yml b/images/ose-cluster-kube-scheduler-operator.yml
index 553a9c1f4f..b3ef1f703d 100644
--- a/images/ose-cluster-kube-scheduler-operator.yml
+++ b/images/ose-cluster-kube-scheduler-operator.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-must-gather.yml b/images/ose-must-gather.yml
index c1c3b30818..61a3b4820c 100644
--- a/images/ose-must-gather.yml
+++ b/images/ose-must-gather.yml
@@ -1,7 +1,6 @@
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ose-oauth-apiserver.yml b/images/ose-oauth-apiserver.yml
index eaab11e1e0..05c0bdd531 100644
--- a/images/ose-oauth-apiserver.yml
+++ b/images/ose-oauth-apiserver.yml
@@ -1,7 +1,6 @@
 content:
   source:
-    dockerfile: images/Dockerfile.ocp
-    dockerfile_fallback: images/Dockerfile.rhel7
+    dockerfile: images/Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ptp-operator-must-gather.yml b/images/ptp-operator-must-gather.yml
index d429094761..8da475412a 100644
--- a/images/ptp-operator-must-gather.yml
+++ b/images/ptp-operator-must-gather.yml
@@ -5,7 +5,6 @@ arches:
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/ptp-operator.yml b/images/ptp-operator.yml
index a30112207b..607c227c0d 100644
--- a/images/ptp-operator.yml
+++ b/images/ptp-operator.yml
@@ -5,7 +5,6 @@ arches:
 content:
   source:
     dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/sriov-dp-admission-controller.yml b/images/sriov-dp-admission-controller.yml
index befb304944..626b5551a4 100644
--- a/images/sriov-dp-admission-controller.yml
+++ b/images/sriov-dp-admission-controller.yml
@@ -4,8 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/sriov-network-config-daemon.yml b/images/sriov-network-config-daemon.yml
index eb3f30d4ab..2fa2b5a8c4 100644
--- a/images/sriov-network-config-daemon.yml
+++ b/images/sriov-network-config-daemon.yml
@@ -4,8 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.sriov-network-config-daemon.ocp
-    dockerfile_fallback: Dockerfile.sriov-network-config-daemon.rhel7
+    dockerfile: Dockerfile.sriov-network-config-daemon.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/sriov-network-device-plugin.yml b/images/sriov-network-device-plugin.yml
index 160d0c61c4..ec3d66fe26 100644
--- a/images/sriov-network-device-plugin.yml
+++ b/images/sriov-network-device-plugin.yml
@@ -4,8 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/sriov-network-operator.yml b/images/sriov-network-operator.yml
index 0c50c67f99..99c44b5666 100644
--- a/images/sriov-network-operator.yml
+++ b/images/sriov-network-operator.yml
@@ -4,8 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.ocp
-    dockerfile_fallback: Dockerfile.rhel7
+    dockerfile: Dockerfile.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}
diff --git a/images/sriov-network-webhook.yml b/images/sriov-network-webhook.yml
index 6c70387c7c..b3177a0761 100644
--- a/images/sriov-network-webhook.yml
+++ b/images/sriov-network-webhook.yml
@@ -4,8 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.webhook.ocp
-    dockerfile_fallback: Dockerfile.webhook.rhel7
+    dockerfile: Dockerfile.webhook.rhel7
     git:
       branch:
         target: release-{MAJOR}.{MINOR}