diff --git a/.tekton/console-plugin-main-console-plugin-pull-request.yaml b/.tekton/console-plugin-next-console-plugin-pull-request.yaml
similarity index 77%
rename from .tekton/console-plugin-main-console-plugin-pull-request.yaml
rename to .tekton/console-plugin-next-console-plugin-pull-request.yaml
index 9317b80..9c7be07 100644
--- a/.tekton/console-plugin-main-console-plugin-pull-request.yaml
+++ b/.tekton/console-plugin-next-console-plugin-pull-request.yaml
@@ -4,7 +4,7 @@ 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-konflux/tektoncd-operator/refs/heads/main/.tekton/docker-build-ta.yaml"
+    pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/openshift-pipelines/operator/refs/heads/main/.tekton/docker-build-ta.yaml"
     build.appstudio.openshift.io/repo: https://github.com/openshift-pipelines-konflux/console-plugin.git?rev={{revision}}
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
@@ -14,13 +14,13 @@ metadata:
       == "main" &&
       ("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
       ".konflux/dockerfiles/console-plugin.Dockerfile".pathChanged() ||
-      ".tekton/console-plugin-main-console-plugin-pull-request.yaml".pathChanged())
+      ".tekton/console-plugin-next-console-plugin-pull-request.yaml".pathChanged())
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-core-main
-    appstudio.openshift.io/component: console-plugin-main-console-plugin
+    appstudio.openshift.io/application: openshift-pipelines-core-next
+    appstudio.openshift.io/component: console-plugin-next-console-plugin
     pipelines.appstudio.openshift.io/type: build
-  name: console-plugin-main-console-plugin-on-pull-request
-  namespace: tekton-ecosystem-tenant
+  name: console-plugin-next-console-plugin-on-pull-request
+  namespace: 
 spec:
   params:
   - name: git-url
@@ -28,7 +28,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/console-plugin-rhel9:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads//console-plugin-rhel9:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
@@ -42,7 +42,7 @@ spec:
   pipelineRef:
     name: docker-build-ta
   taskRunTemplate:
-    serviceAccountName: build-pipeline-console-plugin-main-console-plugin
+    serviceAccountName: build-pipeline-console-plugin-console-plugin-next
   workspaces:
   - name: git-auth
     secret:
diff --git a/.tekton/console-plugin-main-console-plugin-push.yaml b/.tekton/console-plugin-next-console-plugin-push.yaml
similarity index 80%
rename from .tekton/console-plugin-main-console-plugin-push.yaml
rename to .tekton/console-plugin-next-console-plugin-push.yaml
index d092b36..dd53d94 100644
--- a/.tekton/console-plugin-main-console-plugin-push.yaml
+++ b/.tekton/console-plugin-next-console-plugin-push.yaml
@@ -13,14 +13,14 @@ metadata:
       == "main" &&
       ("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
       ".konflux/dockerfiles/console-plugin.Dockerfile".pathChanged() ||
-      ".tekton/console-plugin-main-console-plugin-push.yaml".pathChanged())
+      ".tekton/console-plugin-next-console-plugin-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-core-main
-    appstudio.openshift.io/component: console-plugin-main-console-plugin
+    appstudio.openshift.io/application: openshift-pipelines-core-next
+    appstudio.openshift.io/component: console-plugin-next-console-plugin
     pipelines.appstudio.openshift.io/type: build
-  name: console-plugin-main-console-plugin-on-push
-  namespace: tekton-ecosystem-tenant
+  name: console-plugin-next-console-plugin-on-push
+  namespace: 
 spec:
   params:
   - name: git-url
@@ -28,7 +28,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/console-plugin-rhel9:{{revision}}
+    value: quay.io/redhat-user-workloads//console-plugin-rhel9:{{revision}}
   - name: dockerfile
     value: .konflux/dockerfiles/console-plugin.Dockerfile
   - name: prefetch-input
@@ -37,7 +37,7 @@ spec:
   pipelineRef:
     name: docker-build-ta
   taskRunTemplate:
-    serviceAccountName: build-pipeline-console-plugin-main-console-plugin
+    serviceAccountName: build-pipeline-console-plugin-console-plugin-next
   workspaces:
   - name: git-auth
     secret: