diff --git a/charts/coroot/Chart.yaml b/charts/coroot/Chart.yaml
index 6e7f9c7..318db84 100644
--- a/charts/coroot/Chart.yaml
+++ b/charts/coroot/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: coroot
 description: A monitoring and troubleshooting tool for microservice architectures.
 type: application
-version: 0.8.4
+version: 0.8.5
 appVersion: "0.29.0"
 dependencies:
   - name: prometheus
diff --git a/charts/coroot/templates/_helpers.tpl b/charts/coroot/templates/_helpers.tpl
index 246aa57..fe3ca53 100644
--- a/charts/coroot/templates/_helpers.tpl
+++ b/charts/coroot/templates/_helpers.tpl
@@ -85,8 +85,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Coroot Cluster Agent
 */}}
 {{- define "corootClusterAgent.name" -}}
+{{- if .Values.corootClusterAgent.fullnameOverride -}}
+{{- .Values.corootClusterAgent.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-cluster-agent" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
 {{- define "corootClusterAgent.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "corootClusterAgent.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/coroot/values.yaml b/charts/coroot/values.yaml
index c4cc87c..d008e8e 100644
--- a/charts/coroot/values.yaml
+++ b/charts/coroot/values.yaml
@@ -102,6 +102,7 @@ corootConnect:
 
 corootClusterAgent:
   enabled: true
+  fullnameOverride: ""
   config:
     listen: :8080
     clickhouse: