diff --git a/ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.16.yaml b/ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.16.yaml
index d6041f71db35..b3b4baa4cfec 100644
--- a/ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/agent-installer-utils
 images:
 - dockerfile_path: images/Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/apiserver-network-proxy/openshift-priv-apiserver-network-proxy-release-4.16.yaml b/ci-operator/config/openshift-priv/apiserver-network-proxy/openshift-priv-apiserver-network-proxy-release-4.16.yaml
index 2748e196496e..176fa1a61d7e 100644
--- a/ci-operator/config/openshift-priv/apiserver-network-proxy/openshift-priv-apiserver-network-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/apiserver-network-proxy/openshift-priv-apiserver-network-proxy-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/apiserver-network-proxy
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.16.yaml b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.16.yaml
index 0a093747ad01..66505218baf6 100644
--- a/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/assisted-installer-agent
 images:
 - dockerfile_path: ./Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.16.yaml b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.16.yaml
index d1ee1ad1e5c7..6dd8e5624daa 100644
--- a/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.16.yaml
@@ -20,14 +20,12 @@ build_root:
 canonical_go_repository: github.com/openshift/assisted-installer
 images:
 - dockerfile_path: ./Dockerfile.assisted-installer.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: agent-installer-orchestrator
 - dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.16.yaml b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.16.yaml
index 174841b5b749..26c15d66786a 100644
--- a/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/openshift/assisted-service
 images:
 - dockerfile_path: ./Dockerfile.assisted-service.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift-priv/aws-pod-identity-webhook/openshift-priv-aws-pod-identity-webhook-release-4.16.yaml b/ci-operator/config/openshift-priv/aws-pod-identity-webhook/openshift-priv-aws-pod-identity-webhook-release-4.16.yaml
index cb3e777bb2a1..18d03b6a85da 100644
--- a/ci-operator/config/openshift-priv/aws-pod-identity-webhook/openshift-priv-aws-pod-identity-webhook-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/aws-pod-identity-webhook/openshift-priv-aws-pod-identity-webhook-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/aws/amazon-eks-pod-identity-webhook
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/azure-workload-identity/openshift-priv-azure-workload-identity-release-4.16.yaml b/ci-operator/config/openshift-priv/azure-workload-identity/openshift-priv-azure-workload-identity-release-4.16.yaml
index 96557c078e66..cfedb372670b 100644
--- a/ci-operator/config/openshift-priv/azure-workload-identity/openshift-priv-azure-workload-identity-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/azure-workload-identity/openshift-priv-azure-workload-identity-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/azure/azure-workload-identity
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/bond-cni/openshift-priv-bond-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/bond-cni/openshift-priv-bond-cni-release-4.16.yaml
index 68ae7081f2d9..f470c43d13c3 100644
--- a/ci-operator/config/openshift-priv/bond-cni/openshift-priv-bond-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/bond-cni/openshift-priv-bond-cni-release-4.16.yaml
@@ -19,7 +19,6 @@ build_root:
 canonical_go_repository: github.com/openshift/bond-cni
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.16.yaml b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.16.yaml
index b8482d8760ef..7e5c546e581f 100644
--- a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/builder
 images:
 - dockerfile_path: Dockerfile.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.16.yaml
index 23df8fef1786..c33f729ae033 100644
--- a/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.16.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cloud-credential-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.16.yaml
index f9fa3cf16c76..c040b987eb25 100644
--- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: openshift/cloud-network-config-controller
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.16.yaml
index 8a8c59137dd8..d743bf0f29e6 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-alibaba-cloud/openshift-priv-cloud-provider-alibaba-cloud-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: k8s.io/cloud-provider-alibaba-cloud
 images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-azure/openshift-priv-cloud-provider-azure-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-azure/openshift-priv-cloud-provider-azure-release-4.16.yaml
index bf24ea766fcc..217a55b90242 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-azure/openshift-priv-cloud-provider-azure-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-azure/openshift-priv-cloud-provider-azure-release-4.16.yaml
@@ -17,14 +17,12 @@ build_root:
 canonical_go_repository: github.com/kubernetes-sigs/cloud-provider-azure
 images:
 - dockerfile_path: openshift-hack/images/cloud-controller-manager-openshift.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: azure-cloud-controller-manager
 - dockerfile_path: openshift-hack/images/cloud-node-manager-openshift.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.16.yaml
index 4e947332e7af..12feaf389369 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-gcp/openshift-priv-cloud-provider-gcp-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: k8s.io/cloud-provider-gcp
 images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-kubevirt/openshift-priv-cloud-provider-kubevirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-kubevirt/openshift-priv-cloud-provider-kubevirt-release-4.16.yaml
index f63d195fbd13..7102c2cc6495 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-kubevirt/openshift-priv-cloud-provider-kubevirt-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-kubevirt/openshift-priv-cloud-provider-kubevirt-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: kubevirt.io/cloud-provider-kubevirt-cloud
 images:
 - dockerfile_path: openshift-hack/images/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.16.yaml
index ff61c17621d6..646de4a3e734 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-nutanix/openshift-priv-cloud-provider-nutanix-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/nutanix-cloud-native/cloud-provider-nutanix
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.16.yaml b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.16.yaml
index cef86a5446ac..b5ec4efebe6b 100644
--- a/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cloud-provider-vsphere/openshift-priv-cloud-provider-vsphere-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: github.com/kubernetes/cloud-provider-vsphere
 images:
 - dockerfile_path: openshift-hack/images/cloud-controller-manager-openshift.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml
index 0c7d8cc82e17..426b96c776d6 100644
--- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-operator
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-alibaba/openshift-priv-cluster-api-provider-alibaba-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-alibaba/openshift-priv-cluster-api-provider-alibaba-release-4.16.yaml
index 13dc876595c0..e221242f5010 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-alibaba/openshift-priv-cluster-api-provider-alibaba-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-alibaba/openshift-priv-cluster-api-provider-alibaba-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-api-provider-alibaba
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.16.yaml
index 84cca8100831..219d8445b451 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-release-4.16.yaml
@@ -25,7 +25,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-aws
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.16.yaml
index 455a779fc2be..2b69fcab184e 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-azure/openshift-priv-cluster-api-provider-azure-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-azure
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ibmcloud/openshift-priv-cluster-api-provider-ibmcloud-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ibmcloud/openshift-priv-cluster-api-provider-ibmcloud-release-4.16.yaml
index c8c0d5526f79..44241ca92096 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-ibmcloud/openshift-priv-cluster-api-provider-ibmcloud-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-ibmcloud/openshift-priv-cluster-api-provider-ibmcloud-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-ibmcloud
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-libvirt/openshift-priv-cluster-api-provider-libvirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-libvirt/openshift-priv-cluster-api-provider-libvirt-release-4.16.yaml
index 0de63fa611a1..f349ad4aef5a 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-libvirt/openshift-priv-cluster-api-provider-libvirt-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-libvirt/openshift-priv-cluster-api-provider-libvirt-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-api-provider-libvirt
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-metal3/openshift-priv-cluster-api-provider-metal3-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-metal3/openshift-priv-cluster-api-provider-metal3-release-4.16.yaml
index 8996ac89351f..126e25b43f9c 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-metal3/openshift-priv-cluster-api-provider-metal3-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-metal3/openshift-priv-cluster-api-provider-metal3-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-api-provider-metal3
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.16.yaml
index 5209e283f5c7..a8eb793c7d5e 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml
index 172132361aaa..c877915a502e 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml
@@ -21,7 +21,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-api-provider-ovirt
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.16.yaml
index 490319b5fe89..49721c6c3ce8 100644
--- a/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api-provider-vsphere/openshift-priv-cluster-api-provider-vsphere-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-vsphere
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.16.yaml
index 9e461f0640da..08ad578f71e4 100644
--- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-release-4.16.yaml
@@ -25,7 +25,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.16.yaml
index 2c728018a5c0..0841c542aeb0 100644
--- a/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-authentication-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.16.yaml
index 9a85fbfa438f..fdda4ad94b48 100644
--- a/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-autoscaler-operator/openshift-priv-cluster-autoscaler-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-autoscaler-operator
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-bootstrap/openshift-priv-cluster-bootstrap-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-bootstrap/openshift-priv-cluster-bootstrap-release-4.16.yaml
index 3d1fd586217b..8c7568a59963 100644
--- a/ci-operator/config/openshift-priv/cluster-bootstrap/openshift-priv-cluster-bootstrap-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-bootstrap/openshift-priv-cluster-bootstrap-release-4.16.yaml
@@ -20,8 +20,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-bootstrap
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-capacity/openshift-priv-cluster-capacity-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-capacity/openshift-priv-cluster-capacity-release-4.16.yaml
index 0b9baa79511c..39da69d1d564 100644
--- a/ci-operator/config/openshift-priv/cluster-capacity/openshift-priv-cluster-capacity-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capacity/openshift-priv-cluster-capacity-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.16.yaml
index 4f7b0327aa27..bbe0f9877b93 100644
--- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-capi-operator
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.16.yaml
index ef4c4fc272dc..142584a0772c 100644
--- a/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-config-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.16.yaml
index efe71486a5a5..e0607e42faec 100644
--- a/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-control-plane-machine-set-operator/openshift-priv-cluster-control-plane-machine-set-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-control-plane-machine-set-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.16.yaml
index a784c1caed68..6b2094809a6d 100644
--- a/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-dns-operator/openshift-priv-cluster-dns-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-dns-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.16.yaml
index f0058fa84933..52218d941338 100644
--- a/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.16.yaml
@@ -41,7 +41,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-etcd-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-ingress-operator/openshift-priv-cluster-ingress-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-ingress-operator/openshift-priv-cluster-ingress-operator-release-4.16.yaml
index b72f7d07d9a6..adf24a55ccb1 100644
--- a/ci-operator/config/openshift-priv/cluster-ingress-operator/openshift-priv-cluster-ingress-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-ingress-operator/openshift-priv-cluster-ingress-operator-release-4.16.yaml
@@ -19,8 +19,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-ingress-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.16.yaml
index f9ad2e012e9f..48ac30084226 100644
--- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.16.yaml
@@ -41,7 +41,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-kube-apiserver-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-kube-storage-version-migrator-operator/openshift-priv-cluster-kube-storage-version-migrator-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-kube-storage-version-migrator-operator/openshift-priv-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
index ae4ba0b67ac4..5fff952dba61 100644
--- a/ci-operator/config/openshift-priv/cluster-kube-storage-version-migrator-operator/openshift-priv-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-kube-storage-version-migrator-operator/openshift-priv-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-kube-storage-version-migrator-operator
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml
index 599533a3c431..8f8cab340ecc 100644
--- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-machine-approver
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-monitoring-operator/openshift-priv-cluster-monitoring-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-monitoring-operator/openshift-priv-cluster-monitoring-operator-release-4.16.yaml
index ff162ba57e1c..f9c1e64ea5a6 100644
--- a/ci-operator/config/openshift-priv/cluster-monitoring-operator/openshift-priv-cluster-monitoring-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-monitoring-operator/openshift-priv-cluster-monitoring-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-monitoring-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml
index f7f8a489638b..d5cd4f215699 100644
--- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml
@@ -29,7 +29,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-network-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml
index f3f332115780..4c458daa8b22 100644
--- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-nfd-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.16.yaml
index affe11dda6d4..ff182257c37d 100644
--- a/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-node-tuning-operator/openshift-priv-cluster-node-tuning-operator-release-4.16.yaml
@@ -24,14 +24,12 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-node-tuning-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: cluster-node-tuning-operator-us-tuned
 - dockerfile_path: Dockerfile.rhel9
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.16.yaml
index 4355d435f595..5590c0d656ab 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-apiserver-operator/openshift-priv-cluster-openshift-apiserver-operator-release-4.16.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-openshift-apiserver-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml
index 63321ae38113..5ad6ccc1b0e3 100644
--- a/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-openshift-controller-manager-operator/openshift-priv-cluster-openshift-controller-manager-operator-release-4.16.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-openshift-controller-manager-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-resource-override-admission-operator/openshift-priv-cluster-resource-override-admission-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-resource-override-admission-operator/openshift-priv-cluster-resource-override-admission-operator-release-4.16.yaml
index ae22772c19aa..9939a73c70b0 100644
--- a/ci-operator/config/openshift-priv/cluster-resource-override-admission-operator/openshift-priv-cluster-resource-override-admission-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-resource-override-admission-operator/openshift-priv-cluster-resource-override-admission-operator-release-4.16.yaml
@@ -17,14 +17,12 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-resource-override-admission-operator
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: cluster-resource-override-admission-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.16.yaml
index bdf8304e5e7c..a45cb4392d39 100644
--- a/ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-resource-override-admission
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/cluster-samples-operator/openshift-priv-cluster-samples-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-samples-operator/openshift-priv-cluster-samples-operator-release-4.16.yaml
index ca0ce828c0f1..dc5363a233ab 100644
--- a/ci-operator/config/openshift-priv/cluster-samples-operator/openshift-priv-cluster-samples-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-samples-operator/openshift-priv-cluster-samples-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-samples-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/cluster-update-keys/openshift-priv-cluster-update-keys-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-update-keys/openshift-priv-cluster-update-keys-release-4.16.yaml
index 5d969f6949a2..bae5d9ea84e9 100644
--- a/ci-operator/config/openshift-priv/cluster-update-keys/openshift-priv-cluster-update-keys-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/cluster-update-keys/openshift-priv-cluster-update-keys-release-4.16.yaml
@@ -8,7 +8,6 @@ build_root:
 canonical_go_repository: github.com/openshift/cluster-update-keys
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   to: cluster-update-keys
 promotion:
   name: 4.16-priv
diff --git a/ci-operator/config/openshift-priv/configmap-reload/openshift-priv-configmap-reload-release-4.16.yaml b/ci-operator/config/openshift-priv/configmap-reload/openshift-priv-configmap-reload-release-4.16.yaml
index abdbb84841c1..174a0ff000e7 100644
--- a/ci-operator/config/openshift-priv/configmap-reload/openshift-priv-configmap-reload-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/configmap-reload/openshift-priv-configmap-reload-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/configmap-reload
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.16.yaml
index 8ee5c0d526c4..61bef93eba54 100644
--- a/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/console-operator/openshift-priv-console-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/console-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.16.yaml b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.16.yaml
index 326c546e490f..c42495e93c99 100644
--- a/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/console/openshift-priv-console-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/openshift/console
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-base-nodejs-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.16.yaml b/ci-operator/config/openshift-priv/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.16.yaml
index 709a151d1add..c8806ba9c322 100644
--- a/ci-operator/config/openshift-priv/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/containernetworking-plugins
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/coredns/openshift-priv-coredns-release-4.16.yaml b/ci-operator/config/openshift-priv/coredns/openshift-priv-coredns-release-4.16.yaml
index 56c4a78ca7fa..d09ffaa6d71e 100644
--- a/ci-operator/config/openshift-priv/coredns/openshift-priv-coredns-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/coredns/openshift-priv-coredns-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/coredns/coredns
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.16.yaml
index 05b79af78139..096d2ce4d204 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource-operator/openshift-priv-csi-driver-shared-resource-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.16.yaml b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.16.yaml
index 2e8da7f57e2e..cb8d946907b1 100644
--- a/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/csi-driver-shared-resource/openshift-priv-csi-driver-shared-resource-release-4.16.yaml
@@ -16,8 +16,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/csi-driver-shared-resource
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
@@ -26,7 +25,6 @@ images:
   from: must_gather
   to: csi-driver-shared-resource-mustgather
 - dockerfile_path: Dockerfile.webhook
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/dpu-network-operator/openshift-priv-dpu-network-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/dpu-network-operator/openshift-priv-dpu-network-operator-release-4.16.yaml
index 56735e37306b..ed1a5f8c0e39 100644
--- a/ci-operator/config/openshift-priv/dpu-network-operator/openshift-priv-dpu-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/dpu-network-operator/openshift-priv-dpu-network-operator-release-4.16.yaml
@@ -9,7 +9,6 @@ build_root:
 canonical_go_repository: github.com/openshift/dpu-network-operator
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: dpu-network-operator
 promotion:
   name: 4.16-priv
diff --git a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.16.yaml b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.16.yaml
index 270bb7771622..8791fa62b846 100644
--- a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.16.yaml
@@ -15,7 +15,6 @@ images:
   - name: RHEL_VERSION
     value: "9.2"
   dockerfile_path: Dockerfile
-  from: base
   to: driver-toolkit
 promotion:
   additional_images:
diff --git a/ci-operator/config/openshift-priv/egress-router-cni/openshift-priv-egress-router-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/egress-router-cni/openshift-priv-egress-router-cni-release-4.16.yaml
index a08d5e6b3ae1..7af94d3cdd9b 100644
--- a/ci-operator/config/openshift-priv/egress-router-cni/openshift-priv-egress-router-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/egress-router-cni/openshift-priv-egress-router-cni-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: github.com/openshift/egress-router-cni
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/etcd/openshift-priv-etcd-openshift-4.16.yaml b/ci-operator/config/openshift-priv/etcd/openshift-priv-etcd-openshift-4.16.yaml
index 3b28cf7d7eae..ec94f5fbfea6 100644
--- a/ci-operator/config/openshift-priv/etcd/openshift-priv-etcd-openshift-4.16.yaml
+++ b/ci-operator/config/openshift-priv/etcd/openshift-priv-etcd-openshift-4.16.yaml
@@ -24,7 +24,6 @@ build_root:
 canonical_go_repository: go.etcd.io/etcd
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-etcd-golang-1.19:
       as:
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.16.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.16.yaml
index 32fb46e07562..c7a441c4c94d 100644
--- a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.16.yaml
@@ -24,14 +24,12 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/hypershift
 images:
-- from: base
-  inputs:
+- inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: hypershift-operator
 - dockerfile_path: Dockerfile.control-plane
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.16.yaml
index 6a40d71ce5b6..c0469ca501e8 100644
--- a/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/ib-sriov-cni/openshift-priv-ib-sriov-cni-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/ib-sriov-cni
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/ibm-powervs-block-csi-driver/openshift-priv-ibm-powervs-block-csi-driver-release-4.16.yaml b/ci-operator/config/openshift-priv/ibm-powervs-block-csi-driver/openshift-priv-ibm-powervs-block-csi-driver-release-4.16.yaml
index fe2e9525125b..0ff9e1dd3037 100644
--- a/ci-operator/config/openshift-priv/ibm-powervs-block-csi-driver/openshift-priv-ibm-powervs-block-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/ibm-powervs-block-csi-driver/openshift-priv-ibm-powervs-block-csi-driver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/ibm-powervs-block-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.16.yaml b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.16.yaml
index be8ebfb3634f..0a079be004d4 100644
--- a/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/image-customization-controller/openshift-priv-image-customization-controller-release-4.16.yaml
@@ -15,8 +15,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/image-customization-controller
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml b/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml
index 7a38c38de2d5..40bacb3320e4 100644
--- a/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml
@@ -26,16 +26,12 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.15
   to: base-rhel9
 - context_dir: egress/router
-  from: base
   to: egress-router
 - context_dir: egress/http-proxy
-  from: base
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
-  from: base
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
-  from: base
   to: keepalived-ipfailover
 promotion:
   name: 4.16-priv
diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.16.yaml
index d5eb2c163530..2e22c5b7967d 100644
--- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.16.yaml
@@ -19,8 +19,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/insights-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml
index 30fc34bfe9bf..b038fb0790ff 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml
@@ -56,7 +56,6 @@ build_root:
 canonical_go_repository: github.com/openshift/installer
 images:
 - dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml
index d07319904f97..259e00cfbfb2 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/installer
 images:
 - dockerfile_path: images/installer-altinfra/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__terraform.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__terraform.yaml
index e46867d2bc11..a1fb69a3bc2e 100644
--- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__terraform.yaml
+++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__terraform.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/installer
 images:
 - dockerfile_path: images/infrastructure-providers/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.16.yaml b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.16.yaml
index 860b39168809..203202af52b4 100644
--- a/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/k8s-prometheus-adapter/openshift-priv-k8s-prometheus-adapter-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/directxman12/k8s-prometheus-adapter
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.16.yaml b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.16.yaml
index 7f46fd016484..7448d2f2dc0a 100644
--- a/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kube-rbac-proxy/openshift-priv-kube-rbac-proxy-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/kube-rbac-proxy
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-release-4.16.yaml b/ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-release-4.16.yaml
index a11c61602043..2771f898eb4c 100644
--- a/ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kube-state-metrics/openshift-priv-kube-state-metrics-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: k8s.io/kube-state-metrics
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.16.yaml b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.16.yaml
index 9b967e89fd81..7e9b5b28d941 100644
--- a/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-autoscaler/openshift-priv-kubernetes-autoscaler-release-4.16.yaml
@@ -21,7 +21,6 @@ build_root:
 canonical_go_repository: k8s.io/autoscaler
 images:
 - dockerfile_path: images/cluster-autoscaler/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
@@ -29,7 +28,6 @@ images:
   to: cluster-autoscaler
 - context_dir: vertical-pod-autoscaler
   dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kubernetes-kube-storage-version-migrator/openshift-priv-kubernetes-kube-storage-version-migrator-release-4.16.yaml b/ci-operator/config/openshift-priv/kubernetes-kube-storage-version-migrator/openshift-priv-kubernetes-kube-storage-version-migrator-release-4.16.yaml
index 959797791fa4..31e91d24c88f 100644
--- a/ci-operator/config/openshift-priv/kubernetes-kube-storage-version-migrator/openshift-priv-kubernetes-kube-storage-version-migrator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-kube-storage-version-migrator/openshift-priv-kubernetes-kube-storage-version-migrator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/kubernetes-sigs/kube-storage-version-migrator
 images:
 - dockerfile_path: images/release/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kubernetes-metrics-server/openshift-priv-kubernetes-metrics-server-release-4.16.yaml b/ci-operator/config/openshift-priv/kubernetes-metrics-server/openshift-priv-kubernetes-metrics-server-release-4.16.yaml
index 330f8659fc94..cb668da75843 100644
--- a/ci-operator/config/openshift-priv/kubernetes-metrics-server/openshift-priv-kubernetes-metrics-server-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kubernetes-metrics-server/openshift-priv-kubernetes-metrics-server-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: https://github.com/kubernetes-sigs/metrics-server
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml
index 8fddfc57af9d..a63b19bb4bb7 100644
--- a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/kubevirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-release-4.16.yaml b/ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-release-4.16.yaml
index f65af7110dc0..cf1c94478f49 100644
--- a/ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/linuxptp-daemon/openshift-priv-linuxptp-daemon-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/linuxptp-daemon
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.16.yaml
index 579b3a6bc4df..a492915700c8 100644
--- a/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-operator/openshift-priv-machine-api-operator-release-4.16.yaml
@@ -17,7 +17,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-operator
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.16.yaml
index b4de6acc7a12..02a3ab17f2a7 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-aws/openshift-priv-machine-api-provider-aws-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-aws
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.16.yaml
index db61872878bd..0f5a0a983b76 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-azure/openshift-priv-machine-api-provider-azure-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-azure
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.16.yaml
index 5a3ba8bb86ab..c0a49fb87739 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-gcp/openshift-priv-machine-api-provider-gcp-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-gcp
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.16.yaml
index e2605bb21bcc..d39da3cda167 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-ibmcloud/openshift-priv-machine-api-provider-ibmcloud-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-ibmcloud
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.16.yaml
index d2da1c64ce5f..ffc418814747 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-nutanix/openshift-priv-machine-api-provider-nutanix-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-nutanix
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-api-provider-powervs/openshift-priv-machine-api-provider-powervs-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-api-provider-powervs/openshift-priv-machine-api-provider-powervs-release-4.16.yaml
index 70304a02a0e9..8f6913d69c01 100644
--- a/ci-operator/config/openshift-priv/machine-api-provider-powervs/openshift-priv-machine-api-provider-powervs-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-api-provider-powervs/openshift-priv-machine-api-provider-powervs-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-api-provider-powervs
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml
index 43f643741f74..601baa79406a 100644
--- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml
@@ -56,7 +56,6 @@ build_root:
 canonical_go_repository: github.com/openshift/machine-config-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.16.yaml
index ff1cb674dce5..48a168c0bb65 100644
--- a/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.16.yaml
@@ -19,7 +19,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift-priv/metallb-operator/openshift-priv-metallb-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/metallb-operator/openshift-priv-metallb-operator-release-4.16.yaml
index 9b18b4be4e64..84f929b86161 100644
--- a/ci-operator/config/openshift-priv/metallb-operator/openshift-priv-metallb-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/metallb-operator/openshift-priv-metallb-operator-release-4.16.yaml
@@ -31,14 +31,12 @@ build_root:
 canonical_go_repository: github.com/openshift/metallb-operator
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: metallb-operator
 - dockerfile_path: bundleci.Dockerfile
-  from: base
   to: metallb-operator-bundle
 operator:
   bundles:
diff --git a/ci-operator/config/openshift-priv/metallb/openshift-priv-metallb-release-4.16.yaml b/ci-operator/config/openshift-priv/metallb/openshift-priv-metallb-release-4.16.yaml
index ff6f83c1ce9f..db02cbc7822b 100644
--- a/ci-operator/config/openshift-priv/metallb/openshift-priv-metallb-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/metallb/openshift-priv-metallb-release-4.16.yaml
@@ -19,7 +19,6 @@ build_root:
 canonical_go_repository: github.com/openshift/metallb
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.16.yaml b/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.16.yaml
index b7904a0a0c01..4380c4116acc 100644
--- a/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/multus-admission-controller
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/multus-cni/openshift-priv-multus-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/multus-cni/openshift-priv-multus-cni-release-4.16.yaml
index 4f3d1e364777..51c43bb5db09 100644
--- a/ci-operator/config/openshift-priv/multus-cni/openshift-priv-multus-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/multus-cni/openshift-priv-multus-cni-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/multus-cni
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/multus-networkpolicy/openshift-priv-multus-networkpolicy-release-4.16.yaml b/ci-operator/config/openshift-priv/multus-networkpolicy/openshift-priv-multus-networkpolicy-release-4.16.yaml
index 2cd9316c3876..0562b98bdd54 100644
--- a/ci-operator/config/openshift-priv/multus-networkpolicy/openshift-priv-multus-networkpolicy-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/multus-networkpolicy/openshift-priv-multus-networkpolicy-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/multus-networkpolicy
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.16.yaml b/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.16.yaml
index 743c52266925..715d3a24271d 100644
--- a/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/must-gather
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/network-metrics-daemon/openshift-priv-network-metrics-daemon-release-4.16.yaml b/ci-operator/config/openshift-priv/network-metrics-daemon/openshift-priv-network-metrics-daemon-release-4.16.yaml
index b15b18771168..272a518b01af 100644
--- a/ci-operator/config/openshift-priv/network-metrics-daemon/openshift-priv-network-metrics-daemon-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/network-metrics-daemon/openshift-priv-network-metrics-daemon-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/network-metrics-daemon
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/node_exporter/openshift-priv-node_exporter-release-4.16.yaml b/ci-operator/config/openshift-priv/node_exporter/openshift-priv-node_exporter-release-4.16.yaml
index 94eebfb45b24..c014e036047e 100644
--- a/ci-operator/config/openshift-priv/node_exporter/openshift-priv-node_exporter-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/node_exporter/openshift-priv-node_exporter-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/node_exporter
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.16.yaml b/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.16.yaml
index a21c2cde59ff..6cc5c949b099 100644
--- a/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/oauth-apiserver/openshift-priv-oauth-apiserver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/oauth-apiserver
 images:
 - dockerfile_path: images/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-release-4.16.yaml b/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-release-4.16.yaml
index 0db8be018673..7e4ae05e79b0 100644
--- a/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-release-4.16.yaml
@@ -12,8 +12,7 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/oauth-proxy
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift-priv/oauth-server/openshift-priv-oauth-server-release-4.16.yaml b/ci-operator/config/openshift-priv/oauth-server/openshift-priv-oauth-server-release-4.16.yaml
index e73aca91bc69..0e6ca2dedce8 100644
--- a/ci-operator/config/openshift-priv/oauth-server/openshift-priv-oauth-server-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/oauth-server/openshift-priv-oauth-server-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/oauth-server
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/oc-mirror/openshift-priv-oc-mirror-release-4.16.yaml b/ci-operator/config/openshift-priv/oc-mirror/openshift-priv-oc-mirror-release-4.16.yaml
index e1737ba667e5..03e74d4bc51a 100644
--- a/ci-operator/config/openshift-priv/oc-mirror/openshift-priv-oc-mirror-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/oc-mirror/openshift-priv-oc-mirror-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/oc-mirror
 images:
 - dockerfile_path: images/cli/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml
index 6510e897e4fb..db25976993e4 100644
--- a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml
@@ -25,7 +25,6 @@ build_root:
 canonical_go_repository: github.com/openshift/oc
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/openshift-apiserver/openshift-priv-openshift-apiserver-release-4.16.yaml b/ci-operator/config/openshift-priv/openshift-apiserver/openshift-priv-openshift-apiserver-release-4.16.yaml
index 26cbe7acc43c..cd1d6cecf972 100644
--- a/ci-operator/config/openshift-priv/openshift-apiserver/openshift-priv-openshift-apiserver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/openshift-apiserver/openshift-priv-openshift-apiserver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/openshift-apiserver
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml
index feb4472c7910..9d0a4bb72878 100644
--- a/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/openshift-controller-manager
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/operator-framework-catalogd/openshift-priv-operator-framework-catalogd-release-4.16.yaml b/ci-operator/config/openshift-priv/operator-framework-catalogd/openshift-priv-operator-framework-catalogd-release-4.16.yaml
index b87d98bf8bac..2ccc75fce036 100644
--- a/ci-operator/config/openshift-priv/operator-framework-catalogd/openshift-priv-operator-framework-catalogd-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-catalogd/openshift-priv-operator-framework-catalogd-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/operator-framework-catalogd
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.16.yaml b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.16.yaml
index 488405f8b04a..baea77cee9c3 100644
--- a/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-olm/openshift-priv-operator-framework-olm-release-4.16.yaml
@@ -12,14 +12,12 @@ build_root:
 canonical_go_repository: github.com/openshift/operator-framework-olm
 images:
 - dockerfile_path: operator-lifecycle-manager.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: operator-lifecycle-manager
 - dockerfile_path: operator-registry.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.16.yaml b/ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.16.yaml
index 8536b3b8fab7..c9bb7586a5dc 100644
--- a/ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/operator-framework-operator-controller
 images:
 - dockerfile_path: openshift/operator-controller.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/operator-framework-rukpak/openshift-priv-operator-framework-rukpak-release-4.16.yaml b/ci-operator/config/openshift-priv/operator-framework-rukpak/openshift-priv-operator-framework-rukpak-release-4.16.yaml
index fb054d53e9d6..10beb3168529 100644
--- a/ci-operator/config/openshift-priv/operator-framework-rukpak/openshift-priv-operator-framework-rukpak-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/operator-framework-rukpak/openshift-priv-operator-framework-rukpak-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/operator-framework-rukpak
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml
index 75c5c35089b5..7d75d1d87308 100644
--- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml
@@ -43,7 +43,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: tests
 - dockerfile_path: images/hello-openshift/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.16.yaml b/ci-operator/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.16.yaml
index 8fc252c23e54..c4e885c6fe00 100644
--- a/ci-operator/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/ovirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.13:
       as:
diff --git a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.16.yaml b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.16.yaml
index 4653f468f98b..1a14088c25bb 100644
--- a/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/platform-operators/openshift-priv-platform-operators-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/platform-operators
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/prom-label-proxy/openshift-priv-prom-label-proxy-release-4.16.yaml b/ci-operator/config/openshift-priv/prom-label-proxy/openshift-priv-prom-label-proxy-release-4.16.yaml
index 475ac48e1e69..6cf8d2260797 100644
--- a/ci-operator/config/openshift-priv/prom-label-proxy/openshift-priv-prom-label-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/prom-label-proxy/openshift-priv-prom-label-proxy-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/prom-label-proxy
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.16.yaml b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.16.yaml
index 6451c6217dae..967f9b3c4dfe 100644
--- a/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/prometheus-alertmanager/openshift-priv-prometheus-alertmanager-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/prometheus-alertmanager
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/prometheus/openshift-priv-prometheus-release-4.16.yaml b/ci-operator/config/openshift-priv/prometheus/openshift-priv-prometheus-release-4.16.yaml
index 90d92631e3a3..b269c8224bcf 100644
--- a/ci-operator/config/openshift-priv/prometheus/openshift-priv-prometheus-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/prometheus/openshift-priv-prometheus-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/prometheus
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.16.yaml
index fcbe8836ea87..61dd0d208bdd 100644
--- a/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/ptp-operator/openshift-priv-ptp-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/ptp-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.16.yaml b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.16.yaml
index e9aae146a963..df9000051e83 100644
--- a/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/route-controller-manager/openshift-priv-route-controller-manager-release-4.16.yaml
@@ -21,7 +21,6 @@ build_root:
 canonical_go_repository: github.com/openshift/route-controller-manager
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/route-override-cni/openshift-priv-route-override-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/route-override-cni/openshift-priv-route-override-cni-release-4.16.yaml
index ef337b723c28..c31e70247b4a 100644
--- a/ci-operator/config/openshift-priv/route-override-cni/openshift-priv-route-override-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/route-override-cni/openshift-priv-route-override-cni-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/route-override-cni
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/sdn/openshift-priv-sdn-release-4.16.yaml b/ci-operator/config/openshift-priv/sdn/openshift-priv-sdn-release-4.16.yaml
index 5683835eca9f..b600fc9fd3fd 100644
--- a/ci-operator/config/openshift-priv/sdn/openshift-priv-sdn-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/sdn/openshift-priv-sdn-release-4.16.yaml
@@ -21,7 +21,6 @@ build_root:
 canonical_go_repository: github.com/openshift/sdn
 images:
 - dockerfile_path: images/sdn/Dockerfile.rhel
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -34,7 +33,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sdn
 - dockerfile_path: images/kube-proxy/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.16.yaml
index 05a77198dedc..67274c13655a 100644
--- a/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/service-ca-operator/openshift-priv-service-ca-operator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/openshift/service-ca-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.16.yaml
index a49cd7a6c5f4..1eabf5589586 100644
--- a/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/sriov-cni/openshift-priv-sriov-cni-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/sriov-cni
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/sriov-dp-admission-controller/openshift-priv-sriov-dp-admission-controller-release-4.16.yaml b/ci-operator/config/openshift-priv/sriov-dp-admission-controller/openshift-priv-sriov-dp-admission-controller-release-4.16.yaml
index 94b85f43970e..9e8ffd136ee4 100644
--- a/ci-operator/config/openshift-priv/sriov-dp-admission-controller/openshift-priv-sriov-dp-admission-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/sriov-dp-admission-controller/openshift-priv-sriov-dp-admission-controller-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/sriov-dp-admission-controller
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/sriov-network-device-plugin/openshift-priv-sriov-network-device-plugin-release-4.16.yaml b/ci-operator/config/openshift-priv/sriov-network-device-plugin/openshift-priv-sriov-network-device-plugin-release-4.16.yaml
index 723640762e31..72c8bc5c87cc 100644
--- a/ci-operator/config/openshift-priv/sriov-network-device-plugin/openshift-priv-sriov-network-device-plugin-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/sriov-network-device-plugin/openshift-priv-sriov-network-device-plugin-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/sriov-network-device-plugin
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.16.yaml
index 69e7cb6352d4..5d079228a6c0 100644
--- a/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.16.yaml
@@ -36,21 +36,18 @@ build_root:
 canonical_go_repository: github.com/openshift/sriov-network-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.16.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.16.yaml
index ae0bed258907..07a22dd6634f 100644
--- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/telemeter
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.16.yaml b/ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.16.yaml
index 48a1c19416b6..dc1bf573af9b 100644
--- a/ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/openshift/thanos
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift-priv/vertical-pod-autoscaler-operator/openshift-priv-vertical-pod-autoscaler-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/vertical-pod-autoscaler-operator/openshift-priv-vertical-pod-autoscaler-operator-release-4.16.yaml
index a5e39dcff734..023702b617ae 100644
--- a/ci-operator/config/openshift-priv/vertical-pod-autoscaler-operator/openshift-priv-vertical-pod-autoscaler-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/vertical-pod-autoscaler-operator/openshift-priv-vertical-pod-autoscaler-operator-release-4.16.yaml
@@ -15,14 +15,12 @@ build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/vertical-pod-autoscaler-operator
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: vertical-pod-autoscaler-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
diff --git a/ci-operator/config/openshift-priv/whereabouts-cni/openshift-priv-whereabouts-cni-release-4.16.yaml b/ci-operator/config/openshift-priv/whereabouts-cni/openshift-priv-whereabouts-cni-release-4.16.yaml
index 0d86d7923af5..9449ebc8afe6 100644
--- a/ci-operator/config/openshift-priv/whereabouts-cni/openshift-priv-whereabouts-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift-priv/whereabouts-cni/openshift-priv-whereabouts-cni-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/openshift/whereabouts-cni
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml
index 73554d007a4a..5b0fd7472623 100644
--- a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml
+++ b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.15.yaml b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.15.yaml
index af44e809d557..b56f11d874e9 100644
--- a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.15.yaml
+++ b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.16.yaml b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.16.yaml
index 467e05e1730e..49def1e85afb 100644
--- a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.16.yaml
+++ b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml
index 64f13bbf8835..1b1ec43bcd82 100644
--- a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml
+++ b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml
index 3fea30e1742a..a5a01df302e0 100644
--- a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml
+++ b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml
index 0bed9f0e0791..b7a9087d562e 100644
--- a/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
index bf6e017e6ece..8d8717274e93 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.15.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.15.yaml
index afc63010f7e1..06040eb14ba1 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.15.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.16.yaml b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.16.yaml
index 127493c2ec73..8bf6dbc71215 100644
--- a/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.16.yaml
+++ b/ci-operator/config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
index 82e405d40150..86819660927e 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
@@ -19,14 +19,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-installer.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: agent-installer-orchestrator
 - dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.15.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.15.yaml
index 67573d15dc57..bf4328317ed0 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.15.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.15.yaml
@@ -19,14 +19,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-installer.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: agent-installer-orchestrator
 - dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.16.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.16.yaml
index 54a1fd718352..5d79fde71672 100644
--- a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.16.yaml
+++ b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-release-4.16.yaml
@@ -19,14 +19,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-installer.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: agent-installer-orchestrator
 - dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
index 6ef0bbf8b731..3e36ef6d6966 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-service.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.15.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.15.yaml
index 4f28f721536d..c6555fd36524 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.15.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.15.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-service.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.16.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.16.yaml
index 779b09acde07..5e39c61f9e7c 100644
--- a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.16.yaml
+++ b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-release-4.16.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-service.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
diff --git a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml
index 6c0bbbcb8f30..67af310d2cb5 100644
--- a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml
+++ b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/aws/amazon-eks-pod-identity-webhook
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml
index fc51caca99a5..0d118911914c 100644
--- a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml
+++ b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/aws/amazon-eks-pod-identity-webhook
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml
index 9798f9a822f4..2e63b3b12e13 100644
--- a/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml
+++ b/ci-operator/config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/aws/amazon-eks-pod-identity-webhook
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml
index 628b736e03b3..986f66af3163 100644
--- a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml
+++ b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/azure/azure-workload-identity
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.15.yaml b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.15.yaml
index 04016e6a83d4..87e7b6b3c723 100644
--- a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.15.yaml
+++ b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/azure/azure-workload-identity
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.16.yaml b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.16.yaml
index 3ca5fa66f302..c865cd971318 100644
--- a/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.16.yaml
+++ b/ci-operator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/azure/azure-workload-identity
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.15.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.15.yaml
index c82416df718b..eb7befd7328c 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.15.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base-os
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.16.yaml b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.16.yaml
index bee11d5d5240..c6c4a354b7d7 100644
--- a/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.16.yaml
+++ b/ci-operator/config/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base-os
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml
index d8aae41c2a6e..397de8af7f33 100644
--- a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml
+++ b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.12
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.15.yaml b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.15.yaml
index c594450c2200..fff0eeb463fb 100644
--- a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.15.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.12
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.16.yaml b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.16.yaml
index 1ed50a0b43f8..bf9c181c4a69 100644
--- a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-release-4.16.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.12
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/builder/openshift-builder-master.yaml b/ci-operator/config/openshift/builder/openshift-builder-master.yaml
index 07938e26df5a..38f0bd9996e1 100644
--- a/ci-operator/config/openshift/builder/openshift-builder-master.yaml
+++ b/ci-operator/config/openshift/builder/openshift-builder-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.15.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.15.yaml
index bc5a853241e2..a2e8a39c69ab 100644
--- a/ci-operator/config/openshift/builder/openshift-builder-release-4.15.yaml
+++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.16.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.16.yaml
index 25b6dff3dde3..71117a51b16e 100644
--- a/ci-operator/config/openshift/builder/openshift-builder-release-4.16.yaml
+++ b/ci-operator/config/openshift/builder/openshift-builder-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml
index bd3404d0818c..b86b1e396075 100644
--- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml
+++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build-no-gen
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.15.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.15.yaml
index daa0d31789a3..81cc0b799b16 100644
--- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.15.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build-no-gen
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.16.yaml b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.16.yaml
index 32b27451305b..41a92801372b 100644
--- a/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cloud-credential-operator/openshift-cloud-credential-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build-no-gen
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml
index 632f0d51fd58..86d2056f07a1 100644
--- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml
+++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: openshift/cloud-network-config-controller
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.15.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.15.yaml
index 24eaa2781338..45307fa12bb4 100644
--- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.15.yaml
+++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: openshift/cloud-network-config-controller
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.16.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.16.yaml
index 8731c63c8508..ff06e3bfbb03 100644
--- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: openshift/cloud-network-config-controller
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml
index 3121cd2d266f..9b3a43319e0f 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-ibmcloud
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.15.yaml
index 3afeb4d13cb6..7272fd0357f9 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-ibmcloud
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.16.yaml
index 438cc694c943..89fbc65e89d2 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-ibmcloud
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml
index 06e729e3147c..7e432c7d0dd4 100644
--- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.15.yaml
index 95cb2fa12bfd..5f6f9b25e58f 100644
--- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.16.yaml
index af8cdfb4ee9b..db6d40a346ce 100644
--- a/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml
index c5175f45be6a..0eafe003830f 100644
--- a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.15.yaml
index f008be6120a5..ce7e883b7a43 100644
--- a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.16.yaml
index fb5b06fde347..5c294f90bff9 100644
--- a/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
index 012708259cd3..30118031a2d7 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.15.yaml
index edf7323f66b8..842a72739cdf 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.16.yaml
index aef273f05a3b..36d714dc9765 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml
index fb8972d4e1a4..337cc438f0a8 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.15.yaml
index e8e7126bb383..9ac1f792f1f7 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.15.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.16.yaml
index 56cb4afd35d0..ee7664128450 100644
--- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml
index d678527c3127..6cbb367bd2d7 100644
--- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.15.yaml
index 918685b0d582..a87fedd3222c 100644
--- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.15.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.16.yaml
index 046094305d93..661d8185ff64 100644
--- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
index 1423e79b8bcb..d8a7af61e394 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
@@ -19,8 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.15.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.15.yaml
index a8073dabe18b..585ee5ef3469 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.15.yaml
@@ -19,8 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.16.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.16.yaml
index 3bcd81487dcf..cdcd9d569526 100644
--- a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-release-4.16.yaml
@@ -19,8 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml
index 772e6e3fe431..c1e9a0eec358 100644
--- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml
+++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.15.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.15.yaml
index 4c613845f068..0254771c2114 100644
--- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.16.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.16.yaml
index 9fac37d78305..954c0bd82baf 100644
--- a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml
index 8a24434b6d5b..bba5c4c23288 100644
--- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.15.yaml
index 352a173ca267..f6ce014d759f 100644
--- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.15.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.16.yaml
index c079c758c226..445bc1ed0aea 100644
--- a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-release-4.16.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
index f05839d5d92f..62932d54d1ee 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.15.yaml
index abac310f8308..2085806bcc4e 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.15.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.16.yaml
index 35531c528764..124ec7e9bde1 100644
--- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.16.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml
index bfd626bd817b..23956ccfb729 100644
--- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.15.yaml
index dd078b1965aa..60621059b922 100644
--- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.15.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.16.yaml
index fd47bfd9d909..15c669f01353 100644
--- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.16.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml
index 9563f6fab3ad..c585d266c25a 100644
--- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.15.yaml
index 43794eefab96..67fcaa66abdc 100644
--- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.15.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.16.yaml
index 6fca50cb2157..938aa1da202d 100644
--- a/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-release-4.16.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml
index 5480d603d17a..f3d346bb0a6b 100644
--- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.15.yaml
index 7eb56336e0ca..62342479bc50 100644
--- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
index 5a55ff8eeb4e..5ff0b549fa5b 100644
--- a/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-kube-storage-version-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml
index a391ac1149d1..a0d340345f47 100644
--- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.15.yaml
index f7ba225f27c2..afaff032a242 100644
--- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.16.yaml
index 0859f650882e..794070253138 100644
--- a/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
index c545b34f7670..39c78c2b16e7 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
@@ -28,7 +28,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.15.yaml
index 40f6d350686b..a877597a03b9 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.15.yaml
@@ -28,7 +28,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml
index 27b4c7311524..29f54305129e 100644
--- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml
@@ -28,7 +28,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml
index bc7f975435a1..a1fd52688a65 100644
--- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.15.yaml
index 89f4171e6d29..c224e0fe92b3 100644
--- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.16.yaml
index d45d5683a701..8b83c37d9477 100644
--- a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
index 969cc4144562..f783b86f21b6 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
@@ -23,14 +23,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: cluster-node-tuning-operator-us-tuned
 - dockerfile_path: Dockerfile.rhel9
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.15.yaml
index 497f35205801..55b30363f602 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.15.yaml
@@ -23,14 +23,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: cluster-node-tuning-operator-us-tuned
 - dockerfile_path: Dockerfile.rhel9
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.16.yaml
index a755e24dd4cf..0bd375cca90b 100644
--- a/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-release-4.16.yaml
@@ -23,14 +23,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: cluster-node-tuning-operator-us-tuned
 - dockerfile_path: Dockerfile.rhel9
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml
index 5ae171309b70..631c56f34cfd 100644
--- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.15.yaml
index 56381bfb0b3f..57c3c90fc065 100644
--- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.15.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.16.yaml
index 3881605b886d..f6eae40bada4 100644
--- a/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml
index 626f0e217a49..09cf1824ed99 100644
--- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.15.yaml
index 854ad8807e3f..62639b8e8b90 100644
--- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.15.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.16.yaml
index 7491ffa2e904..9c6c9f7746b7 100644
--- a/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-openshift-controller-manager-operator/openshift-cluster-openshift-controller-manager-operator-release-4.16.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml
index 00f24e5b26b6..51a834e14347 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml
@@ -16,14 +16,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: cluster-resource-override-admission-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.15.yaml
index 22be614997d0..3cf016c37ea9 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.15.yaml
@@ -16,14 +16,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: cluster-resource-override-admission-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.16.yaml
index 1b6309d37bae..e1dcd783c9c8 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-release-4.16.yaml
@@ -16,14 +16,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: cluster-resource-override-admission-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml
index b1804f0c608b..7c109c1c69cd 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.15.yaml b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.15.yaml
index bcac5b822689..f7f2657e2ae1 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.16.yaml b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.16.yaml
index 5caea652ecfd..efb1133c2471 100644
--- a/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-resource-override-admission/openshift-cluster-resource-override-admission-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml
index 718ce695a68f..325330febf4f 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml
index 5e01fae27f60..0aa280eec114 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.okd
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15.yaml
index 501dcc154122..e755a252d236 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15__okd.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15__okd.yaml
index d7ca8caf1dbb..5849b26a606d 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15__okd.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.15__okd.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.okd
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16.yaml
index 5cf909c3a02a..c8e7fc8c5d7e 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16__okd.yaml b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16__okd.yaml
index 1f91ca880a1b..983a7bd64f4c 100644
--- a/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16__okd.yaml
+++ b/ci-operator/config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-release-4.16__okd.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.okd
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml
index 8dd719f7a0b0..efe026639496 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.15"
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml
index 8c7615e77ac2..2669e02391b4 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.15"
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15.yaml
index bc4cdbd782b0..e582cb463e2b 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   to: cluster-update-keys
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15__okd.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15__okd.yaml
index 4951b7e057d8..e02eda83ef1b 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15__okd.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.15__okd.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: cluster-update-keys
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16.yaml
index df31987d0c0a..1e328ee173bf 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.16"
diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16__okd.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16__okd.yaml
index 8643daa1b1d2..06ab685efbfa 100644
--- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16__okd.yaml
+++ b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-release-4.16__okd.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.16"
diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml
index 50a980cdb4bd..a0488f9b7883 100644
--- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml
+++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.15.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.15.yaml
index 985bb14a9e4d..e19e67340d09 100644
--- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.15.yaml
+++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.16.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.16.yaml
index b1a2d5bb30c3..16bee642268a 100644
--- a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.16.yaml
+++ b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml
index 079b2520aeca..2867070587c3 100644
--- a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml
+++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.15.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.15.yaml
index 3d39822e0147..2b34811714fd 100644
--- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.16.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.16.yaml
index 173fcd3a577f..23b228dd1d48 100644
--- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console/openshift-console-master.yaml b/ci-operator/config/openshift/console/openshift-console-master.yaml
index aa32bca1e61c..800d18075b4b 100644
--- a/ci-operator/config/openshift/console/openshift-console-master.yaml
+++ b/ci-operator/config/openshift/console/openshift-console-master.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-base-nodejs-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.15.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.15.yaml
index aea3abdb9c84..a36d7963d343 100644
--- a/ci-operator/config/openshift/console/openshift-console-release-4.15.yaml
+++ b/ci-operator/config/openshift/console/openshift-console-release-4.15.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-base-nodejs-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/console/openshift-console-release-4.16.yaml b/ci-operator/config/openshift/console/openshift-console-release-4.16.yaml
index 70cc14087f78..59f2a553ca53 100644
--- a/ci-operator/config/openshift/console/openshift-console-release-4.16.yaml
+++ b/ci-operator/config/openshift/console/openshift-console-release-4.16.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-base-nodejs-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml
index 3a316e320fa5..3ba190a5d672 100644
--- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml
+++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.15.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.15.yaml
index cc901b5e1461..86f7af6b41f2 100644
--- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.15.yaml
+++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.16.yaml b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.16.yaml
index a4192e2935e1..09e2aee5e8db 100644
--- a/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.16.yaml
+++ b/ci-operator/config/openshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml
index 13c7015174b0..1b2cae82e9b3 100644
--- a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml
+++ b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/coredns/coredns
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.15.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.15.yaml
index c2c36454394e..7a970e0d2cf2 100644
--- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.15.yaml
+++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.15.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/coredns/coredns
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.16.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.16.yaml
index 92b78d2e06e7..c40d8cf45e76 100644
--- a/ci-operator/config/openshift/coredns/openshift-coredns-release-4.16.yaml
+++ b/ci-operator/config/openshift/coredns/openshift-coredns-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/coredns/coredns
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
index c121e0af3d6e..2fd3c93658f4 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.15.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.15.yaml
index 043815f9ff96..0221ae690211 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.15.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.16.yaml b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.16.yaml
index e4870d36fc7d..191c60d2371d 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource-operator/openshift-csi-driver-shared-resource-operator-release-4.16.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
index c3a77115076d..e64dce78b7e0 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-master.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
@@ -25,7 +24,6 @@ images:
   from: must_gather
   to: csi-driver-shared-resource-mustgather
 - dockerfile_path: Dockerfile.webhook
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.15.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.15.yaml
index c432741bb650..b745dbcfccf3 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.15.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.15.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
@@ -25,7 +24,6 @@ images:
   from: must_gather
   to: csi-driver-shared-resource-mustgather
 - dockerfile_path: Dockerfile.webhook
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.16.yaml b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.16.yaml
index 100f8c295ec2..49868c7c69c8 100644
--- a/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.16.yaml
+++ b/ci-operator/config/openshift/csi-driver-shared-resource/openshift-csi-driver-shared-resource-release-4.16.yaml
@@ -15,8 +15,7 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
@@ -25,7 +24,6 @@ images:
   from: must_gather
   to: csi-driver-shared-resource-mustgather
 - dockerfile_path: Dockerfile.webhook
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.15.yaml b/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.15.yaml
index d4131f070ed0..0b076bb84391 100644
--- a/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.15.yaml
@@ -8,7 +8,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: dpu-network-operator
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.16.yaml b/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.16.yaml
index f0b703ff9bd0..a82c0a48eb87 100644
--- a/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/dpu-network-operator/openshift-dpu-network-operator-release-4.16.yaml
@@ -8,7 +8,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: dpu-network-operator
 promotion:
   name: "4.16"
diff --git a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml
index 844bf50ca0a6..18004083cc57 100644
--- a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml
+++ b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml
@@ -14,7 +14,6 @@ images:
   - name: RHEL_VERSION
     value: "9.2"
   dockerfile_path: Dockerfile
-  from: base
   to: driver-toolkit
 promotion:
   additional_images:
diff --git a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.15.yaml b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.15.yaml
index 63c1ca6448a1..c0cef4e16178 100644
--- a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.15.yaml
+++ b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.15.yaml
@@ -14,7 +14,6 @@ images:
   - name: RHEL_VERSION
     value: "9.2"
   dockerfile_path: Dockerfile
-  from: base
   to: driver-toolkit
 promotion:
   additional_images:
diff --git a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.16.yaml b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.16.yaml
index 78c36010c4fc..2afc042a4cd2 100644
--- a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.16.yaml
+++ b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-release-4.16.yaml
@@ -14,7 +14,6 @@ images:
   - name: RHEL_VERSION
     value: "9.2"
   dockerfile_path: Dockerfile
-  from: base
   to: driver-toolkit
 promotion:
   additional_images:
diff --git a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml
index 800193adbe21..742579954a1b 100644
--- a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml
+++ b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.15.yaml b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.15.yaml
index bf792437fcb5..55fbe25d9b6b 100644
--- a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.15.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.16.yaml b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.16.yaml
index 97805a55726d..a1101ddc5572 100644
--- a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-release-4.16.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.15.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.15.yaml
index 98e080bc062f..ab34cace97b5 100644
--- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.15.yaml
+++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.15.yaml
@@ -24,7 +24,6 @@ build_root:
 canonical_go_repository: go.etcd.io/etcd
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-etcd-golang-1.19:
       as:
diff --git a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.16.yaml b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.16.yaml
index c423cfcb7b5f..8f176cc0bbb7 100644
--- a/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.16.yaml
+++ b/ci-operator/config/openshift/etcd/openshift-etcd-openshift-4.16.yaml
@@ -24,7 +24,6 @@ build_root:
 canonical_go_repository: go.etcd.io/etcd
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-etcd-golang-1.19:
       as:
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
index fd8786c61df0..d60776406413 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
@@ -23,14 +23,12 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: hypershift-operator
 - dockerfile_path: Dockerfile.control-plane
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15.yaml
index 1671bbe7e987..dafbc3c52e2b 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15.yaml
@@ -23,14 +23,12 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: hypershift-operator
 - dockerfile_path: Dockerfile.control-plane
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16.yaml
index ebbb25f39a44..c8da89a7fa60 100644
--- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16.yaml
+++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16.yaml
@@ -23,14 +23,12 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: hypershift-operator
 - dockerfile_path: Dockerfile.control-plane
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
index 9321f8ecc390..958880f0b587 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.15.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.15.yaml
index 0c816c84b52a..4989c53cd786 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.16.yaml b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.16.yaml
index b398ff71d4ac..40b6c3dc64f3 100644
--- a/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/ib-sriov-cni/openshift-ib-sriov-cni-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-main.yaml b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-main.yaml
index 790f95f6107e..7a064d65e056 100644
--- a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-main.yaml
+++ b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-main.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/ibm-powervs-block-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.15.yaml b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.15.yaml
index ce2f8e3462d1..efefee21bf01 100644
--- a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.15.yaml
+++ b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/ibm-powervs-block-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.16.yaml b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.16.yaml
index 95e67099ac85..f89997a0c0aa 100644
--- a/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift/ibm-powervs-block-csi-driver/openshift-ibm-powervs-block-csi-driver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/ibm-powervs-block-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-main.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-main.yaml
index 3aa65e51c29b..4229c45bbb65 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-main.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-main.yaml
@@ -14,8 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.15.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.15.yaml
index 43bc9e29cec0..1210aa445800 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.15.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.15.yaml
@@ -14,8 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.16.yaml b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.16.yaml
index e60130969db4..e7ea26b37b9b 100644
--- a/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift/image-customization-controller/openshift-image-customization-controller-release-4.16.yaml
@@ -14,8 +14,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/images/openshift-images-master.yaml b/ci-operator/config/openshift/images/openshift-images-master.yaml
index f3d4039060f9..0df03aa8a600 100644
--- a/ci-operator/config/openshift/images/openshift-images-master.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-master.yaml
@@ -25,16 +25,12 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.15
   to: base-rhel9
 - context_dir: egress/router
-  from: base
   to: egress-router
 - context_dir: egress/http-proxy
-  from: base
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
-  from: base
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
-  from: base
   to: keepalived-ipfailover
 promotion:
   name: "4.15"
diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.15.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.15.yaml
index 399bc623e2b3..871e8b580d9c 100644
--- a/ci-operator/config/openshift/images/openshift-images-release-4.15.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-release-4.15.yaml
@@ -25,16 +25,12 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.15
   to: base-rhel9
 - context_dir: egress/router
-  from: base
   to: egress-router
 - context_dir: egress/http-proxy
-  from: base
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
-  from: base
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
-  from: base
   to: keepalived-ipfailover
 promotion:
   disabled: true
diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml
index 85858109eb0c..905a65d6590d 100644
--- a/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml
@@ -25,16 +25,12 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.15
   to: base-rhel9
 - context_dir: egress/router
-  from: base
   to: egress-router
 - context_dir: egress/http-proxy
-  from: base
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
-  from: base
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
-  from: base
   to: keepalived-ipfailover
 promotion:
   name: "4.16"
diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml
index 4c0800fb85da..49b7b6bd3b24 100644
--- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml
+++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.15.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.15.yaml
index cc2ed73b6130..e4b93bd5251a 100644
--- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.15.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.16.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.16.yaml
index 022f9ab0f1c6..a5cf2bc20c2f 100644
--- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-release-4.16.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 42acaa6741e1..209a93742d37 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -56,7 +56,6 @@ build_root:
   use_build_cache: true
 images:
 - dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -66,7 +65,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -76,21 +74,18 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: installer-artifacts
 - dockerfile_path: images/libvirt/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -100,7 +95,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -110,7 +104,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: baremetal-installer
 - dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml
index c0d1f8aae5c6..f0a7cc891706 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/installer-altinfra/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
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 0452e414a9a1..8d3ee3fe2980 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
@@ -26,7 +26,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -39,7 +38,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer-artifacts/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -52,7 +50,6 @@ images:
   - name: TAGS
     value: libvirt fcos
   dockerfile_path: images/libvirt/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -62,7 +59,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -72,7 +68,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/openstack/Dockerfile.ci
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -85,7 +80,6 @@ images:
   - name: TAGS
     value: baremetal libvirt fcos
   dockerfile_path: images/baremetal/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -98,7 +92,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__terraform.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__terraform.yaml
index 8f0ca8fefbea..20ebdc5a7abe 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master__terraform.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master__terraform.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/infrastructure-providers/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
index 052a13639720..ca1d83f7e764 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.15.yaml
@@ -55,7 +55,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
index 0a8e9c781a14..16163f455100 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__altinfra.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/installer-altinfra/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__okd.yaml
index 8a8b14a9f895..77039d8f3366 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__okd.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__okd.yaml
@@ -26,7 +26,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -52,7 +51,6 @@ images:
   - name: TAGS
     value: libvirt fcos
   dockerfile_path: images/libvirt/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -62,7 +60,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -72,7 +69,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/openstack/Dockerfile.ci
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -85,7 +81,6 @@ images:
   - name: TAGS
     value: baremetal libvirt fcos
   dockerfile_path: images/baremetal/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -98,7 +93,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__terraform.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__terraform.yaml
index 3bc1e1853490..9cb877ece3c0 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.15__terraform.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.15__terraform.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/infrastructure-providers/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
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 c53827ef85dc..9cceaa4bf114 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
@@ -55,7 +55,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
index fa8fcce39a1a..f03f5932e716 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/installer-altinfra/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
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 fe4b6bfff0b6..a2b6d247408b 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
@@ -26,7 +26,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -52,7 +51,6 @@ images:
   - name: TAGS
     value: libvirt fcos
   dockerfile_path: images/libvirt/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -62,7 +60,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -72,7 +69,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/openstack/Dockerfile.ci
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -85,7 +81,6 @@ images:
   - name: TAGS
     value: baremetal libvirt fcos
   dockerfile_path: images/baremetal/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
@@ -98,7 +93,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__terraform.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__terraform.yaml
index 212cb98c4ed4..03bb8efd5e34 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__terraform.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__terraform.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/infrastructure-providers/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.15.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.15.yaml
index 9eb3485ee333..697d9c1b04ef 100644
--- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.15.yaml
+++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/directxman12/k8s-prometheus-adapter
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.16.yaml b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.16.yaml
index bb691f1aed3a..83cfe922edf4 100644
--- a/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.16.yaml
+++ b/ci-operator/config/openshift/k8s-prometheus-adapter/openshift-k8s-prometheus-adapter-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/directxman12/k8s-prometheus-adapter
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml
index cb2fbf0a24de..82a0cb1154af 100644
--- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml
+++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.15.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.15.yaml
index 9d6d5c8081b8..91a48daf7fe1 100644
--- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.15.yaml
+++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.16.yaml b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.16.yaml
index 8b4e6180766c..c25b39a4cf9a 100644
--- a/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift/kube-rbac-proxy/openshift-kube-rbac-proxy-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.15.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.15.yaml
index 7e26497ac36c..840410a54de5 100644
--- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.15.yaml
+++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: k8s.io/kube-state-metrics
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.16.yaml b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.16.yaml
index bccdf08823a0..316e059aaffb 100644
--- a/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.16.yaml
+++ b/ci-operator/config/openshift/kube-state-metrics/openshift-kube-state-metrics-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: k8s.io/kube-state-metrics
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml
index cee0e2af67b0..4420b3123fa6 100644
--- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml
+++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/kubernetes-sigs/kube-storage-version-migrator
 images:
 - dockerfile_path: images/release/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.15.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.15.yaml
index c22b6e78903c..c30174e88747 100644
--- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.15.yaml
+++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/kubernetes-sigs/kube-storage-version-migrator
 images:
 - dockerfile_path: images/release/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.16.yaml b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.16.yaml
index 678d2937980f..6c61cd9be042 100644
--- a/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.16.yaml
+++ b/ci-operator/config/openshift/kubernetes-kube-storage-version-migrator/openshift-kubernetes-kube-storage-version-migrator-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/kubernetes-sigs/kube-storage-version-migrator
 images:
 - dockerfile_path: images/release/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-master.yaml b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-master.yaml
index 7c0ae379fc08..3046968f52c3 100644
--- a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-master.yaml
+++ b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-master.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: https://github.com/kubernetes-sigs/metrics-server
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.15.yaml b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.15.yaml
index 3dc50268eff0..b2fdf95ec755 100644
--- a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.15.yaml
+++ b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: https://github.com/kubernetes-sigs/metrics-server
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.16.yaml b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.16.yaml
index 5a29bea27041..484f96ab7263 100644
--- a/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.16.yaml
+++ b/ci-operator/config/openshift/kubernetes-metrics-server/openshift-kubernetes-metrics-server-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: https://github.com/kubernetes-sigs/metrics-server
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-master.yaml b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-master.yaml
index 5afc6cafad72..215d32d2b4f1 100644
--- a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-master.yaml
+++ b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-master.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/kubevirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.15.yaml b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.15.yaml
index 52215add46a0..1eef4c277d34 100644
--- a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.15.yaml
+++ b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.15.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/kubevirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.16.yaml b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.16.yaml
index b08f3abf1913..8cbac290e743 100644
--- a/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift/kubevirt-csi-driver/openshift-kubevirt-csi-driver-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
 canonical_go_repository: github.com/kubevirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml
index 32131d637467..de686abb22f5 100644
--- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml
+++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.15.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.15.yaml
index 065fdd790dc7..4100521063fe 100644
--- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.15.yaml
+++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.16.yaml b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.16.yaml
index 5a044b0aca59..f7ad2555e24a 100644
--- a/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.16.yaml
+++ b/ci-operator/config/openshift/linuxptp-daemon/openshift-linuxptp-daemon-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
index 9d530bcc76d7..ee73a756b345 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -55,7 +55,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml
index c0736a8fb4bb..9c4ef8a953a8 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml
@@ -18,7 +18,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml
index 3ea287608392..b2dad9c58408 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml
@@ -55,7 +55,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15__okd.yaml
index 74736e93da63..8f21b9de93ca 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15__okd.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15__okd.yaml
@@ -18,7 +18,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml
index 4c3c16fe562c..3155651a67ae 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml
@@ -55,7 +55,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16__okd.yaml
index 938165ae2c31..7e2e1c3ce14b 100644
--- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16__okd.yaml
+++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16__okd.yaml
@@ -18,7 +18,6 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
index a74609393eeb..ea3c71c48fe0 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main.yaml
@@ -18,7 +18,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
index a384d41d6869..9229802a1fff 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml
@@ -14,7 +14,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     origin_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15.yaml
index fa1f3d23c7c8..e99a66a918e7 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15.yaml
@@ -18,7 +18,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml
index 819dcbac1e79..1b4d0f040ba4 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml
@@ -14,7 +14,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     origin_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16.yaml
index a7e86f786045..1fab1af3807e 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16.yaml
@@ -18,7 +18,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16__okd.yaml
index 2755d69d0a75..9fc465af4cc6 100644
--- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16__okd.yaml
+++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.16__okd.yaml
@@ -14,7 +14,6 @@ images:
   - name: DIRECT_DOWNLOAD
     value: "true"
   dockerfile_path: Dockerfile
-  from: base
   inputs:
     origin_4.15_installer:
       as:
diff --git a/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.15.yaml b/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.15.yaml
index bc592245c1d3..9e66393db758 100644
--- a/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.15.yaml
@@ -30,14 +30,12 @@ build_root:
     tag: rhel-9-golang-1.20-openshift-4.14
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: metallb-operator
 - dockerfile_path: bundleci.Dockerfile
-  from: base
   to: metallb-operator-bundle
 operator:
   bundles:
diff --git a/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.16.yaml b/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.16.yaml
index 182865a660bb..2c169b25894f 100644
--- a/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/metallb-operator/openshift-metallb-operator-release-4.16.yaml
@@ -30,14 +30,12 @@ build_root:
     tag: rhel-9-golang-1.20-openshift-4.14
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: metallb-operator
 - dockerfile_path: bundleci.Dockerfile
-  from: base
   to: metallb-operator-bundle
 operator:
   bundles:
diff --git a/ci-operator/config/openshift/metallb/openshift-metallb-release-4.15.yaml b/ci-operator/config/openshift/metallb/openshift-metallb-release-4.15.yaml
index 3d97347dbcad..b4e377834959 100644
--- a/ci-operator/config/openshift/metallb/openshift-metallb-release-4.15.yaml
+++ b/ci-operator/config/openshift/metallb/openshift-metallb-release-4.15.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.13
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/metallb/openshift-metallb-release-4.16.yaml b/ci-operator/config/openshift/metallb/openshift-metallb-release-4.16.yaml
index f7d6ec1e6b2d..5ed49b6ae558 100644
--- a/ci-operator/config/openshift/metallb/openshift-metallb-release-4.16.yaml
+++ b/ci-operator/config/openshift/metallb/openshift-metallb-release-4.16.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.13
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml
index 8230b10f2ac5..c8ce07777476 100644
--- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml
+++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.15.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.15.yaml
index b66f2b3f685a..e73bf9330eb1 100644
--- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.15.yaml
+++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.16.yaml b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.16.yaml
index daab94b7ef31..15b4df7a64d4 100644
--- a/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift/multus-admission-controller/openshift-multus-admission-controller-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml
index 5f09db8473a7..d9a5b4dde517 100644
--- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml
+++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.15.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.15.yaml
index fe1aa4affb6e..afc6bcbc2704 100644
--- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.16.yaml b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.16.yaml
index 3fbe70f4f07e..ef372e8529ac 100644
--- a/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/multus-cni/openshift-multus-cni-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-master.yaml b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-master.yaml
index 6dd1019f8a85..20fbd8069d73 100644
--- a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-master.yaml
+++ b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.15.yaml b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.15.yaml
index c4c68b40920a..983ddfebbbbf 100644
--- a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.15.yaml
+++ b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.16.yaml b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.16.yaml
index b22c4c040ed8..86ede855e548 100644
--- a/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.16.yaml
+++ b/ci-operator/config/openshift/multus-networkpolicy/openshift-multus-networkpolicy-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml
index af79915acca0..c7d62b3f3f4f 100644
--- a/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml
+++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.15.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.15.yaml
index 965275fb5eae..5e07c395d396 100644
--- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.15.yaml
+++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.16.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.16.yaml
index 891c5ad4cdfc..3abd8a85e8ec 100644
--- a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.16.yaml
+++ b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-master.yaml b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-master.yaml
index 3717f3e73acb..e6f8d348b110 100644
--- a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-master.yaml
+++ b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.15.yaml b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.15.yaml
index 456ecb6f917d..9441ab246428 100644
--- a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.15.yaml
+++ b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.16.yaml b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.16.yaml
index 7b797704c458..0ab0c0229134 100644
--- a/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.16.yaml
+++ b/ci-operator/config/openshift/network-metrics-daemon/openshift-network-metrics-daemon-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml
index da1339213933..860677079683 100644
--- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml
+++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.15.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.15.yaml
index 19dea5dca178..39383b3852a3 100644
--- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.15.yaml
+++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.16.yaml b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.16.yaml
index a8b03a244564..548a8b94d8a9 100644
--- a/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.16.yaml
+++ b/ci-operator/config/openshift/node_exporter/openshift-node_exporter-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master.yaml b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master.yaml
index 5d3c6d78e4f4..6d0ad5983013 100644
--- a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master.yaml
+++ b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.15.yaml b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.15.yaml
index 6c17c7f25ab4..d3d21a8a067a 100644
--- a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.15.yaml
+++ b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.16.yaml b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.16.yaml
index 0161db6d3581..15dffa7610f6 100644
--- a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.16.yaml
+++ b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml
index 6e6a0afd51dc..e33e1f39439c 100644
--- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml
+++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.15.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.15.yaml
index 3ff14cadd815..65117d8b2991 100644
--- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.15.yaml
+++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.15.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.16.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.16.yaml
index 7b8c85c493e5..8b8d360eafae 100644
--- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-release-4.16.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
index bab184963b86..a28944bd3d10 100644
--- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
+++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.15.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.15.yaml
index 959e7e4665de..ce86b7261114 100644
--- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.15.yaml
+++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.16.yaml b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.16.yaml
index 67e427f4e7e8..18035bde527e 100644
--- a/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.16.yaml
+++ b/ci-operator/config/openshift/oauth-server/openshift-oauth-server-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-main.yaml b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-main.yaml
index 7669009c0565..917f8ec74ebe 100644
--- a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-main.yaml
+++ b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-main.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.15.yaml b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.15.yaml
index 52e6fd091dca..c0306ecac514 100644
--- a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.15.yaml
+++ b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.16.yaml b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.16.yaml
index 2fb4273a9978..e7b40b578e06 100644
--- a/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.16.yaml
+++ b/ci-operator/config/openshift/oc-mirror/openshift-oc-mirror-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.ci
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
index 156eddf0e4f6..5d581c8762b4 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
@@ -24,7 +24,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.15.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.15.yaml
index 1ce83d6f831d..6d35d512b198 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.15.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.15.yaml
@@ -24,7 +24,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
index 6416ec7e68f0..a0df2675b0f1 100644
--- a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
+++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
@@ -24,7 +24,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml
index 6ecdf0d338e2..72b47b2d2448 100644
--- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml
+++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.15.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.15.yaml
index c4095bbc983d..fd5735b336ca 100644
--- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.15.yaml
+++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.16.yaml b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.16.yaml
index 3478a595a40a..8781adef396c 100644
--- a/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.16.yaml
+++ b/ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml
index 249d44fdd929..752b1b856130 100644
--- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml
+++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.15.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.15.yaml
index 9785ceaa6017..df3774684f29 100644
--- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.15.yaml
+++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.16.yaml b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.16.yaml
index 06c41f896d59..8b6ba2c8eb4c 100644
--- a/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.16.yaml
+++ b/ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main.yaml b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main.yaml
index 864db980966e..ddb34bf83294 100644
--- a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main.yaml
+++ b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-main.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.15.yaml b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.15.yaml
index 6ba1485d249c..f305e6028196 100644
--- a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.15.yaml
+++ b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.16.yaml b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.16.yaml
index f9aaa413657f..702b9fdf79d6 100644
--- a/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.16.yaml
+++ b/ci-operator/config/openshift/operator-framework-catalogd/openshift-operator-framework-catalogd-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml
index 45bc7de6db4e..9209cc64e16e 100755
--- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml
+++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml
@@ -11,14 +11,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: operator-lifecycle-manager.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: operator-lifecycle-manager
 - dockerfile_path: operator-registry.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.15.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.15.yaml
index bef7ca057bfa..f437618c3be1 100644
--- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.15.yaml
+++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.15.yaml
@@ -11,14 +11,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: operator-lifecycle-manager.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: operator-lifecycle-manager
 - dockerfile_path: operator-registry.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.16.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.16.yaml
index c6a88f0dad56..517c1f3f8419 100644
--- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.16.yaml
+++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.16.yaml
@@ -11,14 +11,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: operator-lifecycle-manager.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: operator-lifecycle-manager
 - dockerfile_path: operator-registry.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml
index afdda5ba1211..f4a7cebc8d7d 100644
--- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml
+++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/operator-controller.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.15.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.15.yaml
index 6199ccfa4c02..9c7f3f69c71f 100644
--- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.15.yaml
+++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/operator-controller.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.16.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.16.yaml
index d72c54d0b8e8..7c40f977e10d 100644
--- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/operator-controller.Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-main.yaml b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-main.yaml
index d61a3ac3ae42..d8c9925217d8 100644
--- a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-main.yaml
+++ b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-main.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.15.yaml b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.15.yaml
index a37a46c4e556..ddac869be865 100644
--- a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.15.yaml
+++ b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.16.yaml b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.16.yaml
index aeabf259138e..73994846facc 100644
--- a/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.16.yaml
+++ b/ci-operator/config/openshift/operator-framework-rukpak/openshift-operator-framework-rukpak-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: openshift/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml
index 2ba1810a3d25..ccc2fef816fc 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml
@@ -42,7 +42,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: tests
 - dockerfile_path: images/hello-openshift/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml
index e39503b45c02..c489ba875a61 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml
@@ -42,7 +42,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: tests
 - dockerfile_path: images/hello-openshift/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml
index 30a13ebd798a..b6343af2f57a 100644
--- a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml
+++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml
@@ -42,7 +42,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: tests
 - dockerfile_path: images/hello-openshift/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-master.yaml b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-master.yaml
index a3d862b0eea6..c8db4509d454 100644
--- a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-master.yaml
+++ b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/ovirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.13:
       as:
diff --git a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.15.yaml b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.15.yaml
index 781f5f7a034e..f161533b1b46 100644
--- a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.15.yaml
+++ b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.15.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/ovirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.13:
       as:
diff --git a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.16.yaml b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.16.yaml
index fb9b20bd0263..ecef3b055d7a 100644
--- a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.16.yaml
+++ b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.16.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/ovirt/csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.19-openshift-4.13:
       as:
diff --git a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-main.yaml b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-main.yaml
index 62996059f4f4..80e4a1182b53 100644
--- a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-main.yaml
+++ b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-main.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.15.yaml b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.15.yaml
index 5624827b2233..7dbef6e9fbc3 100644
--- a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.15.yaml
+++ b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.16.yaml b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.16.yaml
index b635f024f508..2c74f70806bb 100644
--- a/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.16.yaml
+++ b/ci-operator/config/openshift/platform-operators/openshift-platform-operators-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml
index 7ef01dd42634..b36964639c93 100644
--- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml
+++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.15.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.15.yaml
index f1d6a6dd80eb..97fed2f76c2e 100644
--- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.15.yaml
+++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.16.yaml b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.16.yaml
index 672996003615..4ab22a528b1f 100644
--- a/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.16.yaml
+++ b/ci-operator/config/openshift/prom-label-proxy/openshift-prom-label-proxy-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml
index bcd0a2f62ef8..fdc2c6fd4ca9 100644
--- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml
+++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.15.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.15.yaml
index 38848f47453a..19bc5e94e3e7 100644
--- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.15.yaml
+++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.16.yaml b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.16.yaml
index 9bf86c88a4ca..ff18b0098b90 100644
--- a/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.16.yaml
+++ b/ci-operator/config/openshift/prometheus-alertmanager/openshift-prometheus-alertmanager-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml
index b57ed53f7f13..0b2c77e701c4 100644
--- a/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml
+++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.15.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.15.yaml
index 17c98b9f536d..cd20b1f4b2e6 100644
--- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.15.yaml
+++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.16.yaml b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.16.yaml
index e35c3c506391..3b338e1b5e7f 100644
--- a/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.16.yaml
+++ b/ci-operator/config/openshift/prometheus/openshift-prometheus-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml
index b6135feec227..c83171d8b130 100644
--- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml
+++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.15.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.15.yaml
index 0597919dee19..f910e151f4b0 100644
--- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.16.yaml b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.16.yaml
index 2cf39c3b96be..bc00f0603635 100644
--- a/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/ptp-operator/openshift-ptp-operator-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-main.yaml b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-main.yaml
index 3cd4a8478d49..1347e52fe6f5 100644
--- a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-main.yaml
+++ b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-main.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.15.yaml b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.15.yaml
index 0f7a31c0bb6a..552135761a72 100644
--- a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.15.yaml
+++ b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.15.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.16.yaml b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.16.yaml
index 04ab61e2f376..827a4a7c37c7 100644
--- a/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.16.yaml
+++ b/ci-operator/config/openshift/route-controller-manager/openshift-route-controller-manager-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-master.yaml b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-master.yaml
index df1a58080e29..05cc0bbced30 100644
--- a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-master.yaml
+++ b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.15.yaml b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.15.yaml
index 6487ac17aba2..e844e3655a78 100644
--- a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.16.yaml b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.16.yaml
index df88c7820b21..4d3b03a6b1de 100644
--- a/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/route-override-cni/openshift-route-override-cni-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml
index 835c5df394d0..2f3e8cdbfaba 100644
--- a/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml
+++ b/ci-operator/config/openshift/sdn/openshift-sdn-master.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/sdn/Dockerfile.rhel
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -33,7 +32,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sdn
 - dockerfile_path: images/kube-proxy/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.15.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.15.yaml
index fefb34d8ee2b..19887261d912 100644
--- a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.15.yaml
+++ b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.15.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/sdn/Dockerfile.rhel
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -33,7 +32,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sdn
 - dockerfile_path: images/kube-proxy/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.16.yaml b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.16.yaml
index f27167b7de68..b0554aee088d 100644
--- a/ci-operator/config/openshift/sdn/openshift-sdn-release-4.16.yaml
+++ b/ci-operator/config/openshift/sdn/openshift-sdn-release-4.16.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/sdn/Dockerfile.rhel
-  from: base
   inputs:
     ocp_4.15_cli:
       as:
@@ -33,7 +32,6 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sdn
 - dockerfile_path: images/kube-proxy/Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
index ac14afcdcf8b..837349d5ceed 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.15.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.15.yaml
index 9740e314d8b9..15c9351d1eee 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.15.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.16.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.16.yaml
index 94dba33f58d9..cfc10bd8e14e 100644
--- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-release-4.16.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
index 0240b9727eef..b45632a50d8f 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.15.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.15.yaml
index ef32c18fb38a..75b37fd3b2e0 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.16.yaml b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.16.yaml
index 73e15ecbe114..396855a89dbc 100644
--- a/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/sriov-cni/openshift-sriov-cni-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml
index b0e40dcbe72d..ffba403a2b34 100644
--- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml
+++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.15.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.15.yaml
index 67eff13c34d5..ff32899e84f7 100644
--- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.15.yaml
+++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.16.yaml b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.16.yaml
index f533e8572147..1a8ffa9ad308 100644
--- a/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.16.yaml
+++ b/ci-operator/config/openshift/sriov-dp-admission-controller/openshift-sriov-dp-admission-controller-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml
index 6442e97a9124..e44ad01b9dc5 100644
--- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml
+++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.15.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.15.yaml
index ac402c5e4c4a..1d7f066b8a68 100644
--- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.15.yaml
+++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.16.yaml b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.16.yaml
index 4ccf3dce4f43..d75e42b146ac 100644
--- a/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.16.yaml
+++ b/ci-operator/config/openshift/sriov-network-device-plugin/openshift-sriov-network-device-plugin-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml
index 1c74724845ec..8645e5bd5d39 100644
--- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml
+++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-master.yaml
@@ -35,21 +35,18 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.15.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.15.yaml
index 4824d65a4feb..04aaef82352e 100644
--- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.15.yaml
@@ -35,21 +35,18 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.16.yaml b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.16.yaml
index 5d58c1e579ee..f030e4b901eb 100644
--- a/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/sriov-network-operator/openshift-sriov-network-operator-release-4.16.yaml
@@ -35,21 +35,18 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
index b47b5c99df78..775bbc3cf2df 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.15.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.15.yaml
index eb68d2f59c54..273551def21d 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.15.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.16.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.16.yaml
index 98a3785d4cf2..1968afbd9c1c 100644
--- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.16.yaml
+++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml
index 38d2c87e979d..4aa59eb113ce 100644
--- a/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml
+++ b/ci-operator/config/openshift/thanos/openshift-thanos-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.15.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.15.yaml
index 5b9bb5d79c33..de875d9426da 100644
--- a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.15.yaml
+++ b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.15.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.16.yaml b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.16.yaml
index 0555c613fddf..950936adad44 100644
--- a/ci-operator/config/openshift/thanos/openshift-thanos-release-4.16.yaml
+++ b/ci-operator/config/openshift/thanos/openshift-thanos-release-4.16.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml
index 85bb2b96a72f..3c161f2d3a0f 100644
--- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml
+++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-master.yaml
@@ -14,14 +14,12 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: vertical-pod-autoscaler-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.15.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.15.yaml
index 5d3ec03a2413..01f6a7979baf 100644
--- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.15.yaml
+++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.15.yaml
@@ -14,14 +14,12 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: vertical-pod-autoscaler-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
diff --git a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.16.yaml b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.16.yaml
index 1191345bea85..76e5db3f49cd 100644
--- a/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.16.yaml
+++ b/ci-operator/config/openshift/vertical-pod-autoscaler-operator/openshift-vertical-pod-autoscaler-operator-release-4.16.yaml
@@ -14,14 +14,12 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: vertical-pod-autoscaler-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
diff --git a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master.yaml b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master.yaml
index 7a08407114f1..50116c1986ab 100644
--- a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master.yaml
+++ b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.15.yaml b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.15.yaml
index e2f8b4e6e235..fd5350aba825 100644
--- a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.15.yaml
+++ b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.15.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
diff --git a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.16.yaml b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.16.yaml
index 8bb0806ffb31..06e6522f632a 100644
--- a/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.16.yaml
+++ b/ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-release-4.16.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as: