diff --git a/helm/kagent/templates/rbac/clusterrolebinding.yaml b/helm/kagent/templates/rbac/clusterrolebinding.yaml
index 4da6c9756..6a118eb6a 100644
--- a/helm/kagent/templates/rbac/clusterrolebinding.yaml
+++ b/helm/kagent/templates/rbac/clusterrolebinding.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "kagent.fullname" . }}-getter-rolebinding
+  name: {{ include "kagent.fullname" . }}-controller-getter-rolebinding
   labels:
     {{- include "kagent.labels" . | nindent 4 }}
 roleRef:
@@ -16,7 +16,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "kagent.fullname" . }}-writer-rolebinding
+  name: {{ include "kagent.fullname" . }}-controller-writer-rolebinding
   labels:
     {{- include "kagent.labels" . | nindent 4 }}
 roleRef:
diff --git a/helm/kagent/values.yaml b/helm/kagent/values.yaml
index 5f5d18878..0dc13eadd 100644
--- a/helm/kagent/values.yaml
+++ b/helm/kagent/values.yaml
@@ -213,7 +213,7 @@ kmcp:
 # ==============================================================================
 
 kagent-tools:
-  fullnameOverride: kagent-tools
+  fullnameOverride: "" # Override if desired
   enabled: true
   replicaCount: 1
   resources: