diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index f2c05c7..9f19d86 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -36,7 +36,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.search.host -}}
 {{- .Values.search.host -}}
 {{- else -}}
-elasticsearch-master
+{{- .Release.Name -}}-elasticsearch-client
 {{- end -}}
 {{- end -}}