diff --git a/.github/workflows/auto-merge-upstream-main.yaml b/.github/workflows/auto-merge-upstream-main.yaml
deleted file mode 100644
index 2b78b695..00000000
--- a/.github/workflows/auto-merge-upstream-main.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-main by openshift-pipelines/hack. DO NOT EDIT
-name: auto-merge-upstream-main
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "*/30 * * * *" # At every 30 minutes
-
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-    - name: auto-merge-upstream-main
-      run: |
-        gh auth status
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
-        for p in $(gh pr list --search "head:actions/update/sources-main" --json "number" | jq ".[].number"); do
-          gh pr merge --rebase --delete-branch --auto $p
-        done
-      env:
-        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
-
diff --git a/.github/workflows/auto-merge-upstream-next.yaml b/.github/workflows/auto-merge-upstream-next.yaml
deleted file mode 100644
index 62b3d363..00000000
--- a/.github/workflows/auto-merge-upstream-next.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-next by openshift-pipelines/hack. DO NOT EDIT
-name: auto-merge-upstream-next
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "*/30 * * * *" # At every 30 minutes
-
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-    - name: auto-merge-upstream-next
-      run: |
-        gh auth status
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
-        for p in $(gh pr list --search "head:actions/update/sources-next" --json "number" | jq ".[].number"); do
-          gh pr merge --rebase --delete-branch --auto $p
-        done
-      env:
-        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
-
diff --git a/.github/workflows/auto-merge-upstream-release-v1.16.x.yaml b/.github/workflows/auto-merge-upstream-release-v1.16.x.yaml
deleted file mode 100644
index fe1f5743..00000000
--- a/.github/workflows/auto-merge-upstream-release-v1.16.x.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.16 by openshift-pipelines/hack. DO NOT EDIT
-name: auto-merge-upstream-release-v1.16.x
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "*/30 * * * *" # At every 30 minutes
-
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-    - name: auto-merge-upstream-release-v1.16.x
-      run: |
-        gh auth status
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
-        for p in $(gh pr list --search "head:actions/update/sources-release-v1.16.x" --json "number" | jq ".[].number"); do
-          gh pr merge --rebase --delete-branch --auto $p
-        done
-      env:
-        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
-
diff --git a/.github/workflows/auto-merge-upstream-release-v1.17.x.yaml b/.github/workflows/auto-merge-upstream-release-v1.17.x.yaml
deleted file mode 100644
index 80eb9979..00000000
--- a/.github/workflows/auto-merge-upstream-release-v1.17.x.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.17 by openshift-pipelines/hack. DO NOT EDIT
-name: auto-merge-upstream-release-v1.17.x
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "*/30 * * * *" # At every 30 minutes
-
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-    - name: auto-merge-upstream-release-v1.17.x
-      run: |
-        gh auth status
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
-        for p in $(gh pr list --search "head:actions/update/sources-release-v1.17.x" --json "number" | jq ".[].number"); do
-          gh pr merge --rebase --delete-branch --auto $p
-        done
-      env:
-        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
-
diff --git a/.github/workflows/auto-merge-upstream-release-v1.20.x.yaml b/.github/workflows/auto-merge-upstream-release-v1.20.x.yaml
deleted file mode 100644
index 4ee35218..00000000
--- a/.github/workflows/auto-merge-upstream-release-v1.20.x.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.20 by openshift-pipelines/hack. DO NOT EDIT
-name: auto-merge-upstream-release-v1.20.x
-
-on:
-  workflow_dispatch: {}
-  #schedule:
-   # - cron: "*/30 * * * *" # At every 30 minutes
-
-jobs:
-  auto-approve:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-    - name: auto-merge-upstream-release-v1.20.x
-      run: |
-        gh auth status
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
-        for p in $(gh pr list --search "head:actions/update/sources-release-v1.20.x" --json "number" | jq ".[].number"); do
-          gh pr merge --rebase --delete-branch --auto $p
-        done
-      env:
-        GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}
-
diff --git a/.github/workflows/update-sources-main.yaml b/.github/workflows/update-sources-main.yaml
deleted file mode 100644
index df47e36f..00000000
--- a/.github/workflows/update-sources-main.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-main by openshift-pipelines/hack. DO NOT EDIT
-name: update-sources-main
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "0 1 * * *" # At 1AM everyday
-
-jobs:
-
-  update-sources:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-      with:
-        ref: main
-
-    - name: Clone tektoncd-catalog/git-clone
-      run: |
-        rm -fR upstream
-        git clone https://github.com/tektoncd-catalog/git-clone upstream
-        pushd upstream
-        git checkout -B main origin/main
-        popd
-
-
-    - name: Commit new changes
-      run: |
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        git checkout -b actions/update/sources-main
-        touch head
-        pushd upstream
-        OLD_COMMIT=$(cat ../head)
-        NEW_COMMIT=$(git rev-parse HEAD)
-        echo Previous commit: ${OLD_COMMIT}
-        git show --stat ${OLD_COMMIT}
-        echo New commit: ${NEW_COMMIT}
-        git show --stat ${NEW_COMMIT}
-        git diff --stat ${NEW_COMMIT}..${OLD_COMMIT} > /tmp/diff.txt
-        git rev-parse HEAD > ../head
-        popd
-        rm -rf upstream/.git
-        git add -f upstream head .konflux
-
-        if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
-          echo "No change, exiting"
-          exit 0
-        fi
-
-        git commit -F- <<EOF
-        [bot] Update main from tektoncd-catalog/git-clone to ${NEW_COMMIT}
-
-            $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)
-        
-        https://github.com/tektoncd-catalog/git-clone/compare/${NEW_COMMIT}..${OLD_COMMIT}
-        EOF
-        
-        git push -f origin actions/update/sources-main
-
-        if [ "$(gh pr list --base main --head actions/update/sources-main --json url --jq 'length')" = "0" ]; then
-          echo "creating PR..."
-          gh pr create -B main -H actions/update/sources-main --label=automated --label=upstream --fill
-        else
-          echo "a PR already exists, editing..."
-          gh pr edit --title "[bot] Update main from tektoncd-catalog/git-clone to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-sources-next.yaml b/.github/workflows/update-sources-next.yaml
deleted file mode 100644
index f1b6304f..00000000
--- a/.github/workflows/update-sources-next.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-next by openshift-pipelines/hack. DO NOT EDIT
-name: update-sources-next
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "0 1 * * *" # At 1AM everyday
-
-jobs:
-
-  update-sources:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-      with:
-        ref: next
-
-    - name: Clone tektoncd-catalog/git-clone
-      run: |
-        rm -fR upstream
-        git clone https://github.com/tektoncd-catalog/git-clone upstream
-        pushd upstream
-        git checkout -B release-v1.1.x origin/release-v1.1.x
-        popd
-    - name: Commit new changes
-      run: |
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        git checkout -b actions/update/sources-next
-        touch head
-        pushd upstream
-        OLD_COMMIT=$(cat ../head)
-        NEW_COMMIT=$(git rev-parse HEAD)
-        echo Previous commit: ${OLD_COMMIT}
-        git show --stat ${OLD_COMMIT}
-        echo New commit: ${NEW_COMMIT}
-        git show --stat ${NEW_COMMIT}
-        git diff --stat ${NEW_COMMIT}..${OLD_COMMIT} > /tmp/diff.txt
-        git rev-parse HEAD > ../head
-        popd
-        rm -rf upstream/.git
-        git add -f upstream head .konflux
-
-        if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
-          echo "No change, exiting"
-          exit 0
-        fi
-
-        git commit -F- <<EOF
-        [bot] Update next from tektoncd-catalog/git-clone to ${NEW_COMMIT}
-
-            $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)
-        
-        https://github.com/tektoncd-catalog/git-clone/compare/${NEW_COMMIT}..${OLD_COMMIT}
-        EOF
-        
-        git push -f origin actions/update/sources-next
-
-        if [ "$(gh pr list --base next --head actions/update/sources-next --json url --jq 'length')" = "0" ]; then
-          echo "creating PR..."
-          gh pr create -B next -H actions/update/sources-next --label=automated --label=upstream --fill
-        else
-          echo "a PR already exists, editing..."
-          gh pr edit --title "[bot] Update next from tektoncd-catalog/git-clone to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-sources-release-v1.16.x.yaml b/.github/workflows/update-sources-release-v1.16.x.yaml
deleted file mode 100644
index cb982e31..00000000
--- a/.github/workflows/update-sources-release-v1.16.x.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.16 by openshift-pipelines/hack. DO NOT EDIT
-name: update-sources-release-v1.16.x
-
-on:
-  workflow_dispatch: {}
-  # schedule:
-  # - cron: "0 1 * * *" # At 1AM everyday
-
-jobs:
-
-  update-sources:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-      with:
-        ref: release-v1.16.x
-
-    - name: Clone tektoncd-catalog/git-clone
-      run: |
-        rm -fR upstream
-        git clone https://github.com/tektoncd-catalog/git-clone upstream
-        pushd upstream
-        git checkout -B release-v1.0.x origin/release-v1.0.x
-        popd
-    - name: Commit new changes
-      run: |
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        git checkout -b actions/update/sources-release-v1.16.x
-        touch head
-        pushd upstream
-        OLD_COMMIT=$(cat ../head)
-        NEW_COMMIT=$(git rev-parse HEAD)
-        echo Previous commit: ${OLD_COMMIT}
-        git show --stat ${OLD_COMMIT}
-        echo New commit: ${NEW_COMMIT}
-        git show --stat ${NEW_COMMIT}
-        git diff --stat ${NEW_COMMIT}..${OLD_COMMIT} > /tmp/diff.txt
-        git rev-parse HEAD > ../head
-        popd
-        rm -rf upstream/.git
-        git add -f upstream head .konflux
-
-        if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
-          echo "No change, exiting"
-          exit 0
-        fi
-
-        git commit -F- <<EOF
-        [bot] Update release-v1.16.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}
-
-            $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)
-        
-        https://github.com/tektoncd-catalog/git-clone/compare/${NEW_COMMIT}..${OLD_COMMIT}
-        EOF
-        
-        git push -f origin actions/update/sources-release-v1.16.x
-
-        if [ "$(gh pr list --base release-v1.16.x --head actions/update/sources-release-v1.16.x --json url --jq 'length')" = "0" ]; then
-          echo "creating PR..."
-          gh pr create -B release-v1.16.x -H actions/update/sources-release-v1.16.x --label=automated --label=upstream --fill
-        else
-          echo "a PR already exists, editing..."
-          gh pr edit --title "[bot] Update release-v1.16.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-sources-release-v1.17.x.yaml b/.github/workflows/update-sources-release-v1.17.x.yaml
deleted file mode 100644
index f58242d2..00000000
--- a/.github/workflows/update-sources-release-v1.17.x.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.17 by openshift-pipelines/hack. DO NOT EDIT
-name: update-sources-release-v1.17.x
-
-on:
-  workflow_dispatch: {}
-  # schedule:
-  # - cron: "0 1 * * *" # At 1AM everyday
-
-jobs:
-
-  update-sources:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-      with:
-        ref: release-v1.17.x
-
-    - name: Clone tektoncd-catalog/git-clone
-      run: |
-        rm -fR upstream
-        git clone https://github.com/tektoncd-catalog/git-clone upstream
-        pushd upstream
-        git checkout -B release-v1.0.x origin/release-v1.0.x
-        popd
-    - name: Commit new changes
-      run: |
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        git checkout -b actions/update/sources-release-v1.17.x
-        touch head
-        pushd upstream
-        OLD_COMMIT=$(cat ../head)
-        NEW_COMMIT=$(git rev-parse HEAD)
-        echo Previous commit: ${OLD_COMMIT}
-        git show --stat ${OLD_COMMIT}
-        echo New commit: ${NEW_COMMIT}
-        git show --stat ${NEW_COMMIT}
-        git diff --stat ${NEW_COMMIT}..${OLD_COMMIT} > /tmp/diff.txt
-        git rev-parse HEAD > ../head
-        popd
-        rm -rf upstream/.git
-        git add -f upstream head .konflux
-
-        if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
-          echo "No change, exiting"
-          exit 0
-        fi
-
-        git commit -F- <<EOF
-        [bot] Update release-v1.17.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}
-
-            $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)
-        
-        https://github.com/tektoncd-catalog/git-clone/compare/${NEW_COMMIT}..${OLD_COMMIT}
-        EOF
-        
-        git push -f origin actions/update/sources-release-v1.17.x
-
-        if [ "$(gh pr list --base release-v1.17.x --head actions/update/sources-release-v1.17.x --json url --jq 'length')" = "0" ]; then
-          echo "creating PR..."
-          gh pr create -B release-v1.17.x -H actions/update/sources-release-v1.17.x --label=automated --label=upstream --fill
-        else
-          echo "a PR already exists, editing..."
-          gh pr edit --title "[bot] Update release-v1.17.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-sources-release-v1.20.x.yaml b/.github/workflows/update-sources-release-v1.20.x.yaml
deleted file mode 100644
index 5c363ea9..00000000
--- a/.github/workflows/update-sources-release-v1.20.x.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated for Konflux Application openshift-pipelines-core-1.20 by openshift-pipelines/hack. DO NOT EDIT
-name: update-sources-release-v1.20.x
-
-on:
-  workflow_dispatch: {}
-  schedule:
-  - cron: "0 1 * * *" # At 1AM everyday
-
-jobs:
-
-  update-sources:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'openshift-pipelines' # do not run this elsewhere
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-    - name: Checkout the current repo
-      uses: actions/checkout@v4
-      with:
-        ref: release-v1.20.x
-
-    - name: Clone tektoncd-catalog/git-clone
-      run: |
-        rm -fR upstream
-        git clone https://github.com/tektoncd-catalog/git-clone upstream
-        pushd upstream
-        git checkout -B release-v1.1.x origin/release-v1.1.x
-        popd
-    - name: Commit new changes
-      run: |
-        git config user.name openshift-pipelines-bot
-        git config user.email pipelines-extcomm@redhat.com
-        git checkout -b actions/update/sources-release-v1.20.x
-        touch head
-        pushd upstream
-        OLD_COMMIT=$(cat ../head)
-        NEW_COMMIT=$(git rev-parse HEAD)
-        echo Previous commit: ${OLD_COMMIT}
-        git show --stat ${OLD_COMMIT}
-        echo New commit: ${NEW_COMMIT}
-        git show --stat ${NEW_COMMIT}
-        git diff --stat ${NEW_COMMIT}..${OLD_COMMIT} > /tmp/diff.txt
-        git rev-parse HEAD > ../head
-        popd
-        rm -rf upstream/.git
-        git add -f upstream head .konflux
-
-        if [[ -z $(git status --porcelain --untracked-files=no) ]]; then
-          echo "No change, exiting"
-          exit 0
-        fi
-
-        git commit -F- <<EOF
-        [bot] Update release-v1.20.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}
-
-            $ git diff --stat ${NEW_COMMIT}..${OLD_COMMIT}
-        $(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)
-        
-        https://github.com/tektoncd-catalog/git-clone/compare/${NEW_COMMIT}..${OLD_COMMIT}
-        EOF
-        
-        git push -f origin actions/update/sources-release-v1.20.x
-
-        if [ "$(gh pr list --base release-v1.20.x --head actions/update/sources-release-v1.20.x --json url --jq 'length')" = "0" ]; then
-          echo "creating PR..."
-          gh pr create -B release-v1.20.x -H actions/update/sources-release-v1.20.x --label=automated --label=upstream --fill
-        else
-          echo "a PR already exists, editing..."
-          gh pr edit --title "[bot] Update release-v1.20.x from tektoncd-catalog/git-clone to ${NEW_COMMIT}" --body "$(cat /tmp/diff.txt | sed 's/^/    /' | head -c 55555)"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.tekton/tektoncd-git-clone-main-git-init-pull-request.yaml b/.tekton/tektoncd-git-clone-next-git-init-pull-request.yaml
similarity index 77%
rename from .tekton/tektoncd-git-clone-main-git-init-pull-request.yaml
rename to .tekton/tektoncd-git-clone-next-git-init-pull-request.yaml
index f23d23cf..2d2c288f 100644
--- a/.tekton/tektoncd-git-clone-main-git-init-pull-request.yaml
+++ b/.tekton/tektoncd-git-clone-next-git-init-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/tektoncd-git-clone.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/git-init.Dockerfile".pathChanged() ||
-      ".tekton/tektoncd-git-clone-main-git-init-pull-request.yaml".pathChanged())
+      ".tekton/tektoncd-git-clone-next-git-init-pull-request.yaml".pathChanged())
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-core-main
-    appstudio.openshift.io/component: tektoncd-git-clone-main-git-init
+    appstudio.openshift.io/application: openshift-pipelines-core-next
+    appstudio.openshift.io/component: tektoncd-git-clone-next-git-init
     pipelines.appstudio.openshift.io/type: build
-  name: tektoncd-git-clone-main-git-init-on-pull-request
-  namespace: tekton-ecosystem-tenant
+  name: tektoncd-git-clone-next-git-init-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/git-init-rhel9:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads//git-init-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-tektoncd-git-clone-main-git-init
+    serviceAccountName: build-pipeline-tektoncd-git-clone-git-init-next
   workspaces:
   - name: git-auth
     secret:
diff --git a/.tekton/tektoncd-git-clone-main-git-init-push.yaml b/.tekton/tektoncd-git-clone-next-git-init-push.yaml
similarity index 80%
rename from .tekton/tektoncd-git-clone-main-git-init-push.yaml
rename to .tekton/tektoncd-git-clone-next-git-init-push.yaml
index 964bab06..3cefb533 100644
--- a/.tekton/tektoncd-git-clone-main-git-init-push.yaml
+++ b/.tekton/tektoncd-git-clone-next-git-init-push.yaml
@@ -13,14 +13,14 @@ metadata:
       == "main" &&
       ("upstream/***".pathChanged() || ".konflux/patches/***".pathChanged() || ".konflux/rpms/***".pathChanged() ||
       ".konflux/dockerfiles/git-init.Dockerfile".pathChanged() ||
-      ".tekton/tektoncd-git-clone-main-git-init-push.yaml".pathChanged())
+      ".tekton/tektoncd-git-clone-next-git-init-push.yaml".pathChanged())
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: openshift-pipelines-core-main
-    appstudio.openshift.io/component: tektoncd-git-clone-main-git-init
+    appstudio.openshift.io/application: openshift-pipelines-core-next
+    appstudio.openshift.io/component: tektoncd-git-clone-next-git-init
     pipelines.appstudio.openshift.io/type: build
-  name: tektoncd-git-clone-main-git-init-on-push
-  namespace: tekton-ecosystem-tenant
+  name: tektoncd-git-clone-next-git-init-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/git-init-rhel9:{{revision}}
+    value: quay.io/redhat-user-workloads//git-init-rhel9:{{revision}}
   - name: dockerfile
     value: .konflux/dockerfiles/git-init.Dockerfile
   - name: prefetch-input
@@ -37,7 +37,7 @@ spec:
   pipelineRef:
     name: docker-build-ta
   taskRunTemplate:
-    serviceAccountName: build-pipeline-tektoncd-git-clone-main-git-init
+    serviceAccountName: build-pipeline-tektoncd-git-clone-git-init-next
   workspaces:
   - name: git-auth
     secret: