diff --git a/konflux-configs/README.md b/konflux-configs/README.md
index 98da75e5..3b61f3b4 100644
--- a/konflux-configs/README.md
+++ b/konflux-configs/README.md
@@ -86,7 +86,7 @@ oc get applications -n $NAMESPACE
 oc get components -n $NAMESPACE
 
 # Check service accounts
-oc get sa -n $NAMESPACE konflux-configuration-as-code-deployer
+oc get sa -n $NAMESPACE konflux-bot-1
 ```
 
 ### Step 4: Upgrade to Custom Build Pipeline
@@ -223,8 +223,8 @@ environment-specific overlays (dev/prod).
 - **Trigger**: ReleasePlan with `auto-release: true` in
   `base/release-plan/konflux-manifests/base/releaseplan.yaml`
 - **Pipeline**: `pipelines/konflux/deploy-config.yaml`
-- **Service Account**: `konflux-configuration-as-code-deployer`
-  (defined in `base/release-plan/konflux-manifests/base/rbac.yaml`)
+- **Service Account**: `konflux-bot-1`
+  (defined in `base/release-plan/konflux-manifests/base/konflux-bot-1.yaml`)
 - **Process**:
   - Task `extract-and-apply-manifests` extracts `/manifests.yaml`
     from built image
@@ -252,8 +252,7 @@ konflux-configs/
 │   ├── release-plan/           # Release automation
 │   │   └── konflux-manifests/  # CAC deployment release plan
 │   └── service-account/        # RBAC for automation
-│       ├── promote-to-candidate-sa.yaml
-│       └── release-sa.yaml
+│       └── konflux-bot-0.yaml
 ├── overlay/                    # Environment-specific configs
 │   ├── dev/                    # Development environment
 │   │   └── kustomization.yaml  # namespace: rhtas-dev-tenant
diff --git a/konflux-configs/base/application/base/promote-to-candidate/releaseplan.yaml b/konflux-configs/base/application/base/promote-to-candidate/releaseplan.yaml
index 5e7babf8..9f088809 100644
--- a/konflux-configs/base/application/base/promote-to-candidate/releaseplan.yaml
+++ b/konflux-configs/base/application/base/promote-to-candidate/releaseplan.yaml
@@ -14,7 +14,7 @@ spec:
       value: "false"
     - name: type
       value: "component"
-    serviceAccountName: rhtas-build-bot
+    serviceAccountName: konflux-bot-0
     pipelineRef:
       resolver: git
       params:
diff --git a/konflux-configs/base/project/base/release-plan/patch/component.yaml b/konflux-configs/base/project/base/release-plan/patch/component.yaml
index c05e4af9..22bcdeb9 100644
--- a/konflux-configs/base/project/base/release-plan/patch/component.yaml
+++ b/konflux-configs/base/project/base/release-plan/patch/component.yaml
@@ -20,7 +20,7 @@
           value: "false"
         - name: type
           value: "component"
-        serviceAccountName: rhtas-build-bot
+        serviceAccountName: konflux-bot-0
         pipelineRef:
           resolver: git
           params:
diff --git a/konflux-configs/base/project/base/release-plan/patch/fbc.yaml b/konflux-configs/base/project/base/release-plan/patch/fbc.yaml
index 60030ac1..c2777eb5 100644
--- a/konflux-configs/base/project/base/release-plan/patch/fbc.yaml
+++ b/konflux-configs/base/project/base/release-plan/patch/fbc.yaml
@@ -20,7 +20,7 @@
           value: "fbc"
         - name: file-name
           value: "{{.operator}}-fbc.json"
-        serviceAccountName: rhtas-build-bot
+        serviceAccountName: konflux-bot-0
         pipelineRef:
           resolver: git
           params:
diff --git a/konflux-configs/base/project/base/release-plan/patch/operator.yaml b/konflux-configs/base/project/base/release-plan/patch/operator.yaml
index dfddd0df..48cb3a60 100644
--- a/konflux-configs/base/project/base/release-plan/patch/operator.yaml
+++ b/konflux-configs/base/project/base/release-plan/patch/operator.yaml
@@ -20,7 +20,7 @@
           value: "false"
         - name: type
           value: "operator"
-        serviceAccountName: rhtas-build-bot
+        serviceAccountName: konflux-bot-0
         pipelineRef:
           resolver: git
           params:
diff --git a/konflux-configs/base/release-plan/konflux-manifests/base/rbac.yaml b/konflux-configs/base/release-plan/konflux-manifests/base/konflux-bot-1.yaml
similarity index 80%
rename from konflux-configs/base/release-plan/konflux-manifests/base/rbac.yaml
rename to konflux-configs/base/release-plan/konflux-manifests/base/konflux-bot-1.yaml
index 58ed7727..bdf82cc9 100644
--- a/konflux-configs/base/release-plan/konflux-manifests/base/rbac.yaml
+++ b/konflux-configs/base/release-plan/konflux-manifests/base/konflux-bot-1.yaml
@@ -2,12 +2,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: konflux-configuration-as-code-deployer
+  name: konflux-bot-1
+  labels:
+    rhtas.redhat.com/sa-group: konflux-configuration-as-code-deployer
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: konflux-configuration-as-code-role
+  name: konflux-bot-1-role
 rules:
   - apiGroups: ["appstudio.redhat.com"]
     resources: ["applications", "components", "integrationtestscenarios", "releaseplans", "snapshots", "imagerepositories"]
@@ -25,12 +27,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: konflux-configuration-as-code-deployer-rolebinding
+  name: konflux-bot-1-rolebinding
 subjects:
   - kind: ServiceAccount
-    name: konflux-configuration-as-code-deployer
+    name: konflux-bot-1
 roleRef:
   kind: Role
-  name: konflux-configuration-as-code-role
+  name: konflux-bot-1-role
   apiGroup: rbac.authorization.k8s.io
 ---
diff --git a/konflux-configs/base/release-plan/konflux-manifests/base/kustomization.yaml b/konflux-configs/base/release-plan/konflux-manifests/base/kustomization.yaml
index 46063749..ca01f752 100644
--- a/konflux-configs/base/release-plan/konflux-manifests/base/kustomization.yaml
+++ b/konflux-configs/base/release-plan/konflux-manifests/base/kustomization.yaml
@@ -1,3 +1,3 @@
 resources:
   - releaseplan.yaml
-  - rbac.yaml
+  - konflux-bot-1.yaml
diff --git a/konflux-configs/base/release-plan/konflux-manifests/base/releaseplan.yaml b/konflux-configs/base/release-plan/konflux-manifests/base/releaseplan.yaml
index fa282a67..270de9d6 100644
--- a/konflux-configs/base/release-plan/konflux-manifests/base/releaseplan.yaml
+++ b/konflux-configs/base/release-plan/konflux-manifests/base/releaseplan.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   application: konflux
   tenantPipeline:
-    serviceAccountName: konflux-configuration-as-code-deployer
+    serviceAccountName: konflux-bot-1
     pipelineRef:
       resolver: git
       params:
diff --git a/konflux-configs/base/service-account/promote-to-candidate-sa.yaml b/konflux-configs/base/service-account/konflux-bot-0.yaml
similarity index 72%
rename from konflux-configs/base/service-account/promote-to-candidate-sa.yaml
rename to konflux-configs/base/service-account/konflux-bot-0.yaml
index 8167ba0b..1cab7064 100644
--- a/konflux-configs/base/service-account/promote-to-candidate-sa.yaml
+++ b/konflux-configs/base/service-account/konflux-bot-0.yaml
@@ -2,13 +2,17 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: rhtas-build-bot
+  name: konflux-bot-0
   namespace: rhtas-tenant
+  labels:
+    rhtas.redhat.com/sa-group: build-ci-release
+imagePullSecrets:
+  - name: registry-redhat-io-pull-secret
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: rhtas-build-bot-role
+  name: konflux-bot-0-role
   namespace: rhtas-tenant
 rules:
   - apiGroups: ["appstudio.redhat.com"]
@@ -21,14 +25,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: rhtas-build-bot-rolebinding
+  name: konflux-bot-0-rolebinding
   namespace: rhtas-tenant
 subjects:
   - kind: ServiceAccount
-    name: rhtas-build-bot
+    name: konflux-bot-0
     namespace: rhtas-tenant
 roleRef:
   kind: Role
-  name: rhtas-build-bot-role
+  name: konflux-bot-0-role
   apiGroup: rbac.authorization.k8s.io
 ---
diff --git a/konflux-configs/base/service-account/kustomization.yaml b/konflux-configs/base/service-account/kustomization.yaml
index e5507ecf..72897b1a 100644
--- a/konflux-configs/base/service-account/kustomization.yaml
+++ b/konflux-configs/base/service-account/kustomization.yaml
@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - promote-to-candidate-sa.yaml
-  - release-sa.yaml
+  - konflux-bot-0.yaml
diff --git a/konflux-configs/base/service-account/release-sa.yaml b/konflux-configs/base/service-account/release-sa.yaml
deleted file mode 100644
index 22392c36..00000000
--- a/konflux-configs/base/service-account/release-sa.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: rhtas-release
-  namespace: rhtas-tenant
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: rhtas-release-role
-  namespace: rhtas-tenant
-rules:
-  - apiGroups: ["appstudio.redhat.com"]
-    resources: ["releaseplans", "releases"]
-    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: rhtas-release-rolebinding
-  namespace: rhtas-tenant
-subjects:
-  - kind: ServiceAccount
-    name: rhtas-release
-    namespace: rhtas-tenant
-roleRef:
-  kind: Role
-  name: rhtas-release-role
-  apiGroup: rbac.authorization.k8s.io