diff --git a/kubernetes/common/postgres/templates/statefulset.yaml b/kubernetes/common/postgres/templates/statefulset.yaml
index c3f8674..57bfdbf 100644
--- a/kubernetes/common/postgres/templates/statefulset.yaml
+++ b/kubernetes/common/postgres/templates/statefulset.yaml
@@ -37,8 +37,13 @@
         - /bin/sh
         - -c
         - |
-          for i in $(seq 0 $(({{ .Values.replicaCount }}-1))); do mkdir -p /podroot/data$i; done
-          chmod 777 /podroot/*
+          for i in $(seq 0 $(({{ .Values.replicaCount }}-1))); do
+            if [ ! -d /podroot/data$i ]; then
+              mkdir -p /podroot/data$i;
+              chown 26:26 /podroot/data$i;
+              chmod 700 /podroot/data$i;
+            fi;
+          done
         env:
         - name: POD_NAME
           valueFrom: { fieldRef: { fieldPath: metadata.name } }
diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index a570028..7552d24 100644
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -55,7 +55,7 @@
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 30
+  initialDelaySeconds: 300
   periodSeconds: 10
   timeoutSeconds: 5
   # necessary to disable liveness probe when setting breakpoints
@@ -63,13 +63,13 @@
   enabled: true
 
 readiness:
-  initialDelaySeconds: 5
+  initialDelaySeconds: 10
   periodSeconds: 10
 
 ## Persist data to a persitent volume
 persistence:
   enabled: true
- 
+
   ## A manually managed Persistent Volume and Claim
   ## Requires persistence.enabled: true
   ## If defined, PVC must be created manually before volume will be bound