diff --git a/.tekton/release/bundle-update/pipeline.yaml b/.tekton/release/bundle-update/pipeline.yaml
index 324be5c1e..903a42ca9 100644
--- a/.tekton/release/bundle-update/pipeline.yaml
+++ b/.tekton/release/bundle-update/pipeline.yaml
@@ -81,7 +81,7 @@ spec:
               - name: KONFLUX_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-konflux-token
+                    name: konflux-bot-0-konflux-token
                     key: konflux-token
               - name: HOME
                 value: /workspace
@@ -114,7 +114,7 @@ spec:
               - name: KONFLUX_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-konflux-token
+                    name: konflux-bot-0-konflux-token
                     key: konflux-token
               - name: HOME
                 value: /workspace
@@ -138,7 +138,7 @@ spec:
               - name: GITHUB_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-github-token
+                    name: konflux-bot-0-github-token
                     key: github-token
             script: |
               cd repo
diff --git a/.tekton/release/bundle-update/pipelinerun.yaml b/.tekton/release/bundle-update/pipelinerun.yaml
index 56d2dd504..d57204b2c 100644
--- a/.tekton/release/bundle-update/pipelinerun.yaml
+++ b/.tekton/release/bundle-update/pipelinerun.yaml
@@ -8,7 +8,7 @@ metadata:
     These 3 parameters are passed by Konflux: snapshot, release and releasePlan. 
     Other parameters are set by the release plan.
 spec:
-  serviceAccountName: release-bot
+  serviceAccountName: konflux-bot-0
   pipelineRef:
     params:
       - name: url
diff --git a/.tekton/release/catalog-update/pipeline.yaml b/.tekton/release/catalog-update/pipeline.yaml
index e10bc6bcb..4ef0a6388 100644
--- a/.tekton/release/catalog-update/pipeline.yaml
+++ b/.tekton/release/catalog-update/pipeline.yaml
@@ -82,7 +82,7 @@ spec:
               - name: KONFLUX_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-konflux-token
+                    name: konflux-bot-0-konflux-token
                     key: konflux-token
               - name: HOME
                 value: /workspace
@@ -114,7 +114,7 @@ spec:
               - name: KONFLUX_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-konflux-token
+                    name: konflux-bot-0-konflux-token
                     key: konflux-token
               - name: HOME
                 value: /workspace
@@ -135,7 +135,7 @@ spec:
               - name: GITHUB_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-github-token
+                    name: konflux-bot-0-github-token
                     key: github-token
             script: |
               set -e
diff --git a/.tekton/release/catalog-update/pipelinerun.yaml b/.tekton/release/catalog-update/pipelinerun.yaml
index 341a37490..ef8cf03b6 100644
--- a/.tekton/release/catalog-update/pipelinerun.yaml
+++ b/.tekton/release/catalog-update/pipelinerun.yaml
@@ -8,7 +8,7 @@ metadata:
     These 3 parameters are passed by Konflux: snapshot, release and releasePlan Update the catalog with the released bundle. 
     Other parameters are set by the release plan.
 spec:
-  serviceAccountName: release-bot
+  serviceAccountName: konflux-bot-0
   pipelineRef:
     params:
       - name: url
diff --git a/.tekton/release/push-to-release/bundle-to-release-pipeline.yaml b/.tekton/release/push-to-release/bundle-to-release-pipeline.yaml
index c5bdaba15..a7c22a7a5 100644
--- a/.tekton/release/push-to-release/bundle-to-release-pipeline.yaml
+++ b/.tekton/release/push-to-release/bundle-to-release-pipeline.yaml
@@ -130,7 +130,7 @@ spec:
               - name: KONFLUX_TOKEN
                 valueFrom:
                   secretKeyRef:
-                    name: release-bot-konflux-token
+                    name: konflux-bot-0-konflux-token
                     key: konflux-token
             script: |
               set -e
diff --git a/.tekton/release/release-bot/role.yaml b/.tekton/release/release-bot/role.yaml
index 0ffb191a3..e1e93426f 100644
--- a/.tekton/release/release-bot/role.yaml
+++ b/.tekton/release/release-bot/role.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: release-bot
+  name: konflux-bot-0
   namespace: crt-nshift-lightspeed-tenant
 rules:
   - apiGroups:
diff --git a/.tekton/release/release-bot/rolebinding.yaml b/.tekton/release/release-bot/rolebinding.yaml
index 6cd26b78c..846dad1ca 100644
--- a/.tekton/release/release-bot/rolebinding.yaml
+++ b/.tekton/release/release-bot/rolebinding.yaml
@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: release-bot
+  name: konflux-bot-0
   namespace: crt-nshift-lightspeed-tenant
 subjects:
 - kind: ServiceAccount
-  name: release-bot
+  name: konflux-bot-0
   apiGroup: ""
 roleRef:
   kind: Role
-  name: release-bot
+  name: konflux-bot-0
   apiGroup: rbac.authorization.k8s.io
 
 
diff --git a/.tekton/release/release-bot/service-account.yaml b/.tekton/release/release-bot/service-account.yaml
index 2b072ff33..699f41e1f 100644
--- a/.tekton/release/release-bot/service-account.yaml
+++ b/.tekton/release/release-bot/service-account.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: release-bot
+  name: konflux-bot-0
   namespace: crt-nshift-lightspeed-tenant
diff --git a/.tekton/release/secrets/secret-github-token.yaml b/.tekton/release/secrets/secret-github-token.yaml
index 5cf04fc46..4899f2b7b 100644
--- a/.tekton/release/secrets/secret-github-token.yaml
+++ b/.tekton/release/secrets/secret-github-token.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: release-bot-github-token
+  name: konflux-bot-0-github-token
   namespace: crt-nshift-lightspeed-tenant
 type: Opaque
 stringData:
diff --git a/.tekton/release/secrets/secret-konflux-token.yaml b/.tekton/release/secrets/secret-konflux-token.yaml
index 1d8d6f842..5872c24a5 100644
--- a/.tekton/release/secrets/secret-konflux-token.yaml
+++ b/.tekton/release/secrets/secret-konflux-token.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: release-bot-konflux-token
+  name: konflux-bot-0-konflux-token
   namespace: crt-nshift-lightspeed-tenant
 type: Opaque
 stringData: