diff --git a/charts/clearml/templates/_helpers.tpl b/charts/clearml/templates/_helpers.tpl
index 0a05bc6..d0e4a9e 100644
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -194,7 +194,7 @@ MongoDB Comnnection string
 {{- end }}
 
 {{/*
-MongoDB hotname
+MongoDB hostname
 */}}
 {{- define "mongodb.hostname" -}}
 {{- if eq .Values.mongodb.architecture "standalone" }}
@@ -209,8 +209,12 @@ Redis Service name
 */}}
 {{- define "redis.servicename" -}}
 {{- if .Values.redis.enabled }}
+{{- if eq .Values.redis.architecture "standalone" }}
 {{- tpl .Values.redis.master.name . }}
 {{- else }}
+{{- printf "%s-headless" (tpl .Values.redis.master.name . ) }}
+{{- end }}
+{{- else }}
 {{- .Values.externalServices.redisHost }}
 {{- end }}
 {{- end }}