diff --git a/.konflux/next/component-bundle.yaml b/.konflux/next/component-bundle.yaml
index d36d17f39..580ee2abd 100644
--- a/.konflux/next/component-bundle.yaml
+++ b/.konflux/next/component-bundle.yaml
@@ -9,7 +9,9 @@ spec:
   componentName: bundle
   application: operator-next
   build-nudges-ref:
-    - operator-next-index
+    - operator-next-index-4-15
+    - operator-next-index-4-16
+    - operator-next-index-4-17
   source:
     git:
       url: https://github.com/openshift-pipelines/operator.git
diff --git a/.konflux/next/component-index.yaml b/.konflux/next/component-index-4.15.yaml
similarity index 64%
rename from .konflux/next/component-index.yaml
rename to .konflux/next/component-index-4.15.yaml
index 0bc08faf8..fbe272cc0 100644
--- a/.konflux/next/component-index.yaml
+++ b/.konflux/next/component-index-4.15.yaml
@@ -4,12 +4,12 @@ kind: Component
 metadata:
   annotations:
     build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}'
-  name: operator-next-index
+  name: operator-next-index-4-15
 spec:
-  componentName: operator-next-index
+  componentName: operator-next-index-4-15
   application: operator-next
   source:
     git:
       url: https://github.com/openshift-pipelines/operator.git
-      dockerfileUrl: .konflux/olm-catalog/index/Dockerfile
+      dockerfileUrl: .konflux/olm-catalog/openshift-pipelines/index/v4-15/Dockerfile.catalog
       revision: next
diff --git a/.konflux/next/component-index-4.16.yaml b/.konflux/next/component-index-4.16.yaml
new file mode 100644
index 000000000..c47a6c85e
--- /dev/null
+++ b/.konflux/next/component-index-4.16.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: Component
+metadata:
+  annotations:
+    build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}'
+  name: operator-next-index-4-16
+spec:
+  componentName: operator-next-index-4-16
+  application: operator-next
+  source:
+    git:
+      url: https://github.com/openshift-pipelines/operator.git
+      dockerfileUrl: .konflux/olm-catalog/openshift-pipelines/index/v4.16/Dockerfile.catalog
+      revision: next
diff --git a/.konflux/next/component-index-4.17.yaml b/.konflux/next/component-index-4.17.yaml
new file mode 100644
index 000000000..33aeeba40
--- /dev/null
+++ b/.konflux/next/component-index-4.17.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: Component
+metadata:
+  annotations:
+    build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}'
+  name: operator-next-index-4-17
+spec:
+  componentName: operator-next-index-4-17
+  application: operator-next
+  source:
+    git:
+      url: https://github.com/openshift-pipelines/operator.git
+      dockerfileUrl: .konflux/olm-catalog/openshift-pipelines/index/v4.17/Dockerfile.catalog
+      revision: next
diff --git a/.konflux/next/image-index.yaml b/.konflux/next/image-index-4.15.yaml
similarity index 67%
rename from .konflux/next/image-index.yaml
rename to .konflux/next/image-index-4.15.yaml
index 9e50eb9eb..f9a8ded4b 100644
--- a/.konflux/next/image-index.yaml
+++ b/.konflux/next/image-index-4.15.yaml
@@ -2,13 +2,13 @@
 apiVersion: appstudio.redhat.com/v1alpha1
 kind: ImageRepository
 metadata:
-  name: operator-next-index
+  name: operator-next-index-4-15
   annotations:
     image-controller.appstudio.redhat.com/update-component-image: "true"
   labels:
-    appstudio.redhat.com/component: operator-next-index
+    appstudio.redhat.com/component: operator-next-index-4-15
     appstudio.redhat.com/application: operator-next
 spec:
   image:
-   name: operator-next/index
+   name: operator-next/index-4.15
    visibility: public
diff --git a/.konflux/next/image-index-4.16.yaml b/.konflux/next/image-index-4.16.yaml
new file mode 100644
index 000000000..6f4627f0c
--- /dev/null
+++ b/.konflux/next/image-index-4.16.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-next-index-4-16
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-next-index-4-16
+    appstudio.redhat.com/application: operator-next
+spec:
+  image:
+   name: operator-next/index-4.16
+   visibility: public
diff --git a/.konflux/next/image-index-4.17.yaml b/.konflux/next/image-index-4.17.yaml
new file mode 100644
index 000000000..ffd4876c3
--- /dev/null
+++ b/.konflux/next/image-index-4.17.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: appstudio.redhat.com/v1alpha1
+kind: ImageRepository
+metadata:
+  name: operator-next-index-4-17
+  annotations:
+    image-controller.appstudio.redhat.com/update-component-image: "true"
+  labels:
+    appstudio.redhat.com/component: operator-next-index-4-17
+    appstudio.redhat.com/application: operator-next
+spec:
+  image:
+   name: operator-next/index-4.17
+   visibility: public
diff --git a/.konflux/next/tests-index-4-15.yaml b/.konflux/next/tests-index-4-15.yaml
new file mode 100644
index 000000000..c9cb559f4
--- /dev/null
+++ b/.konflux/next/tests-index-4-15.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: appstudio.redhat.com/v1beta2
+kind: IntegrationTestScenario
+metadata:
+  name: operator-next-enterprise-contract-index-4-15
+spec:
+  application: operator-next
+  contexts:
+    - description: Application testing
+      name: component_operator-next-index-4-15
+  params:
+    - name: POLICY_CONFIGURATION
+      value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-indexes
+    - name: TIMEOUT
+      value: "15m0s"
+  resolverRef:
+    params:
+      - name: url
+        value: "https://github.com/konflux-ci/build-definitions"
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/enterprise-contract.yaml
+    resolver: git
diff --git a/.konflux/next/tests-index-4-16.yaml b/.konflux/next/tests-index-4-16.yaml
new file mode 100644
index 000000000..6566d9d97
--- /dev/null
+++ b/.konflux/next/tests-index-4-16.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: appstudio.redhat.com/v1beta2
+kind: IntegrationTestScenario
+metadata:
+  name: operator-next-enterprise-contract-index-4-16
+spec:
+  application: operator-next
+  contexts:
+    - description: Application testing
+      name: component_operator-next-index-4-16
+  params:
+    - name: POLICY_CONFIGURATION
+      value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-indexes
+    - name: TIMEOUT
+      value: "15m0s"
+  resolverRef:
+    params:
+      - name: url
+        value: "https://github.com/konflux-ci/build-definitions"
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/enterprise-contract.yaml
+    resolver: git
diff --git a/.konflux/next/tests-index-4-17.yaml b/.konflux/next/tests-index-4-17.yaml
new file mode 100644
index 000000000..37d48c364
--- /dev/null
+++ b/.konflux/next/tests-index-4-17.yaml
@@ -0,0 +1,24 @@
+---
+apiVersion: appstudio.redhat.com/v1beta2
+kind: IntegrationTestScenario
+metadata:
+  name: operator-next-enterprise-contract-index-4-17
+spec:
+  application: operator-next
+  contexts:
+    - description: Application testing
+      name: component_operator-next-index-4-17
+  params:
+    - name: POLICY_CONFIGURATION
+      value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-indexes
+    - name: TIMEOUT
+      value: "15m0s"
+  resolverRef:
+    params:
+      - name: url
+        value: "https://github.com/konflux-ci/build-definitions"
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/enterprise-contract.yaml
+    resolver: git