diff --git a/helm/porthole/templates/minio.yaml.tpl b/helm/porthole/templates/minio.yaml.tpl
index de75829..c4fd8d1 100644
--- a/helm/porthole/templates/minio.yaml.tpl
+++ b/helm/porthole/templates/minio.yaml.tpl
@@ -45,28 +45,18 @@ spec:
       affinity:
 {{ $aff | indent 8 }}
 {{- end }}
- {{- $tols := include "tline.tolerations" (dict "Values" .Values "schedulingClass" .Values.minio.schedulingClass) }}
- {{- if $tols }}
-       tolerations:
- {{ $tols | indent 8 }}
- {{- end }}
-       initContainers:
-         - name: cleanup-lost-found
-           image: busybox:1.36
-           command:
-             - sh
-             - -c
-             - rm -rf /data/lost+found || true
-           volumeMounts:
-             - name: data
-               mountPath: /data
-       containers:
+{{- $tols := include "tline.tolerations" (dict "Values" .Values "schedulingClass" .Values.minio.schedulingClass) }}
+{{- if $tols }}
+      tolerations:
+{{ $tols | indent 8 }}
+{{- end }}
+      containers:
         - name: minio
           image: {{ printf "%s:%s" .Values.images.minio.repository .Values.images.minio.tag | quote }}
           imagePullPolicy: {{ .Values.images.minio.pullPolicy }}
           args:
             - server
-            - /data
+            - /data/miniodata
             - "--console-address=:{{ .Values.minio.service.consolePort }}"
           ports:
             - name: s3
@@ -101,6 +91,7 @@ spec:
           volumeMounts:
             - name: data
               mountPath: /data
+              subPath: miniodata
   volumeClaimTemplates:
     - metadata:
         name: data
diff --git a/helm/porthole/templates/postgres.yaml.tpl b/helm/porthole/templates/postgres.yaml.tpl
index c3160f1..327f752 100644
--- a/helm/porthole/templates/postgres.yaml.tpl
+++ b/helm/porthole/templates/postgres.yaml.tpl
@@ -41,22 +41,12 @@ spec:
       affinity:
 {{ $aff | indent 8 }}
 {{- end }}
- {{- $tols := include "tline.tolerations" (dict "Values" .Values "schedulingClass" .Values.postgres.schedulingClass) }}
- {{- if $tols }}
-       tolerations:
- {{ $tols | indent 8 }}
- {{- end }}
-       initContainers:
-         - name: cleanup-lost-found
-           image: busybox:1.36
-           command:
-             - sh
-             - -c
-             - rm -rf /var/lib/postgresql/data/lost+found || true
-           volumeMounts:
-             - name: data
-               mountPath: /var/lib/postgresql/data
-       containers:
+{{- $tols := include "tline.tolerations" (dict "Values" .Values "schedulingClass" .Values.postgres.schedulingClass) }}
+{{- if $tols }}
+      tolerations:
+{{ $tols | indent 8 }}
+{{- end }}
+      containers:
         - name: postgres
           image: {{ printf "%s:%s" .Values.images.postgres.repository .Values.images.postgres.tag | quote }}
           imagePullPolicy: {{ .Values.images.postgres.pullPolicy }}
@@ -73,6 +63,8 @@ spec:
                 secretKeyRef:
                   name: {{ include "tline.secretName" . }}
                   key: POSTGRES_PASSWORD
+            - name: PGDATA
+              value: /var/lib/postgresql/data/pgdata
           readinessProbe:
             exec:
               command: