diff --git a/elasticsearch/templates/secret.yaml b/elasticsearch/templates/secret.yaml
index cbdcbbaf1..8738ff2d5 100644
--- a/elasticsearch/templates/secret.yaml
+++ b/elasticsearch/templates/secret.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.secret.enabled -}}
-{{- $passwordValue := (randAlphaNum 16) | b64enc | quote }}
+{{- $secretName := print (include "elasticsearch.uname" .) "-credentials" | quote  -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -18,6 +18,9 @@ data:
   {{- if .Values.secret.password }}
   password: {{ .Values.secret.password | b64enc }}
   {{- else }}
+  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName) | default dict }}
+  {{- $secretData := (get $secretObj "data") | default dict }}
+  {{- $passwordValue := (get $secretData "password") | default (randAlphaNum 16 | b64enc) }}
   password: {{ $passwordValue }}
   {{- end }}
 {{- end }}