diff --git a/.tekton/operator-1-20-index-4.14-pull-request.yaml b/.tekton/operator-1-20-index-4.14-pull-request.yaml
index 50e084bcd3..ce726e6ea8 100644
--- a/.tekton/operator-1-20-index-4.14-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.14-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.14-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.14/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.14.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.14-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-14-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-14
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.14-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.14:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.14:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.14/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.14.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.14-push.yaml b/.tekton/operator-1-20-index-4.14-push.yaml
index 9c50a9901b..fbfef8c47b 100644
--- a/.tekton/operator-1-20-index-4.14-push.yaml
+++ b/.tekton/operator-1-20-index-4.14-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.14-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.14/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.14.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.14-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-14-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-14
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.14-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.14:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.14:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.14/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.14.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.15-pull-request.yaml b/.tekton/operator-1-20-index-4.15-pull-request.yaml
deleted file mode 100644
index e466c03287..0000000000
--- a/.tekton/operator-1-20-index-4.15-pull-request.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-index-4.15-1.20 by openshift-pipelines/hack. DO NOT EDIT
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines
-    pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/fbc-build.yaml"
-    build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/operator.git?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "release-v1.20.x" &&
-      (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.15/Dockerfile.catalog".pathChanged() ||
-      ".tekton/operator-1-20-index-4.15-pull-request.yaml".pathChanged())
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-15-1-20
-    appstudio.openshift.io/component: operator-1-20-index-4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: operator-1-20-index-4.15-on-pull-request
-  namespace: tekton-ecosystem-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.15:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.15/Dockerfile.catalog
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  pipelineRef:
-    name: fbc-build
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-operator-1-20-index-4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/operator-1-20-index-4.15-push.yaml b/.tekton/operator-1-20-index-4.15-push.yaml
deleted file mode 100644
index f9ddb3b627..0000000000
--- a/.tekton/operator-1-20-index-4.15-push.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-index-4.15-1.20 by openshift-pipelines/hack. DO NOT EDIT
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines
-    pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/fbc-build.yaml"
-    build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/operator.git?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "release-v1.20.x" &&
-      (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.15/Dockerfile.catalog".pathChanged() ||
-      ".tekton/operator-1-20-index-4.15-push.yaml".pathChanged())
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-15-1-20
-    appstudio.openshift.io/component: operator-1-20-index-4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: operator-1-20-index-4.15-on-push
-  namespace: tekton-ecosystem-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.15:{{revision}}
-  - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.15/Dockerfile.catalog
-  pipelineRef:
-    name: fbc-build
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-operator-1-20-index-4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/operator-1-20-index-4.16-pull-request.yaml b/.tekton/operator-1-20-index-4.16-pull-request.yaml
index 5cbd54ee4e..3b26e5f5e1 100644
--- a/.tekton/operator-1-20-index-4.16-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.16-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.16-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.16/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.16.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.16-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-16-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-16
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.16-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.16:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.16:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.16/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.16.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.16-push.yaml b/.tekton/operator-1-20-index-4.16-push.yaml
index 30720af7e4..c9358a012d 100644
--- a/.tekton/operator-1-20-index-4.16-push.yaml
+++ b/.tekton/operator-1-20-index-4.16-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.16-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.16/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.16.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.16-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-16-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-16
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.16-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.16:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.16:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.16/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.16.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.17-pull-request.yaml b/.tekton/operator-1-20-index-4.17-pull-request.yaml
index 63a199f65c..42abfc778f 100644
--- a/.tekton/operator-1-20-index-4.17-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.17-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.17-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.17/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.17.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.17-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-17-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-17
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.17-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.17:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.17:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.17/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.17.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.17-push.yaml b/.tekton/operator-1-20-index-4.17-push.yaml
index d7df760bf8..ed386508d8 100644
--- a/.tekton/operator-1-20-index-4.17-push.yaml
+++ b/.tekton/operator-1-20-index-4.17-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.17-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.17/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.17.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.17-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-17-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-17
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.17-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.17:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.17:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.17/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.17.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.18-pull-request.yaml b/.tekton/operator-1-20-index-4.18-pull-request.yaml
index 8e3ff5f74c..89cba229f6 100644
--- a/.tekton/operator-1-20-index-4.18-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.18-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.18-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.18/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.18.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.18-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-18-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-18
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.18-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.18:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.18:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.18/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.18.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.18-push.yaml b/.tekton/operator-1-20-index-4.18-push.yaml
index 091398eeda..92f1310ab1 100644
--- a/.tekton/operator-1-20-index-4.18-push.yaml
+++ b/.tekton/operator-1-20-index-4.18-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.18-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.18/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.18.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.18-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-18-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-18
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.18-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.18:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.18:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.18/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.18.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.19-pull-request.yaml b/.tekton/operator-1-20-index-4.19-pull-request.yaml
index 6cab071393..0d751dc936 100644
--- a/.tekton/operator-1-20-index-4.19-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.19-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.19-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.19/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.19.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.19-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-19-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-19
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.19-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.19:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.19:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.19/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.19.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.19-push.yaml b/.tekton/operator-1-20-index-4.19-push.yaml
index 23dd119a90..cf747831cf 100644
--- a/.tekton/operator-1-20-index-4.19-push.yaml
+++ b/.tekton/operator-1-20-index-4.19-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.19-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.19/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.19.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.19-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-19-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-19
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.19-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.19:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.19:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.19/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.19.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.20-pull-request.yaml b/.tekton/operator-1-20-index-4.20-pull-request.yaml
index b459b5cca6..79726536a3 100644
--- a/.tekton/operator-1-20-index-4.20-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.20-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.20-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.20/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.20.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.20-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-20-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-20
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.20-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.20:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.20:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.20/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.20.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.20-push.yaml b/.tekton/operator-1-20-index-4.20-push.yaml
index 80d1f0d2a3..72563530cc 100644
--- a/.tekton/operator-1-20-index-4.20-push.yaml
+++ b/.tekton/operator-1-20-index-4.20-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.20-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.20/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.20.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.20-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-20-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-20
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.20-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.20:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.20:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.20/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.20.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.21-pull-request.yaml b/.tekton/operator-1-20-index-4.21-pull-request.yaml
index bd5fd5630d..1b4544ebfc 100644
--- a/.tekton/operator-1-20-index-4.21-pull-request.yaml
+++ b/.tekton/operator-1-20-index-4.21-pull-request.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.21-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -13,11 +13,10 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.21/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.21.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.21-pull-request.yaml".pathChanged())
-  creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-21-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-21
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.21-on-pull-request
@@ -26,14 +25,19 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.21:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.21:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.21/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.21.Dockerfile
+  - name: additional-tags
+    value:
+      - "on-pr-v1.20.4"
   - name: build-platforms
     value:
     - linux/x86_64
diff --git a/.tekton/operator-1-20-index-4.21-push.yaml b/.tekton/operator-1-20-index-4.21-push.yaml
index 6948b6c17d..765bfc1c39 100644
--- a/.tekton/operator-1-20-index-4.21-push.yaml
+++ b/.tekton/operator-1-20-index-4.21-push.yaml
@@ -1,4 +1,4 @@
-# Generated for Konflux Application openshift-pipelines-index-4.21-1.20 by openshift-pipelines/hack. DO NOT EDIT
+# Generated for Konflux Application openshift-pipelines-index by openshift-pipelines/hack. DO NOT EDIT
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
@@ -12,11 +12,11 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
       == "release-v1.20.x" &&
       (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.21/Dockerfile.catalog".pathChanged() ||
+      ".konflux/dockerfiles/index-4.21.Dockerfile".pathChanged() ||
       ".tekton/operator-1-20-index-4.21-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-21-1-20
+    appstudio.openshift.io/application: openshift-pipelines-index-1-20
     appstudio.openshift.io/component: operator-1-20-index-4-21
     pipelines.appstudio.openshift.io/type: build
   name: operator-1-20-index-4.21-on-push
@@ -25,12 +25,17 @@ spec:
   params:
   - name: git-url
     value: '{{source_url}}'
+  - name: upstream-git-url
+    value: 'https://github.com/'
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.21:{{revision}}
+    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-index-4.21:{{revision}}
   - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.21/Dockerfile.catalog
+    value: .konflux/dockerfiles/index-4.21.Dockerfile
+  - name: additional-tags
+    value:
+      - "v1.20.4"
   pipelineRef:
     name: fbc-build
   taskRunTemplate:
diff --git a/.tekton/operator-1-20-index-4.22-pull-request.yaml b/.tekton/operator-1-20-index-4.22-pull-request.yaml
deleted file mode 100644
index 70b234362f..0000000000
--- a/.tekton/operator-1-20-index-4.22-pull-request.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-index-4.22-1.20 by openshift-pipelines/hack. DO NOT EDIT
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines
-    pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/fbc-build.yaml"
-    build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/operator.git?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "release-v1.20.x" &&
-      (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.22/Dockerfile.catalog".pathChanged() ||
-      ".tekton/operator-1-20-index-4.22-pull-request.yaml".pathChanged())
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-22-1-20
-    appstudio.openshift.io/component: operator-1-20-index-4-22
-    pipelines.appstudio.openshift.io/type: build
-  name: operator-1-20-index-4.22-on-pull-request
-  namespace: tekton-ecosystem-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.22:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.22/Dockerfile.catalog
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  pipelineRef:
-    name: fbc-build
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-operator-1-20-index-4-22
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/operator-1-20-index-4.22-push.yaml b/.tekton/operator-1-20-index-4.22-push.yaml
deleted file mode 100644
index ed0eb3cfd0..0000000000
--- a/.tekton/operator-1-20-index-4.22-push.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-index-4.22-1.20 by openshift-pipelines/hack. DO NOT EDIT
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    pipelinesascode.tekton.dev/cancel-in-progress: "true" # Cancel in-progress pipelines
-    pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/next/.tekton/fbc-build.yaml"
-    build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines/operator.git?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "release-v1.20.x" &&
-      (( ".konflux/olm-catalog/index/***".pathChanged()) ||
-      ".konflux/olm-catalog/index/v4.22/Dockerfile.catalog".pathChanged() ||
-      ".tekton/operator-1-20-index-4.22-push.yaml".pathChanged())
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: openshift-pipelines-index-4-22-1-20
-    appstudio.openshift.io/component: operator-1-20-index-4-22
-    pipelines.appstudio.openshift.io/type: build
-  name: operator-1-20-index-4.22-on-push
-  namespace: tekton-ecosystem-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/1-20/index-4.22:{{revision}}
-  - name: dockerfile
-    value: .konflux/olm-catalog/index/v4.22/Dockerfile.catalog
-  pipelineRef:
-    name: fbc-build
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-operator-1-20-index-4-22
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}