diff --git a/apps-helm/samba4/templates/deployment.yaml b/apps-helm/samba4/templates/deployment.yaml
index 702b9b1..ed49dca 100644
--- a/apps-helm/samba4/templates/deployment.yaml
+++ b/apps-helm/samba4/templates/deployment.yaml
@@ -57,6 +57,7 @@ spec:
             mount -t overlay -o lowerdir=/extras/{{ join ":/extras/" .shares }},upperdir=/data/overlay-{{ .destName }}-upper,workdir=/data/overlay-{{ .destName }}-work overlay /combined/{{ .destName }};
             sleep infinity;
           {{- end }}
+            touch /combined/overlays-mounted;
           lifecycle:
             preStop:
               exec:
@@ -80,7 +81,7 @@ spec:
           command:
           - /bin/sh
           - -c
-          - cd /scripts ; sh ./k8s.sh
+          - {{ if .Values.persistence.combineShares }}until [ -f /combined/overlays-mounted ]; do sleep 5; done; {{ end }}cd /scripts ; sh ./k8s.sh
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: cifs