diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml
index 01b36af54fce4..be749c95d0374 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml
@@ -9,10 +9,22 @@ images:
     - arm64
     dockerfile_path: Dockerfile
     to: oadp-operator-1.6
+  - dockerfile_path: build/ci-Dockerfile
+    to: test-oadp-operator
+operator:
+  bundles:
+  - dockerfile_path: build/Dockerfile.bundle
 promotion:
   to:
-  - name: oadp-operator
+  - excluded_images:
+    - test-oadp-operator
+    name: oadp-operator
     namespace: konveyor
+  - additional_images:
+      oadp-operator-e2e-tests: test-oadp-operator
+      oadp-operator-index: ci-index
+    namespace: konveyor
+    tag: oadp-1.6
 resources:
   '*':
     limits:
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml
index 3c34b2df0d84f..6b3863b6fe8b4 100644
--- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml
+++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml
@@ -9,10 +9,22 @@ images:
     - arm64
     dockerfile_path: Dockerfile
     to: oadp-operator
+  - dockerfile_path: build/ci-Dockerfile
+    to: test-oadp-operator
+operator:
+  bundles:
+  - dockerfile_path: build/Dockerfile.bundle
 promotion:
   to:
-  - name: oadp-operator
+  - excluded_images:
+    - test-oadp-operator
+    name: oadp-operator
     namespace: konveyor
+  - additional_images:
+      oadp-operator-e2e-tests: test-oadp-operator
+      oadp-operator-index: ci-index
+    namespace: konveyor
+    tag: oadp-dev
 resources:
   '*':
     limits:
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
index 0b33cf494ab5b..14a9aa5064622 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
@@ -1934,12 +1934,14 @@ periodics:
   decoration_config:
     sparse_checkout_files:
     - Dockerfile
+    - build/ci-Dockerfile
   extra_refs:
   - base_ref: oadp-1.6
     org: openshift
     repo: oadp-operator
     sparse_checkout_files:
     - Dockerfile
+    - build/ci-Dockerfile
   labels:
     ci.openshift.io/generator: prowgen
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-postsubmits.yaml
index 0261fb777153a..f8fb9742fdbbe 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-postsubmits.yaml
@@ -9,6 +9,7 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       capability/arm64: arm64
       ci-operator.openshift.io/is-promotion: "true"
@@ -24,6 +25,8 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
+        - --target=ci-index
+        - --target=test-oadp-operator
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -71,6 +74,7 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
index 6e9cff14f5d0b..c195404bfa62e 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
@@ -2360,6 +2360,63 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )5.1-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^oadp-1\.6$
+    - ^oadp-1\.6-
+    cluster: build01
+    context: ci/prow/ci-index
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - Dockerfile
+      - build/ci-Dockerfile
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-oadp-operator-oadp-1.6-ci-index
+    rerun_command: /test ci-index
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=ci-index
+        command:
+        - ci-operator
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2371,6 +2428,7 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       capability/arm64: arm64
       ci.openshift.io/generator: prowgen
@@ -2384,6 +2442,8 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
+        - --target=ci-index
+        - --target=test-oadp-operator
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -2428,6 +2488,7 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
index 44f7303c81b88..dd293ca70c894 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
@@ -1283,12 +1283,14 @@ periodics:
   decoration_config:
     sparse_checkout_files:
     - Dockerfile
+    - build/ci-Dockerfile
   extra_refs:
   - base_ref: oadp-dev
     org: openshift
     repo: oadp-operator
     sparse_checkout_files:
     - Dockerfile
+    - build/ci-Dockerfile
   labels:
     ci.openshift.io/generator: prowgen
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-postsubmits.yaml
index 774f36f01ce4c..e27b854a13f61 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-postsubmits.yaml
@@ -9,6 +9,7 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       capability/arm64: arm64
       ci-operator.openshift.io/is-promotion: "true"
@@ -24,6 +25,8 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
+        - --target=ci-index
+        - --target=test-oadp-operator
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -71,6 +74,7 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
index e0bf0b2655ed0..6d27b530d29b8 100644
--- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
@@ -1273,6 +1273,63 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )5.1-images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^oadp-dev$
+    - ^oadp-dev-
+    cluster: build05
+    context: ci/prow/ci-index
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - Dockerfile
+      - build/ci-Dockerfile
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-oadp-operator-oadp-dev-ci-index
+    rerun_command: /test ci-index
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=ci-index
+        command:
+        - ci-operator
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1284,6 +1341,7 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       capability/arm64: arm64
       ci.openshift.io/generator: prowgen
@@ -1297,6 +1355,8 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
+        - --target=ci-index
+        - --target=test-oadp-operator
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -1341,6 +1401,7 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
+      - build/ci-Dockerfile
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"