diff --git a/README.md b/README.md
index 8451be0..7732d7d 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,12 @@ To upgrade the helm chart, use the `helm upgrade ...` command:
 $ helm upgrade terminfinder-demo terminfinder-chart -n terminfinder-demo
 ```
 
+### Debug Container
+
+```bash
+$ kubectl run -i --tty --rm debug --image=busybox -n terminfinder-demo --restart=Never
+```
+
 ### Delete Release
 
 To delete the helm chart (release), use the `helm uninstall...` command.
@@ -65,12 +71,8 @@ To delete the helm chart (release), use the `helm uninstall...` command.
 Note that the persistent volume may be available even if the helm release is uninstalled.
 
 ```bash
-# Delete release
+# Delete namespace
 $ helm uninstall terminfinder-demo -n terminfinder-demo
-```
-
-```bash
-# Delete PVCs and namespace
 $ kubectl delete pvc --all -n terminfinder-demo
 $ kubectl delete namespace terminfinder-demo
 ```
diff --git a/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
index dd84d1e..ab9993e 100644
--- a/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
+++ b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s-postgresql" (include "common.names.namespace" .)) }}
+                  name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s" $svc) }}
                   key: {{ .Values.global.postgresql.auth.secretKeys.userPasswordKey | default "password" }}
             # Patches
             - name: Terminfinder__UseHttps
diff --git a/terminfinder-chart/charts/terminfinder-backend/values.yaml b/terminfinder-chart/charts/terminfinder-backend/values.yaml
index 7ba12ab..054945d 100644
--- a/terminfinder-chart/charts/terminfinder-backend/values.yaml
+++ b/terminfinder-chart/charts/terminfinder-backend/values.yaml
@@ -9,7 +9,7 @@ global:
       database: terminfinder
       existingSecret: "" # if not set, default: "{{ Release.Name }}-postgres"
       secretKeys:
-        userPasswordKey: "password"
+        userPasswordKey: "" # if not set, default: "password"
     service:
       name: "" # if not set, default: "{{ Release.Name }}-postgres"
       ports: