diff --git a/ci-operator/config/openshift/api/openshift-api-master.yaml b/ci-operator/config/openshift/api/openshift-api-master.yaml
index 91b6559d6c86f..3dcbdfc734582 100644
--- a/ci-operator/config/openshift/api/openshift-api-master.yaml
+++ b/ci-operator/config/openshift/api/openshift-api-master.yaml
@@ -1,9 +1,6 @@
 binary_build_commands: make build --warn-undefined-variables
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
+  from_repository: true
 promotion:
   name: "4.10"
   namespace: ocp
diff --git a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml
index 36936e8e34cd5..8d526178db5d3 100644
--- a/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml
+++ b/ci-operator/config/openshift/apiserver-library-go/openshift-apiserver-library-go-master.yaml
@@ -5,10 +5,7 @@ base_images:
     tag: "7"
 binary_build_commands: make build --warn-undefined-variables
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
+  from_repository: true
 promotion:
   name: "4.10"
   namespace: ocp
diff --git a/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml b/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml
index 8f84a2ec75e3b..eb64167924fa3 100644
--- a/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml
+++ b/ci-operator/config/openshift/client-go/openshift-client-go-master.yaml
@@ -1,8 +1,5 @@
 build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.16
+  from_repository: true
 promotion:
   name: "4.10"
   namespace: ocp
diff --git a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
index 0686eef2d7df3..070624c945a16 100644
--- a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml
@@ -8,8 +8,6 @@ presubmits:
     cluster: build02
     context: ci/prow/build
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -57,8 +55,6 @@ presubmits:
     cluster: build02
     context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -106,8 +102,6 @@ presubmits:
     cluster: build02
     context: ci/prow/verify
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -155,8 +149,6 @@ presubmits:
     cluster: build02
     context: ci/prow/verify-client-go
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -204,8 +196,6 @@ presubmits:
     cluster: build02
     context: ci/prow/verify-deps
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/apiserver-library-go/openshift-apiserver-library-go-master-presubmits.yaml b/ci-operator/jobs/openshift/apiserver-library-go/openshift-apiserver-library-go-master-presubmits.yaml
index bd6d5c6c8d0c7..7d693b5f85d8b 100644
--- a/ci-operator/jobs/openshift/apiserver-library-go/openshift-apiserver-library-go-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/apiserver-library-go/openshift-apiserver-library-go-master-presubmits.yaml
@@ -8,8 +8,6 @@ presubmits:
     cluster: build03
     context: ci/prow/unit
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -57,8 +55,6 @@ presubmits:
     cluster: build03
     context: ci/prow/verify
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
@@ -106,8 +102,6 @@ presubmits:
     cluster: build03
     context: ci/prow/verify-deps
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/client-go/openshift-client-go-master-presubmits.yaml b/ci-operator/jobs/openshift/client-go/openshift-client-go-master-presubmits.yaml
index 3361160ddc939..7e97a6b45e427 100644
--- a/ci-operator/jobs/openshift/client-go/openshift-client-go-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/client-go/openshift-client-go-master-presubmits.yaml
@@ -8,8 +8,6 @@ presubmits:
     cluster: build03
     context: ci/prow/verify
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"