diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml
index f2d9a0d29b..2a0c6bbc09 100644
--- a/bitnami/keycloak/Chart.yaml
+++ b/bitnami/keycloak/Chart.yaml
@@ -26,4 +26,4 @@ name: keycloak
 sources:
   - https://github.com/bitnami/bitnami-docker-keycloak
   - https://github.com/keycloak/keycloak
-version: 5.1.4
+version: 5.1.5
\ No newline at end of file
diff --git a/bitnami/keycloak/templates/_helpers.tpl b/bitnami/keycloak/templates/_helpers.tpl
index 36c6f666f9..1bde1a1bcc 100644
--- a/bitnami/keycloak/templates/_helpers.tpl
+++ b/bitnami/keycloak/templates/_helpers.tpl
@@ -161,7 +161,11 @@ Return the Database encrypted password
         {{- printf "%s" (include "keycloak.postgresql.fullname" .) -}}
     {{- end -}}
 {{- else -}}
-    {{- printf "%s" (include "common.secrets.name" (dict "existingSecret" .Values.auth.existingSecret "context" $)) -}}
+    {{- if .Values.externalDatabase.existingSecret -}}
+        {{- printf "%s" (include "common.secrets.name" (dict "existingSecret" .Values.externalDatabase.existingSecret "context" $)) -}}
+    {{- else -}}
+        {{- printf "%s" (include "common.secrets.name" (dict "existingSecret" .Values.auth.existingSecret "context" $)) -}}
+    {{- end }}
 {{- end -}}
 {{- end -}}