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 be749c95d0374..30e36950eba5c 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
@@ -13,7 +13,9 @@ images:
     to: test-oadp-operator
 operator:
   bundles:
-  - dockerfile_path: build/Dockerfile.bundle
+  - as: oadp-operator-bundle
+    dockerfile_path: build/Dockerfile.bundle
+    skip_building_index: true
 promotion:
   to:
   - excluded_images:
@@ -21,8 +23,8 @@ promotion:
     name: oadp-operator
     namespace: konveyor
   - additional_images:
+      oadp-operator-bundle: oadp-operator-bundle
       oadp-operator-e2e-tests: test-oadp-operator
-      oadp-operator-index: ci-index
     namespace: konveyor
     tag: oadp-1.6
 resources:
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 6b3863b6fe8b4..b9be0fa4f907c 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
@@ -13,7 +13,9 @@ images:
     to: test-oadp-operator
 operator:
   bundles:
-  - dockerfile_path: build/Dockerfile.bundle
+  - as: oadp-operator-bundle
+    dockerfile_path: build/Dockerfile.bundle
+    skip_building_index: true
 promotion:
   to:
   - excluded_images:
@@ -21,8 +23,8 @@ promotion:
     name: oadp-operator
     namespace: konveyor
   - additional_images:
+      oadp-operator-bundle: oadp-operator-bundle
       oadp-operator-e2e-tests: test-oadp-operator
-      oadp-operator-index: ci-index
     namespace: konveyor
     tag: oadp-dev
 resources:
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 0890fd1aa182d..a4ffc5f7b86e6 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
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=ci-index
+        - --target=oadp-operator-bundle
         - --target=test-oadp-operator
         command:
         - ci-operator
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 8d0800ecf3ad3..456f72e5b6a0c 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
@@ -1894,7 +1894,7 @@ presubmits:
     - ^oadp-1\.6$
     - ^oadp-1\.6-
     cluster: build01
-    context: ci/prow/ci-index
+    context: ci/prow/ci-bundle-oadp-operator-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -1903,15 +1903,15 @@ presubmits:
     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
+    name: pull-ci-openshift-oadp-operator-oadp-1.6-ci-bundle-oadp-operator-bundle
+    rerun_command: /test ci-bundle-oadp-operator-bundle
     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
+        - --target=oadp-operator-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -1944,7 +1944,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-bundle-oadp-operator-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1970,7 +1970,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=ci-index
+        - --target=oadp-operator-bundle
         - --target=test-oadp-operator
         command:
         - ci-operator
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 1e20a7fdb62b1..4aed8eb33a8e7 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
@@ -25,7 +25,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=ci-index
+        - --target=oadp-operator-bundle
         - --target=test-oadp-operator
         command:
         - ci-operator
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 3b9e724bb7536..49c938f9f7380 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
@@ -1369,7 +1369,7 @@ presubmits:
     - ^oadp-dev$
     - ^oadp-dev-
     cluster: build05
-    context: ci/prow/ci-index
+    context: ci/prow/ci-bundle-oadp-operator-bundle
     decorate: true
     decoration_config:
       sparse_checkout_files:
@@ -1378,15 +1378,15 @@ presubmits:
     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
+    name: pull-ci-openshift-oadp-operator-oadp-dev-ci-bundle-oadp-operator-bundle
+    rerun_command: /test ci-bundle-oadp-operator-bundle
     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
+        - --target=oadp-operator-bundle
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
@@ -1419,7 +1419,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-bundle-oadp-operator-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -1445,7 +1445,7 @@ presubmits:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=ci-index
+        - --target=oadp-operator-bundle
         - --target=test-oadp-operator
         command:
         - ci-operator