diff --git a/tatort-dev/tatort/templates/deployment.yaml b/tatort-dev/tatort/templates/deployment.yaml
index 2dc4291..be97be6 100644
--- a/tatort-dev/tatort/templates/deployment.yaml
+++ b/tatort-dev/tatort/templates/deployment.yaml
@@ -42,9 +42,6 @@ spec:
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
-          volumeMounts:
-            - name: shared-data
-              mountPath: {{ .Values.sharedDataFolder.path }}
           env:
           {{- range $key := .Values.env }}
           {{- if .value }}
@@ -65,12 +62,13 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+          {{ if .Values.sharedDataFolder.enabled }}
+          volumeMounts:
+            - name: shared-data-volume
+              mountPath: /daten
+          {{ end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-      volumes:
-        - name: shared-data
-          persistentVolumeClaim:
-            claimName: shared-data
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
@@ -83,3 +81,9 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
+      {{ if .Values.sharedDataFolder.enabled }}
+      volumes:
+      - name: shared-data-volume
+        persistentVolumeClaim:
+          claimName: {{ template "tatort.fullname" . }}-shared-data
+      {{ end }}
\ No newline at end of file
diff --git a/tatort-dev/tatort/templates/pvc.yaml b/tatort-dev/tatort/templates/pvc.yaml
index 62556dc..8881a8e 100644
--- a/tatort-dev/tatort/templates/pvc.yaml
+++ b/tatort-dev/tatort/templates/pvc.yaml
@@ -2,14 +2,25 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: shared-data
+  name: {{ template "tatort.fullname" . }}-shared-data
+  labels:
+    app: {{ template "tatort.name" . }}
+    chart: {{ template "tatort.chart" . }}
+    component: tatort
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 spec:
   accessModes:
+  {{- if .Values.sharedDataFolder.accessMode }}
     - {{ .Values.sharedDataFolder.accessMode }}
-  {{- if .Values.sharedDataFolder.storageClass }}
-  storageClassName: {{ .Values.sharedDataFolder.storageClass }}
+  {{- else }}
+    - ReadWriteMany
   {{- end }}
+  {{- if .Values.sharedDataFolder.storageClass }}
+  storageClassName: {{ .Values.sharedDataFolder.storageClass | quote }}
+  {{- end }}
+  {{- with .Values.sharedDataFolder.resources }}
   resources:
-    requests:
-      storage: {{ .Values.sharedDataFolder.resources.requests.storage }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{ end }}