diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index 985fe8c..1cfcc82 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - name: guerzon
     email: guerzon@proton.me
     url: https://github.com/guerzon
-version: 0.24.0
+version: 0.24.1
 kubeVersion: ">=1.12.0-0"
diff --git a/charts/vaultwarden/templates/_podSpec.tpl b/charts/vaultwarden/templates/_podSpec.tpl
index 5cd8eab..b1da394 100644
--- a/charts/vaultwarden/templates/_podSpec.tpl
+++ b/charts/vaultwarden/templates/_podSpec.tpl
@@ -69,12 +69,12 @@ containers:
         value: "true"
       {{- end }}
       {{- if and ( eq .Values.database.type "postgresql") (not .Values.database.existingSecretKey)}}
-      - name: PGHOST
-        value: {{ .Values.database.host }}
+      - name: DATABASE_URL
+        value: "postgresql://{{ .Values.database.host }}"
       - name: PGPORT
-        value: {{ .Values.database.port }}
+        value: {{ .Values.database.port | quote }}
       - name: PGDATABASE
-        value: {{ .Values.database.dbName }}
+        value: {{ .Values.database.dbName | quote }}
       - name: PGUSER
         valueFrom:
           secretKeyRef: