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 d6041f71db35a..b3b4baa4cfec4 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 2748e196496e6..176fa1a61d7e4 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 0a093747ad010..66505218baf63 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 d1ee1ad1e5c79..6dd8e5624daa7 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 174841b5b749e..26c15d66786a4 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 cb3e777bb2a15..18d03b6a85da6 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 96557c078e666..cfedb372670bb 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 68ae7081f2d9f..f470c43d13c37 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 b8482d8760efc..7e5c546e581f9 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 23df8fef17867..c33f729ae0330 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 f9fa3cf16c762..c040b987eb257 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 8a8c59137dd8c..d743bf0f29e65 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 bf24ea766fcc9..217a55b90242e 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 4e947332e7af3..12feaf3893697 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 f63d195fbd13e..7102c2cc6495b 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 ff61c17621d6a..646de4a3e734f 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 cef86a5446ac7..b5ec4efebe6ba 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 0c7d8cc82e17b..426b96c776d6c 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 13dc876595c05..e221242f5010d 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 84cca8100831b..219d8445b4512 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 455a779fc2be3..2b69fcab184e7 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 c8c0d5526f791..44241ca92096b 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 0de63fa611a15..f349ad4aef5a2 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 8996ac89351fd..126e25b43f9c5 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 5209e283f5c74..a8eb793c7d5ed 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 172132361aaad..c877915a502ee 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 490319b5fe89c..49721c6c3ce89 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 9e461f0640da0..08ad578f71e40 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 2c728018a5c00..0841c542aeb00 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 9a85fbfa438f2..fdda4ad94b481 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 3d1fd586217b6..8c7568a599634 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 0b9baa79511cf..39da69d1d5649 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 4f7b0327aa277..bbe0f9877b93d 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 ef4c4fc272dc6..142584a0772c8 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 efe71486a5a5a..e0607e42faeca 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 a784c1caed688..6b2094809a6df 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 f0058fa849336..52218d941338b 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 b72f7d07d9a66..adf24a55ccb15 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 f9ad2e012e9f6..48ac300842261 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 ae4ba0b67ac4e..5fff952dba618 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 599533a3c4310..8f8cab340ecc0 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 ff162ba57e1cd..f9c1e64ea5a60 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 f7f8a489638b5..d5cd4f215699b 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 f3f332115780f..4c458daa8b22b 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 affe11dda6d43..ff182257c37d6 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 4355d435f5956..5590c0d656ab5 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 63321ae38113f..5ad6ccc1b0e31 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 ae22772c19aa3..9939a73c70b0a 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 bdf8304e5e7c4..a45cb4392d390 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 ca0ce828c0f14..dc5363a233abb 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 5d969f6949a22..bae5d9ea84e90 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 abdbb84841c18..174a0ff000e76 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 8ee5c0d526c44..61bef93eba54d 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 326c546e490f3..c42495e93c999 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 709a151d1addd..c8806ba9c322f 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 56c4a78ca7fa5..d09ffaa6d71e6 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 05b79af78139c..096d2ce4d2040 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 2e8da7f57e2ea..cb8d946907b11 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 56735e37306bf..ed1a5f8c0e394 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 270bb77716229..8791fa62b846b 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 a08d5e6b3ae15..7af94d3cdd9b6 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 3b28cf7d7eae0..ec94f5fbfea6b 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 32fb46e075622..c7a441c4c94d0 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 6a40d71ce5b64..c0469ca501e8e 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 fe2e9525125b9..0ff9e1dd3037c 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 be8ebfb3634f3..0a079be004d41 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 7a38c38de2d54..40bacb3320e4d 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 d5eb2c1635309..2e22c5b7967df 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 30fc34bfe9bfd..b038fb0790ff8 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 d07319904f975..259e00cfbfb2a 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 e46867d2bc11d..a1fb69a3bc2e6 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 860b391688096..203202af52b4c 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 7f46fd0164847..7448d2f2dc0ac 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 a11c616020438..2771f898eb4c6 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 9b967e89fd812..7e9b5b28d9413 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 959797791fa4e..31e91d24c88fd 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 330f8659fc940..cb668da758438 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 8fddfc57af9df..a63b19bb4bb76 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 f65af7110dc04..cf1c94478f492 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 579b3a6bc4dfb..a492915700c8e 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 b4de6acc7a128..02a3ab17f2a7d 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 db61872878bdd..0f5a0a983b76a 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 5a3ba8bb86ab7..c0a49fb877397 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 e2605bb21bcc6..d39da3cda167e 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 d2da1c64ce5f8..ffc4188147476 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 70304a02a0e9e..8f6913d69c017 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 43f643741f743..601baa79406ae 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 ff1cb674dce52..48a168c0bb65d 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 9b18b4be4e644..84f929b861612 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 ff6f83c1ce9ff..db02cbc7822b3 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 b7904a0a0c010..4380c4116acc4 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 4f3d1e3647779..51c43bb5db097 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 2cd9316c38768..0562b98bdd54b 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 743c522669258..715d3a24271d1 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 b15b187711684..272a518b01af5 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 94eebfb45b24d..c014e036047e9 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 a21c2cde59ff4..6cc5c949b099d 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 0db8be0186739..7e4ae05e79b01 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 e73aca91bc692..0e6ca2dedce85 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 e1737ba667e5f..03e74d4bc51af 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 6510e897e4fb5..db25976993e40 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 26cbe7acc43c5..cd1d6cecf9725 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 feb4472c79109..9d0a4bb728787 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 b87d98bf8bac6..2ccc75fce0362 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 488405f8b04aa..baea77cee9c34 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 8536b3b8fab77..c9bb7586a5dc0 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 fb054d53e9d6b..10beb31685293 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 75c5c35089b5d..7d75d1d873089 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 8fc252c23e54e..c4e885c6fe00c 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 4653f468f98b9..1a14088c25bb6 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 475ac48e1e699..6cf8d2260797b 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 6451c6217daeb..967f9b3c4dfe4 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 90d92631e3a37..b269c8224bcfe 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 fcbe8836ea873..61dd0d208bdd6 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 e9aae146a9639..df9000051e835 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 ef337b723c28e..c31e70247b4ad 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 5683835eca9ff..b600fc9fd3fd8 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 05a77198dedc0..67274c13655a6 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 a49cd7a6c5f41..1eabf5589586a 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 94b85f43970eb..9e8ffd136ee4a 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 723640762e31f..72c8bc5c87cc7 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 69e7cb6352d41..5d079228a6c02 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 ae0bed2589072..07a22dd6634f2 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 48a1c19416b6a..dc1bf573af9b7 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 a5e39dcff7347..023702b617ae5 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 0d86d7923af5c..9449ebc8afe61 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 73554d007a4a2..5b0fd7472623c 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 af44e809d5573..b56f11d874e9c 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 467e05e1730ed..49def1e85afb3 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 64f13bbf88357..1b1ec43bcd823 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 3fea30e1742a0..a5a01df302e03 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 0bed9f0e0791e..b7a9087d562ee 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 bf6e017e6ece4..8d8717274e939 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 afc63010f7e17..06040eb14ba1b 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 127493c2ec732..8bf6dbc712151 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 82e405d401509..86819660927ed 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 67573d15dc572..bf4328317ed0c 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 54a1fd718352d..5d79fde716723 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 6ef0bbf8b731a..3e36ef6d6966d 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 4f28f721536db..c6555fd365244 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 779b09acde075..5e39c61f9e7cd 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 6c0bbbcb8f306..67af310d2cb54 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 fc51caca99a57..0d118911914c6 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 9798f9a822f43..2e63b3b12e132 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 628b736e03b30..986f66af3163b 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 04016e6a83d47..87e7b6b3c7230 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 3ca5fa66f302d..c865cd9713183 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 c82416df718b2..eb7befd7328c7 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 bee11d5d52405..c6c4a354b7d76 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 d8aae41c2a6e9..397de8af7f33d 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 c594450c2200d..fff0eeb463fb2 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 1ed50a0b43f84..bf9c181c4a694 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 07938e26df5a2..38f0bd9996e1a 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 bc5a853241e22..a2e8a39c69ab1 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 25b6dff3dde3e..71117a51b16e8 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 bd3404d0818ce..b86b1e396075d 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 daa0d31789a3a..81cc0b799b161 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 32b27451305b2..41a92801372bc 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 632f0d51fd586..86d2056f07a19 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 24eaa27813385..45307fa12bb41 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 8731c63c85087..ff06e3bfbb03d 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 3121cd2d266f7..9b3a43319e0fc 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 3afeb4d13cb6e..7272fd0357f9f 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 438cc694c9434..89fbc65e89d25 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 06e729e3147c4..7e432c7d0dd46 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 95cb2fa12bfd3..5f6f9b25e58f1 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 af8cdfb4ee9bb..db6d40a346ce4 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 c5175f45be6a2..0eafe003830f5 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 f008be6120a50..ce7e883b7a431 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 fb5b06fde3478..5c294f90bff9d 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 012708259cd30..30118031a2d7d 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 edf7323f66b88..842a72739cdfe 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 aef273f05a3bc..36d714dc9765c 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 fb8972d4e1a4b..337cc438f0a84 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 e8e7126bb383b..9ac1f792f1f78 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 56cb4afd35d01..ee76641284509 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 d678527c31273..6cbb367bd2d76 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 918685b0d5826..a87fedd3222ca 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 046094305d934..661d8185ff649 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 1423e79b8bcb0..d8a7af61e394a 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 a8073dabe18b5..585ee5ef34691 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 3bcd81487dcf3..cdcd9d5695263 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 772e6e3fe431b..c1e9a0eec3584 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 4c613845f068f..0254771c2114c 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 9fac37d783054..954c0bd82baf8 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 8a24434b6d5b5..bba5c4c232889 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 352a173ca2677..f6ce014d759fa 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 c079c758c226d..445bc1ed0aea3 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 f05839d5d92f1..62932d54d1ee3 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 abac310f83083..2085806bcc4e9 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 35531c528764f..124ec7e9bde1e 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 bfd626bd817b0..23956ccfb7291 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 dd078b1965aad..60621059b9228 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 fd47bfd9d9091..15c669f013538 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 9563f6fab3ad0..c585d266c25ae 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 43794eefab96b..67fcaa66abdcb 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 6fca50cb21573..938aa1da202d7 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 5480d603d17ae..f3d346bb0a6b2 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 7eb56336e0cad..62342479bc50d 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 5a55ff8eeb4e5..5ff0b549fa5b8 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 a391ac1149d13..a0d340345f471 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 f7ba225f27c2d..afaff032a2422 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 0859f650882ed..7940702531382 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 c545b34f7670d..39c78c2b16e7d 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 40f6d350686bd..a877597a03b9e 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 27b4c73115245..29f54305129e3 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 bc7f975435a11..a1fd52688a65f 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 89f4171e6d295..c224e0fe92b3c 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 d45d5683a7015..8b83c37d94779 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 969cc41445627..f783b86f21b6a 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 497f35205801a..55b30363f6021 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 a755e24dd4cf8..0bd375cca90b5 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 5ae171309b707..631c56f34cfd4 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 56381bfb0b3f3..57c3c90fc0657 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 3881605b886d5..f6eae40bada40 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 626f0e217a490..09cf1824ed997 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 854ad8807e3f1..62639b8e8b909 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 7491ffa2e904c..9c6c9f7746b72 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 00f24e5b26b63..51a834e143474 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 22be614997d09..3cf016c37ea94 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 1b6309d37baef..e1dcd783c9c85 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 b1804f0c608bf..7c109c1c69cdc 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 bcac5b822689f..f7f2657e2ae1d 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 5caea652ecfd7..efb1133c2471b 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 718ce695a68f8..325330febf4fd 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 5e01fae27f60c..0aa280eec114b 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 501dcc154122b..e755a252d2369 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 d7ca8caf1dbb8..5849b26a606d1 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 5cf909c3a02a1..c8e7fc8c5d7e3 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 1f91ca880a1bd..983a7bd64f4c8 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 8dd719f7a0b0d..efe0266394964 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 8c7615e77ac2c..2669e02391b4a 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 bc4cdbd782b0e..e582cb463e2bf 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 4951b7e057d8e..e02eda83ef1b7 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 df31987d0c0a3..1e328ee173bf6 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 8643daa1b1d2c..06ab685efbfa8 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 50a980cdb4bdd..a0488f9b7883f 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 985bb14a9e4d5..e19e67340d09e 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 b1a2d5bb30c3a..16bee642268ad 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 079b2520aeca5..2867070587c3c 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 3d39822e01476..2b34811714fd0 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 173fcd3a577fe..23b228dd1d486 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 aa32bca1e61c7..800d18075b4ba 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 aea3abdb9c841..a36d7963d3431 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 70cc14087f78f..59f2a553ca535 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 3a316e320fa54..3ba190a5d6729 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 cc901b5e14611..86f7af6b41f2e 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 a4192e2935e17..09e2aee5e8db7 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 13c7015174b09..1b2cae82e9b39 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 c2c36454394ea..7a970e0d2cf26 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 92b78d2e06e76..c40d8cf45e767 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 c121e0af3d6ee..2fd3c93658f4e 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 043815f9ff966..0221ae6902117 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 e4870d36fc7d0..191c60d2371d1 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 c3a77115076d1..e64dce78b7e05 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 c432741bb6509..b745dbcfccf32 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 100f8c295ec23..49868c7c69c8f 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 d4131f070ed02..0b076bb84391c 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 f0b703ff9bd0f..a82c0a48eb871 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 844bf50ca0a60..18004083cc576 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 63c1ca6448a13..c0cef4e161789 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 78c36010c4fc9..2afc042a4cd22 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 800193adbe213..742579954a1b4 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 bf792437fcb54..55fbe25d9b6b5 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 97805a55726de..a1101ddc55726 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 98e080bc062f0..ab34cace97b5e 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 c423cfcb7b5fc..8f176cc0bbb70 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 fd8786c61df0b..d607764064133 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 1671bbe7e987c..dafbc3c52e2bb 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 ebbb25f39a448..c8da89a7fa601 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 9321f8ecc3909..958880f0b587a 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 0c816c84b52a9..4989c53cd7862 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 b398ff71d4acf..40b6c3dc64f3a 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 790f95f6107ee..7a064d65e0564 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 ce2f8e3462d15..efefee21bf011 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 95e67099ac85e..f89997a0c0aad 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 3aa65e51c29bb..4229c45bbb658 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 43bc9e29cec01..1210aa4458006 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 e60130969db4d..e7ea26b37b9b4 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 f3d4039060f9e..0df03aa8a6004 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 399bc623e2b36..871e8b580d9ca 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 85858109eb0c4..905a65d6590d3 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 4c0800fb85daf..49b7b6bd3b24b 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 cc2ed73b61306..e4b93bd5251ab 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 022f9ab0f1c6c..a5cf2bc20c2fc 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 42acaa6741e1c..209a93742d376 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 c0d1f8aae5c6e..f0a7cc8917064 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 0452e414a9a14..8d3ee3fe29809 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 8f0ca8fefbeac..20ebdc5a7abed 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 052a136397200..ca1d83f7e764f 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 0a8e9c781a143..16163f4551005 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 8a8b14a9f8959..77039d8f3366f 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 3bc1e18534900..9cb877ece3c02 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 c53827ef85dce..9cceaa4bf1145 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 fa8fcce39a1a2..f03f5932e7163 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 fe4b6bfff0b67..a2b6d247408ba 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 212cb98c4ed4c..03bb8efd5e349 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 9eb3485ee333d..697d9c1b04eff 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 bb691f1aed3a7..83cfe922edf42 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 cb2fbf0a24de4..82a0cb1154af3 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 9d6d5c8081b89..91a48daf7fe19 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 8b4e6180766c9..c25b39a4cf9a5 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 7e26497ac36ca..840410a54de53 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 bccdf08823a0e..316e059aaffb0 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 cee0e2af67b00..4420b3123fa67 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 c22b6e78903cc..c30174e887471 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 678d2937980f7..6c61cd9be0429 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 7c0ae379fc08e..3046968f52c33 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 3dc50268eff0b..b2fdf95ec7554 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 5a29bea270417..484f96ab72634 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 5afc6cafad723..215d32d2b4f19 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 52215add46a05..1eef4c277d348 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 b08f3abf19135..8cbac290e7437 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 32131d6374672..de686abb22f51 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 065fdd790dc79..4100521063fe1 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 5a044b0aca593..f7ad2555e24a2 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 9d530bcc76d76..ee73a756b3458 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 c0736a8fb4bb4..9c4ef8a953a84 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 3ea2876083921..b2dad9c584080 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 74736e93da635..8f21b9de93cad 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 4c3c16fe562c3..3155651a67aec 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 938165ae2c314..7e2e1c3ce14be 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 a74609393eeb1..ea3c71c48fe02 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 a384d41d68694..9229802a1fff1 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 fa1f3d23c7c8f..e99a66a918e72 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 819dcbac1e797..1b4d0f040ba43 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 a7e86f7860459..1fab1af3807e6 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 2755d69d0a755..9fc465af4cc6e 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 bc592245c1d30..9e66393db758b 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 182865a660bbd..2c169b25894fc 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 3d97347dbcad3..b4e3778349591 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 f7d6ec1e6b2d4..5ed49b6ae5585 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 8230b10f2ac56..c8ce077774767 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 b66f2b3f685a7..e73bf9330eb13 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 daab94b7ef31d..15b4df7a64d4e 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 5f09db8473a70..d9a5b4dde517b 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 fe1aa4affb6e0..afc6bcbc27047 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 3fbe70f4f07eb..ef372e8529ac6 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 6dd1019f8a85a..20fbd8069d73d 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 c4c68b40920a2..983ddfebbbbff 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 b22c4c040ed85..86ede855e548b 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 af79915acca0b..c7d62b3f3f4fa 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 965275fb5eae9..5e07c395d3963 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 891c5ad4cdfcd..3abd8a85e8ecc 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 3717f3e73acbb..e6f8d348b1109 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 456ecb6f917d0..9441ab2464282 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 7b797704c458e..0ab0c02291340 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 da13392139339..8606770796834 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 19dea5dca178e..39383b3852a32 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 a8b03a2445648..548a8b94d8a98 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 5d3c6d78e4f4c..6d0ad59830134 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 6c17c7f25ab4a..d3d21a8a067a6 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 0161db6d35812..15dffa7610f6d 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 6e6a0afd51dcc..e33e1f39439ca 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 3ff14cadd815b..65117d8b29914 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 7b8c85c493e5c..8b8d360eafae7 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 bab184963b86d..a28944bd3d102 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 959e7e4665deb..ce86b7261114f 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 67e427f4e7e88..18035bde527ee 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 7669009c05653..917f8ec74ebe1 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 52e6fd091dca2..c0306ecac5147 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 2fb4273a99781..e7b40b578e066 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 156eddf0e4f67..5d581c8762b47 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 1ce83d6f831d6..6d35d512b1983 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 6416ec7e68f08..a0df2675b0f11 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 6ecdf0d338e2b..72b47b2d2448e 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 c4095bbc983d9..fd5735b336ca7 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 3478a595a40ad..8781adef396c8 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 249d44fdd9290..752b1b8561308 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 9785ceaa60171..df3774684f298 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 06c41f896d59d..8b6ba2c8eb4c1 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 864db980966e7..ddb34bf83294c 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 6ba1485d249c8..f305e60281969 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 f9aaa413657f0..702b9fdf79d66 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 45bc7de6db4ef..9209cc64e16ef 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 bef7ca057bfa1..f437618c3be15 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 c6a88f0dad565..517c1f3f84193 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 afdda5ba1211a..f4a7cebc8d7dd 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 6199ccfa4c028..9c7f3f69c71fe 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 d72c54d0b8e8d..7c40f977e10d5 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 d61a3ac3ae427..d8c9925217d8e 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 a37a46c4e5564..ddac869be8651 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 aeabf259138ea..73994846facc5 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 2ba1810a3d258..ccc2fef816fcb 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 e39503b45c027..c489ba875a610 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 30a13ebd798a0..b6343af2f57a9 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 a3d862b0eea62..c8db4509d454c 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 781f5f7a034e0..f161533b1b46f 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 fb9b20bd02639..ecef3b055d7a1 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 62996059f4f43..80e4a1182b538 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 5624827b22332..7dbef6e9fbc33 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 b635f024f5089..2c74f70806bbb 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 7ef01dd426342..b36964639c933 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 f1d6a6dd80ebe..97fed2f76c2e5 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 6729960036156..4ab22a528b1f6 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 bcd0a2f62ef8b..fdc2c6fd4ca9c 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 38848f47453ac..19bc5e94e3e7d 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 9bf86c88a4ca3..ff18b0098b90f 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 b57ed53f7f13c..0b2c77e701c48 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 17c98b9f536df..cd20b1f4b2e6a 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 e35c3c506391d..3b338e1b5e7f5 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 b6135feec227e..c83171d8b1309 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 0597919dee19f..f910e151f4b0a 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 2cf39c3b96be1..bc00f0603635c 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 3cd4a8478d497..1347e52fe6f58 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 0f7a31c0bb6a2..552135761a722 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 04ab61e2f3760..827a4a7c37c78 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 df1a58080e293..05cc0bbced304 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 6487ac17aba20..e844e3655a785 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 df88c7820b216..4d3b03a6b1deb 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 835c5df394d0e..2f3e8cdbfabac 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 fefb34d8ee2b0..19887261d912a 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 f27167b7de687..b0554aee088d4 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 ac14afcdcf8b4..837349d5ceed3 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 9740e314d8b9d..15c9351d1eeec 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 94dba33f58d92..cfc10bd8e14e7 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 0240b9727eef0..b45632a50d8f1 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 ef32c18fb38ac..75b37fd3b2e07 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 73e15ecbe1148..396855a89dbc1 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 b0e40dcbe72d4..ffba403a2b34a 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 67eff13c34d5a..ff32899e84f71 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 f533e85721477..1a8ffa9ad3085 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 6442e97a9124b..e44ad01b9dc50 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 ac402c5e4c4a7..1d7f066b8a687 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 4ccf3dce4f435..d75e42b146aca 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 1c74724845ecc..8645e5bd5d394 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 4824d65a4feb7..04aaef82352e8 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 5d58c1e579ee2..f030e4b901ebc 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 b47b5c99df789..775bbc3cf2df0 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 eb68d2f59c54e..273551def21d0 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 98a3785d4cf23..1968afbd9c1cd 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 38d2c87e979df..4aa59eb113ce5 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 5b9bb5d79c330..de875d9426dac 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 0555c613fddfd..950936adad44f 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 85bb2b96a72fa..3c161f2d3a0f5 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 5d3ec03a24139..01f6a7979baf3 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 1191345bea858..76e5db3f49cd2 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 7a08407114f12..50116c1986aba 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 e2f8b4e6e235d..fd5350aba8253 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 8bb0806ffb315..06e6522f632af 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: