diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml
index b09fd12dec20..3ab38859c3cd 100644
--- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml
+++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.2.yaml
@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.2"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml
index df1d6274f731..688dddfb4348 100644
--- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml
+++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.3.yaml
@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.3"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.4.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.4.yaml
index c76a3081f8be..df6117759c8c 100644
--- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.4.yaml
+++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.4.yaml
@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.4"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,10 +26,18 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/config/openshift/odo/openshift-odo-master__v4.5.yaml b/ci-operator/config/openshift/odo/openshift-odo-master__v4.5.yaml
index 40f71d16655f..4a3c429bdf70 100644
--- a/ci-operator/config/openshift/odo/openshift-odo-master__v4.5.yaml
+++ b/ci-operator/config/openshift/odo/openshift-odo-master__v4.5.yaml
@@ -1,7 +1,21 @@
+base_images:
+  cli:
+    name: "4.5"
+    namespace: ocp
+    tag: cli
 binary_build_commands: make bin
 build_root:
   project_image:
     dockerfile_path: openshift-ci/build-root/Dockerfile
+images:
+- context_dir: openshift-ci/build-root/source-image
+  from: src
+  inputs:
+    cli:
+      paths:
+      - destination_dir: .
+        source_path: /usr/bin/oc
+  to: oc-bin-image
 resources:
   '*':
     requests:
@@ -12,17 +26,30 @@ tag_specification:
   namespace: ocp
 tests:
 - as: integration-e2e
-  commands: scripts/openshiftci-presubmit-all-tests.sh
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
-  secret:
-    mount_path: /tmp/secret
-    name: odo-secret
+    test:
+    - as: integration-e2e-steps
+      commands: scripts/openshiftci-presubmit-all-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 - as: integration-e2e-periodic
-  commands: scripts/openshiftci-periodic-tests.sh
   cron: 0 */6 * * *
-  openshift_installer_src:
+  steps:
     cluster_profile: aws
+    test:
+    - as: integration-e2e-periodic-steps
+      commands: scripts/openshiftci-periodic-tests.sh
+      from: oc-bin-image
+      resources:
+        requests:
+          cpu: "2"
+          memory: 4Gi
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/odo/openshift-odo-master-periodics.yaml b/ci-operator/jobs/openshift/odo/openshift-odo-master-periodics.yaml
index cddcc0e465c1..4a1d9e33f234 100644
--- a/ci-operator/jobs/openshift/odo/openshift-odo-master-periodics.yaml
+++ b/ci-operator/jobs/openshift/odo/openshift-odo-master-periodics.yaml
@@ -23,17 +23,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.2
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -46,9 +38,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -68,9 +57,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -101,17 +87,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.3
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -124,9 +102,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -146,9 +121,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -179,17 +151,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.4
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -202,9 +166,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -224,9 +185,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
@@ -257,17 +215,9 @@ periodics:
       - --report-username=ci
       - --secret-dir=/usr/local/integration-e2e-periodic-cluster-profile
       - --target=integration-e2e-periodic
-      - --template=/usr/local/integration-e2e-periodic
       - --variant=v4.5
       command:
       - ci-operator
-      env:
-      - name: CLUSTER_TYPE
-        value: aws
-      - name: JOB_NAME_SAFE
-        value: integration-e2e-periodic
-      - name: TEST_COMMAND
-        value: scripts/openshiftci-periodic-tests.sh
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""
@@ -280,9 +230,6 @@ periodics:
         readOnly: true
       - mountPath: /usr/local/integration-e2e-periodic-cluster-profile
         name: cluster-profile
-      - mountPath: /usr/local/integration-e2e-periodic
-        name: job-definition
-        subPath: cluster-launch-installer-src.yaml
       - mountPath: /etc/pull-secret
         name: pull-secret
         readOnly: true
@@ -302,9 +249,6 @@ periodics:
         sources:
         - secret:
             name: cluster-secrets-aws
-    - configMap:
-        name: prow-job-cluster-launch-installer-src
-      name: job-definition
     - name: pull-secret
       secret:
         secretName: regcred
diff --git a/ci-operator/jobs/openshift/odo/openshift-odo-master-presubmits.yaml b/ci-operator/jobs/openshift/odo/openshift-odo-master-presubmits.yaml
index 2ff019cee32a..8be6b67e3d6b 100644
--- a/ci-operator/jobs/openshift/odo/openshift-odo-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/odo/openshift-odo-master-presubmits.yaml
@@ -45,6 +45,194 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )unit,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/v4.2-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: v4.2
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-odo-master-v4.2-images
+    rerun_command: /test v4.2-images
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --target=[images]
+        - --variant=v4.2
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v4.2-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/v4.3-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: v4.3
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-odo-master-v4.3-images
+    rerun_command: /test v4.3-images
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --target=[images]
+        - --variant=v4.3
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v4.3-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/v4.4-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: v4.4
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-odo-master-v4.4-images
+    rerun_command: /test v4.4-images
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --target=[images]
+        - --variant=v4.4
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v4.4-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: api.ci
+    context: ci/prow/v4.5-images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      ci-operator.openshift.io/variant: v4.5
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-odo-master-v4.5-images
+    rerun_command: /test v4.5-images
+    spec:
+      containers:
+      - args:
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-password-file=/etc/report/password.txt
+        - --report-username=ci
+        - --target=[images]
+        - --variant=v4.5
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: regcred
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )v4.5-images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -67,20 +255,11 @@ presubmits:
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/secrets/odo-secret
         - --secret-dir=/usr/local/integration-e2e-cluster-profile
         - --target=integration-e2e
-        - --template=/usr/local/integration-e2e
         - --variant=v4.5
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: JOB_NAME_SAFE
-          value: integration-e2e
-        - name: TEST_COMMAND
-          value: scripts/openshiftci-presubmit-all-tests.sh
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""
@@ -93,12 +272,6 @@ presubmits:
           readOnly: true
         - mountPath: /usr/local/integration-e2e-cluster-profile
           name: cluster-profile
-        - mountPath: /usr/local/integration-e2e
-          name: job-definition
-          subPath: cluster-launch-installer-src.yaml
-        - mountPath: /secrets/odo-secret
-          name: odo-secret
-          readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
@@ -118,12 +291,6 @@ presubmits:
           sources:
           - secret:
               name: cluster-secrets-aws
-      - configMap:
-          name: prow-job-cluster-launch-installer-src
-        name: job-definition
-      - name: odo-secret
-        secret:
-          secretName: odo-secret
       - name: pull-secret
         secret:
           secretName: regcred