diff --git a/tatort-dev/tatort/templates/deployment.yaml b/tatort-dev/tatort/templates/deployment.yaml
index d9596a2..c1dfba5 100644
--- a/tatort-dev/tatort/templates/deployment.yaml
+++ b/tatort-dev/tatort/templates/deployment.yaml
@@ -15,6 +15,10 @@ spec:
   strategy:
   {{ toYaml .Values.updateStrategy | nindent 4 }}
   replicas: {{ .Values.replicaCount }}
+  volumes:
+    - name: shared-data
+      persistentVolumeClaim:
+        claimName: shared-data
   selector:
     matchLabels:
       app: {{ template "tatort.name" . }}
@@ -38,6 +42,9 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - name: shared-data
+              mountPath: {{ .Values.sharedDataFolder.path }}
           terminationMessagePolicy: FallbackToLogsOnError
           ports:
             - name: http
diff --git a/tatort-dev/tatort/templates/pvc.yaml b/tatort-dev/tatort/templates/pvc.yaml
new file mode 100644
index 0000000..62556dc
--- /dev/null
+++ b/tatort-dev/tatort/templates/pvc.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.sharedDataFolder.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: shared-data
+spec:
+  accessModes:
+    - {{ .Values.sharedDataFolder.accessMode }}
+  {{- if .Values.sharedDataFolder.storageClass }}
+  storageClassName: {{ .Values.sharedDataFolder.storageClass }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.sharedDataFolder.resources.requests.storage }}
+{{- end }}