diff --git a/.tekton/fbc-v4-13-pull-request.yaml b/.tekton/fbc-v4-13-pull-request.yaml
deleted file mode 100644
index 709275af..00000000
--- a/.tekton/fbc-v4-13-pull-request.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.13/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-13-pull-request.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-13
-    appstudio.openshift.io/component: fbc-v4-13
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-13-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-13:on-pr-{{revision}}
-  - name: path-context
-    value: v4.13/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-13
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-13-push.yaml b/.tekton/fbc-v4-13-push.yaml
deleted file mode 100644
index c81d2f13..00000000
--- a/.tekton/fbc-v4-13-push.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.13/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-13-push.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-13
-    appstudio.openshift.io/component: fbc-v4-13
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-13-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-13:{{revision}}
-  - name: path-context
-    value: v4.13/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-13
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-14-pull-request.yaml b/.tekton/fbc-v4-14-pull-request.yaml
deleted file mode 100644
index 0100fb68..00000000
--- a/.tekton/fbc-v4-14-pull-request.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.14/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-14-pull-request.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-14
-    appstudio.openshift.io/component: fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-14-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-14:on-pr-{{revision}}
-  - name: path-context
-    value: v4.14/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-14-push.yaml b/.tekton/fbc-v4-14-push.yaml
deleted file mode 100644
index 27dff18b..00000000
--- a/.tekton/fbc-v4-14-push.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.14/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-14-push.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-14
-    appstudio.openshift.io/component: fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-14-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-14:{{revision}}
-  - name: path-context
-    value: v4.14/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-15-pull-request.yaml b/.tekton/fbc-v4-15-pull-request.yaml
deleted file mode 100644
index 8d959bbb..00000000
--- a/.tekton/fbc-v4-15-pull-request.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.15/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-15-pull-request.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-15
-    appstudio.openshift.io/component: fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-15-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: image-expires-after
-    value: 5d
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-15:on-pr-{{revision}}
-  - name: path-context
-    value: v4.15/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-15-push.yaml b/.tekton/fbc-v4-15-push.yaml
deleted file mode 100644
index e2397495..00000000
--- a/.tekton/fbc-v4-15-push.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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
-      == "main" && ( "v4.15/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-15-push.yaml".pathChanged()
-      || "trigger-konflux-builds.txt".pathChanged() )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: fbc-v4-15
-    appstudio.openshift.io/component: fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-15-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: git-url
-    value: '{{source_url}}'
-  - name: output-image
-    value: quay.io/securesign/fbc-v4-15:{{revision}}
-  - name: path-context
-    value: v4.15/rhtas-operator
-  - name: revision
-    value: '{{revision}}'
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/fbc-v4-16-pull-request.yaml b/.tekton/fbc-v4-16-pull-request.yaml
index 9ab412bd..f39b0d8c 100644
--- a/.tekton/fbc-v4-16-pull-request.yaml
+++ b/.tekton/fbc-v4-16-pull-request.yaml
@@ -8,14 +8,14 @@ metadata:
     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
-      == "main" && ( "v4.16/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-16-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.16/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-16-pull-request.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-16
-    appstudio.openshift.io/component: fbc-v4-16
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-16-on-pull-request
+  name: rhtas-fbc-stage-v4-16-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-16-push.yaml b/.tekton/fbc-v4-16-push.yaml
index 1686b9c5..39f41c90 100644
--- a/.tekton/fbc-v4-16-push.yaml
+++ b/.tekton/fbc-v4-16-push.yaml
@@ -7,14 +7,14 @@ metadata:
     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
-      == "main" && ( "v4.16/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-16-push.yaml".pathChanged()
+      == "stage" && ( "v4.16/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-16-push.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-16
-    appstudio.openshift.io/component: fbc-v4-16
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-16-on-push
+  name: rhtas-fbc-stage-v4-16-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-17-pull-request.yaml b/.tekton/fbc-v4-17-pull-request.yaml
index f4f70846..a4150be4 100644
--- a/.tekton/fbc-v4-17-pull-request.yaml
+++ b/.tekton/fbc-v4-17-pull-request.yaml
@@ -8,14 +8,14 @@ metadata:
     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
-      == "main" && ( "v4.17/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-17-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.17/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-17-pull-request.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-17
-    appstudio.openshift.io/component: fbc-v4-17
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-17-on-pull-request
+  name: rhtas-fbc-stage-v4-17-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-17-push.yaml b/.tekton/fbc-v4-17-push.yaml
index 13af8915..f3855c91 100644
--- a/.tekton/fbc-v4-17-push.yaml
+++ b/.tekton/fbc-v4-17-push.yaml
@@ -7,14 +7,14 @@ metadata:
     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
-      == "main" && ( "v4.17/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-17-push.yaml".pathChanged()
+      == "stage" && ( "v4.17/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-17-push.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-17
-    appstudio.openshift.io/component: fbc-v4-17
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-17-on-push
+  name: rhtas-fbc-stage-v4-17-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-18-pull-request.yaml b/.tekton/fbc-v4-18-pull-request.yaml
index 940cb20c..5fc5d235 100644
--- a/.tekton/fbc-v4-18-pull-request.yaml
+++ b/.tekton/fbc-v4-18-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.18/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-18-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.18/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-18-pull-request.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-18
-    appstudio.openshift.io/component: fbc-v4-18
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-18-on-pull-request
+  name: rhtas-fbc-stage-v4-18-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-18-push.yaml b/.tekton/fbc-v4-18-push.yaml
index a4350c43..eed889f5 100644
--- a/.tekton/fbc-v4-18-push.yaml
+++ b/.tekton/fbc-v4-18-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.18/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-18-push.yaml".pathChanged()
+      == "stage" && ( "v4.18/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-18-push.yaml".pathChanged()
       || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-18
-    appstudio.openshift.io/component: fbc-v4-18
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-18-on-push
+  name: rhtas-fbc-stage-v4-18-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-19-pull-request.yaml b/.tekton/fbc-v4-19-pull-request.yaml
index 92e2822a..09aeba68 100644
--- a/.tekton/fbc-v4-19-pull-request.yaml
+++ b/.tekton/fbc-v4-19-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.19/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-19-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.19/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-19-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-19
-    appstudio.openshift.io/component: fbc-v4-19
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-19-on-pull-request
+  name: rhtas-fbc-stage-v4-19-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-19-push.yaml b/.tekton/fbc-v4-19-push.yaml
index d972f4e4..5790d016 100644
--- a/.tekton/fbc-v4-19-push.yaml
+++ b/.tekton/fbc-v4-19-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.19/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-19-push.yaml".pathChanged()
+      == "stage" && ( "v4.19/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-19-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-19
-    appstudio.openshift.io/component: fbc-v4-19
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-19-on-push
+  name: rhtas-fbc-stage-v4-19-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-20-pull-request.yaml b/.tekton/fbc-v4-20-pull-request.yaml
index be59edea..6b5b4b4d 100644
--- a/.tekton/fbc-v4-20-pull-request.yaml
+++ b/.tekton/fbc-v4-20-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.20/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-20-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.20/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-20-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-20
-    appstudio.openshift.io/component: fbc-v4-20
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-20-on-pull-request
+  name: rhtas-fbc-stage-v4-20-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/fbc-v4-20-push.yaml b/.tekton/fbc-v4-20-push.yaml
index d4edcc41..ed04c707 100644
--- a/.tekton/fbc-v4-20-push.yaml
+++ b/.tekton/fbc-v4-20-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.20/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-20-push.yaml".pathChanged()
+      == "stage" && ( "v4.20/rhtas-operator/***".pathChanged() || ".tekton/fbc-v4-20-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-20
-    appstudio.openshift.io/component: fbc-v4-20
+    appstudio.openshift.io/application: rhtas-fbc-stage
+    appstudio.openshift.io/component: rhtas-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-20-on-push
+  name: rhtas-fbc-stage-v4-20-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-14-pull-request.yaml b/.tekton/mvo-fbc-v4-14-pull-request.yaml
deleted file mode 100644
index 9996871a..00000000
--- a/.tekton/mvo-fbc-v4-14-pull-request.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.14/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-14-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-14
-    appstudio.openshift.io/component: mvo-fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-14-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/mvo-fbc-v4-14:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.14/model-validation-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunSpecs:
-  - pipelineTaskName: fbc-fips-check-oci-ta
-    stepSpecs:
-    - computeResources:
-        limits:
-          memory: 3Gi
-      name: use-trusted-artifact
-  - pipelineTaskName: fbc-target-index-pruning-check
-    stepSpecs:
-    - computeResources:
-        limits:
-          memory: 3Gi
-      name: pull-rendered-catalog
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-mvo-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-14-push.yaml b/.tekton/mvo-fbc-v4-14-push.yaml
deleted file mode 100644
index 2e692a30..00000000
--- a/.tekton/mvo-fbc-v4-14-push.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.14/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-14-push.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-14
-    appstudio.openshift.io/component: mvo-fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-14-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/mvo-fbc-v4-14:{{revision}}
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.14/model-validation-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-mvo-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-15-pull-request.yaml b/.tekton/mvo-fbc-v4-15-pull-request.yaml
deleted file mode 100644
index d824c3aa..00000000
--- a/.tekton/mvo-fbc-v4-15-pull-request.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.15/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-15-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-15
-    appstudio.openshift.io/component: mvo-fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-15-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/mvo-fbc-v4-15:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.15/model-validation-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-mvo-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-15-push.yaml b/.tekton/mvo-fbc-v4-15-push.yaml
deleted file mode 100644
index 081ec4fe..00000000
--- a/.tekton/mvo-fbc-v4-15-push.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.15/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-15-push.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-15
-    appstudio.openshift.io/component: mvo-fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-15-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/mvo-fbc-v4-15:{{revision}}
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.15/model-validation-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-mvo-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-16-pull-request.yaml b/.tekton/mvo-fbc-v4-16-pull-request.yaml
index 2e288160..70d5adf1 100644
--- a/.tekton/mvo-fbc-v4-16-pull-request.yaml
+++ b/.tekton/mvo-fbc-v4-16-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.16/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-16-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.16/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-16-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-16
-    appstudio.openshift.io/component: mvo-fbc-v4-16
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-16-on-pull-request
+  name: mvo-fbc-stage-v4-16-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-16-push.yaml b/.tekton/mvo-fbc-v4-16-push.yaml
index 39224172..18de3866 100644
--- a/.tekton/mvo-fbc-v4-16-push.yaml
+++ b/.tekton/mvo-fbc-v4-16-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.16/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-16-push.yaml".pathChanged()
+      == "stage" && ( "v4.16/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-16-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-16
-    appstudio.openshift.io/component: mvo-fbc-v4-16
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-16-on-push
+  name: mvo-fbc-stage-v4-16-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-17-pull-request.yaml b/.tekton/mvo-fbc-v4-17-pull-request.yaml
index 264cf106..712f11cf 100644
--- a/.tekton/mvo-fbc-v4-17-pull-request.yaml
+++ b/.tekton/mvo-fbc-v4-17-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.17/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-17-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.17/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-17-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-17
-    appstudio.openshift.io/component: mvo-fbc-v4-17
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-17-on-pull-request
+  name: mvo-fbc-stage-v4-17-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-17-push.yaml b/.tekton/mvo-fbc-v4-17-push.yaml
index 1bba0276..919a65e4 100644
--- a/.tekton/mvo-fbc-v4-17-push.yaml
+++ b/.tekton/mvo-fbc-v4-17-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.17/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-17-push.yaml".pathChanged()
+      == "stage" && ( "v4.17/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-17-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-17
-    appstudio.openshift.io/component: mvo-fbc-v4-17
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-17-on-push
+  name: mvo-fbc-stage-v4-17-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-18-pull-request.yaml b/.tekton/mvo-fbc-v4-18-pull-request.yaml
index 4debfea6..6df68dd9 100644
--- a/.tekton/mvo-fbc-v4-18-pull-request.yaml
+++ b/.tekton/mvo-fbc-v4-18-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.18/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-18-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.18/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-18-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-18
-    appstudio.openshift.io/component: mvo-fbc-v4-18
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-18-on-pull-request
+  name: mvo-fbc-stage-v4-18-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-18-push.yaml b/.tekton/mvo-fbc-v4-18-push.yaml
index 456d5876..57cccf6d 100644
--- a/.tekton/mvo-fbc-v4-18-push.yaml
+++ b/.tekton/mvo-fbc-v4-18-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.18/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-18-push.yaml".pathChanged()
+      == "stage" && ( "v4.18/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-18-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-18
-    appstudio.openshift.io/component: mvo-fbc-v4-18
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-18-on-push
+  name: mvo-fbc-stage-v4-18-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-19-pull-request.yaml b/.tekton/mvo-fbc-v4-19-pull-request.yaml
index e9eca324..91bbe387 100644
--- a/.tekton/mvo-fbc-v4-19-pull-request.yaml
+++ b/.tekton/mvo-fbc-v4-19-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.19/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-19-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.19/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-19-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-19
-    appstudio.openshift.io/component: mvo-fbc-v4-19
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-19-on-pull-request
+  name: mvo-fbc-stage-v4-19-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-19-push.yaml b/.tekton/mvo-fbc-v4-19-push.yaml
index eae02002..5e20e62d 100644
--- a/.tekton/mvo-fbc-v4-19-push.yaml
+++ b/.tekton/mvo-fbc-v4-19-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.19/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-19-push.yaml".pathChanged()
+      == "stage" && ( "v4.19/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-19-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-19
-    appstudio.openshift.io/component: mvo-fbc-v4-19
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-19-on-push
+  name: mvo-fbc-stage-v4-19-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-20-pull-request.yaml b/.tekton/mvo-fbc-v4-20-pull-request.yaml
index b3100bff..a8cbfda7 100644
--- a/.tekton/mvo-fbc-v4-20-pull-request.yaml
+++ b/.tekton/mvo-fbc-v4-20-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.20/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-20-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.20/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-20-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-20
-    appstudio.openshift.io/component: mvo-fbc-v4-20
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-20-on-pull-request
+  name: mvo-fbc-stage-v4-20-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/mvo-fbc-v4-20-push.yaml b/.tekton/mvo-fbc-v4-20-push.yaml
index e65570ee..c33b299e 100644
--- a/.tekton/mvo-fbc-v4-20-push.yaml
+++ b/.tekton/mvo-fbc-v4-20-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.20/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-20-push.yaml".pathChanged()
+      == "stage" && ( "v4.20/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-20-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-20
-    appstudio.openshift.io/component: mvo-fbc-v4-20
+    appstudio.openshift.io/application: mvo-fbc-stage
+    appstudio.openshift.io/component: mvo-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-20-on-push
+  name: mvo-fbc-stage-v4-20-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-14-pull-request.yaml b/.tekton/pco-fbc-v4-14-pull-request.yaml
deleted file mode 100644
index 15fade53..00000000
--- a/.tekton/pco-fbc-v4-14-pull-request.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.14/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-14-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: pco-fbc-v4-14
-    appstudio.openshift.io/component: pco-fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-14-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/pco-fbc-v4-14:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.14/policy-controller-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-pco-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/pco-fbc-v4-14-push.yaml b/.tekton/pco-fbc-v4-14-push.yaml
deleted file mode 100644
index 8f346b5d..00000000
--- a/.tekton/pco-fbc-v4-14-push.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.14/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-14-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: pco-fbc-v4-14
-    appstudio.openshift.io/component: pco-fbc-v4-14
-    pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-14-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/pco-fbc-v4-14:{{revision}}
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.14/policy-controller-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-pco-fbc-v4-14
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/pco-fbc-v4-15-pull-request.yaml b/.tekton/pco-fbc-v4-15-pull-request.yaml
deleted file mode 100644
index 8528f57b..00000000
--- a/.tekton/pco-fbc-v4-15-pull-request.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?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/cancel-in-progress: "true"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.15/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-15-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: pco-fbc-v4-15
-    appstudio.openshift.io/component: pco-fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-15-on-pull-request
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/pco-fbc-v4-15:on-pr-{{revision}}
-  - name: image-expires-after
-    value: 5d
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.15/policy-controller-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-pco-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/pco-fbc-v4-15-push.yaml b/.tekton/pco-fbc-v4-15-push.yaml
deleted file mode 100644
index 44040276..00000000
--- a/.tekton/pco-fbc-v4-15-push.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    pipelinesascode.tekton.dev/cancel-in-progress: "false"
-    pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.15/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-15-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: pco-fbc-v4-15
-    appstudio.openshift.io/component: pco-fbc-v4-15
-    pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-15-on-push
-  namespace: rhtas-tenant
-spec:
-  params:
-  - name: git-url
-    value: '{{source_url}}'
-  - name: revision
-    value: '{{revision}}'
-  - name: output-image
-    value: quay.io/securesign/pco-fbc-v4-15:{{revision}}
-  - name: build-platforms
-    value:
-    - linux/x86_64
-  - name: dockerfile
-    value: catalog.Dockerfile
-  - name: path-context
-    value: v4.15/policy-controller-operator
-  pipelineRef:
-    params:
-    - name: url
-      value: https://github.com/securesign/pipelines.git
-    - name: revision
-      value: main
-    - name: pathInRepo
-      value: pipelines/fbc-builder.yaml
-    resolver: git
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-pco-fbc-v4-15
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/pco-fbc-v4-16-pull-request.yaml b/.tekton/pco-fbc-v4-16-pull-request.yaml
index 88b6fe48..3b8af246 100644
--- a/.tekton/pco-fbc-v4-16-pull-request.yaml
+++ b/.tekton/pco-fbc-v4-16-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-16
-    appstudio.openshift.io/component: pco-fbc-v4-16
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-16-on-pull-request
+  name: pco-fbc-stage-v4-16-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-16-push.yaml b/.tekton/pco-fbc-v4-16-push.yaml
index 130fb14e..3bebd775 100644
--- a/.tekton/pco-fbc-v4-16-push.yaml
+++ b/.tekton/pco-fbc-v4-16-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-16
-    appstudio.openshift.io/component: pco-fbc-v4-16
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-16
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-16-on-push
+  name: pco-fbc-stage-v4-16-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-17-pull-request.yaml b/.tekton/pco-fbc-v4-17-pull-request.yaml
index ffc40a1c..c33dab83 100644
--- a/.tekton/pco-fbc-v4-17-pull-request.yaml
+++ b/.tekton/pco-fbc-v4-17-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-17
-    appstudio.openshift.io/component: pco-fbc-v4-17
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-17-on-pull-request
+  name: pco-fbc-stage-v4-17-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-17-push.yaml b/.tekton/pco-fbc-v4-17-push.yaml
index 1a2afc82..b0b999d8 100644
--- a/.tekton/pco-fbc-v4-17-push.yaml
+++ b/.tekton/pco-fbc-v4-17-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-17
-    appstudio.openshift.io/component: pco-fbc-v4-17
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-17-on-push
+  name: pco-fbc-stage-v4-17-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-18-pull-request.yaml b/.tekton/pco-fbc-v4-18-pull-request.yaml
index 0a4c6677..70951c6f 100644
--- a/.tekton/pco-fbc-v4-18-pull-request.yaml
+++ b/.tekton/pco-fbc-v4-18-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-18
-    appstudio.openshift.io/component: pco-fbc-v4-18
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-18-on-pull-request
+  name: pco-fbc-stage-v4-18-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-18-push.yaml b/.tekton/pco-fbc-v4-18-push.yaml
index aea4af4e..e4175851 100644
--- a/.tekton/pco-fbc-v4-18-push.yaml
+++ b/.tekton/pco-fbc-v4-18-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-18
-    appstudio.openshift.io/component: pco-fbc-v4-18
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-18-on-push
+  name: pco-fbc-stage-v4-18-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-19-pull-request.yaml b/.tekton/pco-fbc-v4-19-pull-request.yaml
index 7faf208f..7e31e30d 100644
--- a/.tekton/pco-fbc-v4-19-pull-request.yaml
+++ b/.tekton/pco-fbc-v4-19-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-19
-    appstudio.openshift.io/component: pco-fbc-v4-19
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-19-on-pull-request
+  name: pco-fbc-stage-v4-19-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-19-push.yaml b/.tekton/pco-fbc-v4-19-push.yaml
index 3a167fb2..94494c5e 100644
--- a/.tekton/pco-fbc-v4-19-push.yaml
+++ b/.tekton/pco-fbc-v4-19-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-19
-    appstudio.openshift.io/component: pco-fbc-v4-19
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-19-on-push
+  name: pco-fbc-stage-v4-19-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-20-pull-request.yaml b/.tekton/pco-fbc-v4-20-pull-request.yaml
index 07817245..23c34168 100644
--- a/.tekton/pco-fbc-v4-20-pull-request.yaml
+++ b/.tekton/pco-fbc-v4-20-pull-request.yaml
@@ -9,14 +9,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-pull-request.yaml".pathChanged()
+      == "stage" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-pull-request.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-20
-    appstudio.openshift.io/component: pco-fbc-v4-20
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-20-on-pull-request
+  name: pco-fbc-stage-v4-20-on-pull-request
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/pco-fbc-v4-20-push.yaml b/.tekton/pco-fbc-v4-20-push.yaml
index 1d5992ca..189885be 100644
--- a/.tekton/pco-fbc-v4-20-push.yaml
+++ b/.tekton/pco-fbc-v4-20-push.yaml
@@ -8,14 +8,14 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-push.yaml".pathChanged()
+      == "stage" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-push.yaml".pathChanged()
       )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: pco-fbc-v4-20
-    appstudio.openshift.io/component: pco-fbc-v4-20
+    appstudio.openshift.io/application: pco-fbc-stage
+    appstudio.openshift.io/component: pco-fbc-stage-v4-20
     pipelines.appstudio.openshift.io/type: build
-  name: pco-fbc-v4-20-on-push
+  name: pco-fbc-stage-v4-20-on-push
   namespace: rhtas-tenant
 spec:
   params:
diff --git a/.tekton/project_resources/devstream.yaml b/.tekton/project_resources/devstream.yaml
deleted file mode 100644
index 0a956ab8..00000000
--- a/.tekton/project_resources/devstream.yaml
+++ /dev/null
@@ -1,175 +0,0 @@
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-14-project-dev-stream
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-14-v1-1"
-      - name: gitRevision
-        value: "release-1.1"
-      - name: gitContext
-        value: "v4.14"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-15-project-dev-stream
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-15-v1-1"
-      - name: gitRevision
-        value: "release-1.1"
-      - name: gitContext
-        value: "v4.15"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-16-project-dev-stream
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-16-v1-1"
-      - name: gitRevision
-        value: "release-1.1"
-      - name: gitContext
-        value: "v4.16"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-17-project-dev-stream
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-17-v1-1"
-      - name: gitRevision
-        value: "release-1.1"
-      - name: gitContext
-        value: "v4.17"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-18-project-dev-stream
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-18-v1-1"
-      - name: gitRevision
-        value: "release-1.1"
-      - name: gitContext
-        value: "v4.18"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-14-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-14-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.14"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-15-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-15-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.15"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-16-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-16-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.16"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-17-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-17-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.17"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-18-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-18-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.18"
----
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStream
-metadata:
-  name: fbc-v4-19-project-dev-stream-v1-2
-spec:
-  project: fbc
-  template:
-    name: fbc-project-template
-    values:
-      - name: fbcVersion
-        value: "fbc-v4-19-v1-2"
-      - name: gitRevision
-        value: "release-1.2"
-      - name: gitContext
-        value: "v4.19"
diff --git a/.tekton/project_resources/project.yaml b/.tekton/project_resources/project.yaml
deleted file mode 100644
index 4e4186bc..00000000
--- a/.tekton/project_resources/project.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: projctl.konflux.dev/v1beta1
-kind: Project
-metadata:
-  name: fbc
-spec:
-  displayName: "Multi-version fbc project"
-  description: |
-    Multi-version fbc project.
diff --git a/.tekton/project_resources/template.yaml b/.tekton/project_resources/template.yaml
deleted file mode 100644
index 5270557e..00000000
--- a/.tekton/project_resources/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: projctl.konflux.dev/v1beta1
-kind: ProjectDevelopmentStreamTemplate
-metadata:
-  name: fbc-project-template
-spec:
-  project: fbc
-  variables:
-  - name: fbcVersion
-    description: FBC version number e.g fbc-v4-18-1-1
-  - name: gitRevision
-    description: The git revision we want to onbaord
-  - name: gitContext
-    description: The git context we want to use
-
-  resources:
-  - apiVersion: appstudio.redhat.com/v1alpha1
-    kind: Application
-    metadata:
-      annotations:
-        application.thumbnail: "9"
-      name: "{{.fbcVersion}}"
-    spec:
-      displayName: "{{.fbcVersion}}"
-
-  - apiVersion: appstudio.redhat.com/v1alpha1
-    kind: Component
-    metadata:
-      annotations:
-        build.appstudio.openshift.io/pipeline: '{"name":"fbc-builder","bundle":"latest"}'
-        build.appstudio.openshift.io/status: '{"pac":{"state":"enabled","merge-url":"https://github.com/securesign/fbc/pull/97","configuration-time":"Thu,27 Mar 2025 12:35:34 UTC"},"message":"done"}'
-      name: "{{.fbcVersion}}"
-    spec:
-      application: "{{.fbcVersion}}"
-      componentName: "{{.fbcVersion}}"
-      source:
-        git:
-          context: "{{ .gitContext }}"
-          dockerfileUrl: catalog.Dockerfile
-          revision: "{{.gitRevision}}"
-          url: https://github.com/securesign/fbc
-