diff --git a/.github/workflows/sync-catalog.yaml b/.github/workflows/sync-catalog.yaml
index 7a14b078..60e589d2 100644
--- a/.github/workflows/sync-catalog.yaml
+++ b/.github/workflows/sync-catalog.yaml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  SUPPORTED_PACKAGES: "rhtas-operator|policy-controller-operator"
+  SUPPORTED_PACKAGES: "rhtas-operator|policy-controller-operator|model-validation-operator"
 
 jobs:
   update-catalogs:
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-16-pull-request.yaml b/.tekton/mvo-fbc-v4-16-pull-request.yaml
deleted file mode 100644
index 2e288160..00000000
--- a/.tekton/mvo-fbc-v4-16-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.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
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-16-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-16: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.16/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.16"
-  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-16
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-16-push.yaml b/.tekton/mvo-fbc-v4-16-push.yaml
index 39224172..3cf3151f 100644
--- a/.tekton/mvo-fbc-v4-16-push.yaml
+++ b/.tekton/mvo-fbc-v4-16-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.16/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-16-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "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/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-16
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-16-on-push
diff --git a/.tekton/mvo-fbc-v4-17-pull-request.yaml b/.tekton/mvo-fbc-v4-17-pull-request.yaml
deleted file mode 100644
index 264cf106..00000000
--- a/.tekton/mvo-fbc-v4-17-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.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
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-17-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-17: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.17/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.17"
-  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-17
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-17-push.yaml b/.tekton/mvo-fbc-v4-17-push.yaml
index 1bba0276..c57fd456 100644
--- a/.tekton/mvo-fbc-v4-17-push.yaml
+++ b/.tekton/mvo-fbc-v4-17-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.17/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-17-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "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/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-17
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-17-on-push
diff --git a/.tekton/mvo-fbc-v4-18-pull-request.yaml b/.tekton/mvo-fbc-v4-18-pull-request.yaml
deleted file mode 100644
index 4debfea6..00000000
--- a/.tekton/mvo-fbc-v4-18-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.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
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-18-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-18: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.18/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.18"
-  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-18
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-18-push.yaml b/.tekton/mvo-fbc-v4-18-push.yaml
index 456d5876..cd48fff7 100644
--- a/.tekton/mvo-fbc-v4-18-push.yaml
+++ b/.tekton/mvo-fbc-v4-18-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.18/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-18-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "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/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-18
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-18-on-push
diff --git a/.tekton/mvo-fbc-v4-19-pull-request.yaml b/.tekton/mvo-fbc-v4-19-pull-request.yaml
deleted file mode 100644
index e9eca324..00000000
--- a/.tekton/mvo-fbc-v4-19-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.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
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-19-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-19: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.19/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.19"
-  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-19
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-19-push.yaml b/.tekton/mvo-fbc-v4-19-push.yaml
index eae02002..1376d8c1 100644
--- a/.tekton/mvo-fbc-v4-19-push.yaml
+++ b/.tekton/mvo-fbc-v4-19-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.19/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-19-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "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/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-19
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-19-on-push
diff --git a/.tekton/mvo-fbc-v4-20-pull-request.yaml b/.tekton/mvo-fbc-v4-20-pull-request.yaml
deleted file mode 100644
index b3100bff..00000000
--- a/.tekton/mvo-fbc-v4-20-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.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
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-20-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-20: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.20/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.20"
-  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-20
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-20-push.yaml b/.tekton/mvo-fbc-v4-20-push.yaml
index e65570ee..ee2c2ec9 100644
--- a/.tekton/mvo-fbc-v4-20-push.yaml
+++ b/.tekton/mvo-fbc-v4-20-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.20/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-20-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "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/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-20
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-20-on-push
diff --git a/.tekton/mvo-fbc-v4-21-pull-request.yaml b/.tekton/mvo-fbc-v4-21-pull-request.yaml
deleted file mode 100644
index 5106a408..00000000
--- a/.tekton/mvo-fbc-v4-21-pull-request.yaml
+++ /dev/null
@@ -1,55 +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.21/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-21-pull-request.yaml".pathChanged()
-      )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-21
-    appstudio.openshift.io/component: mvo-fbc-v4-21
-    pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-21-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-21: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.21/model-validation-operator
-  - name: ocp-release-version
-    value: "v4.21"
-  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-21
-  workspaces:
-  - name: git-auth
-    secret:
-      secretName: '{{ git_auth_secret }}'
-status: {}
diff --git a/.tekton/mvo-fbc-v4-21-push.yaml b/.tekton/mvo-fbc-v4-21-push.yaml
index 587fd547..1ddb5140 100644
--- a/.tekton/mvo-fbc-v4-21-push.yaml
+++ b/.tekton/mvo-fbc-v4-21-push.yaml
@@ -7,12 +7,13 @@ metadata:
     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.21/model-validation-operator/***".pathChanged() || ".tekton/mvo-fbc-v4-21-push.yaml".pathChanged()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "v4.21/model-validation-operator/**".pathChanged() || ".tekton/mvo-fbc-v4-21-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-21
+    appstudio.openshift.io/application: mvo-fbc
     appstudio.openshift.io/component: mvo-fbc-v4-21
     pipelines.appstudio.openshift.io/type: build
   name: mvo-fbc-v4-21-on-push
diff --git a/.tekton/mvo-fbc-v4-15-push.yaml b/.tekton/mvo-fbc-v4-22-push.yaml
similarity index 65%
rename from .tekton/mvo-fbc-v4-15-push.yaml
rename to .tekton/mvo-fbc-v4-22-push.yaml
index 081ec4fe..aa179498 100644
--- a/.tekton/mvo-fbc-v4-15-push.yaml
+++ b/.tekton/mvo-fbc-v4-22-push.yaml
@@ -7,15 +7,16 @@ metadata:
     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()
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+        && target_branch.matches('^release-.*$')
+        && ( "v4.22/model-validation-operator/**".pathChanged() || ".tekton/mvo-fbc-v4-22-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: mvo-fbc-v4-15
-    appstudio.openshift.io/component: mvo-fbc-v4-15
+    appstudio.openshift.io/application: mvo-fbc
+    appstudio.openshift.io/component: mvo-fbc-v4-22
     pipelines.appstudio.openshift.io/type: build
-  name: mvo-fbc-v4-15-on-push
+  name: mvo-fbc-v4-22-on-push
   namespace: rhtas-tenant
 spec:
   params:
@@ -24,14 +25,16 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/securesign/mvo-fbc-v4-15:{{revision}}
+    value: quay.io/securesign/mvo-fbc-v4-22:{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
   - name: dockerfile
     value: catalog.Dockerfile
   - name: path-context
-    value: v4.15/model-validation-operator
+    value: v4.22/model-validation-operator
+  - name: ocp-release-version
+    value: "v4.22"
   pipelineRef:
     params:
     - name: url
@@ -42,7 +45,7 @@ spec:
       value: pipelines/fbc-builder.yaml
     resolver: git
   taskRunTemplate:
-    serviceAccountName: build-pipeline-mvo-fbc-v4-15
+    serviceAccountName: build-pipeline-mvo-fbc-v4-22
   workspaces:
   - name: git-auth
     secret: