diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml
index 55bc74fb9a5e5f29571fc61e616d5c101c2858f5..a226f5442593ce0b61ad9f73bfd7243c5ec52c63 100644
--- a/postgresql/templates/statefulset.yaml
+++ b/postgresql/templates/statefulset.yaml
@@ -29,10 +29,11 @@ spec:
         {{ if .Values.tls.enabled -}}
         - name: certs
           secret:
+            defaultMode: 0600
             secretName: {{ .Values.tls.certificatesSecret }}
         {{- end }}
         - configMap:
-            defaultMode: 420
+            defaultMode: 0600
             name: {{ include "postgresql-helm.fullname" . }}
           name: config
         - name: data
@@ -79,7 +80,7 @@ spec:
           volumeMounts:
             - mountPath: "/var/lib/postgresql/data"
               name: data
-              subPath: "{{ .Chart.AppVersion }}"
+              subPath: "{{ .Chart.AppVersion }}/data"
             - mountPath: "/configs"
               name: config
             - mountPath: "/dev/shm"