diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml
index 8413d8c4e..8f58c5f95 100644
--- a/bitnami/common/Chart.yaml
+++ b/bitnami/common/Chart.yaml
@@ -20,4 +20,4 @@ sources:
   - https://github.com/bitnami/charts
   - http://www.bitnami.com/
 type: library
-version: 1.3.5
+version: 1.3.6
diff --git a/bitnami/common/templates/_secrets.tpl b/bitnami/common/templates/_secrets.tpl
index 8144a242d..673d5d2f2 100644
--- a/bitnami/common/templates/_secrets.tpl
+++ b/bitnami/common/templates/_secrets.tpl
@@ -21,7 +21,9 @@ Params:
 
 {{- with .existingSecret -}}
 {{- if not (typeIs "string" .) -}}
-{{- $name = .name -}}
+{{- with .name -}}
+{{- $name = . -}}
+{{- end -}}
 {{- else -}}
 {{- $name = . -}}
 {{- end -}}