diff --git a/charts/sapl/v0.2.0/templates/deployment.yaml b/charts/sapl/v0.2.0/templates/deployment.yaml
index 822f29a..56cc123 100644
--- a/charts/sapl/v0.2.0/templates/deployment.yaml
+++ b/charts/sapl/v0.2.0/templates/deployment.yaml
@@ -100,7 +100,7 @@ spec:
       - name: media
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: media
+          claimName: {{ include "sapl.fullname" . }}-media
       {{- else }}
         emptyDir: {}
       {{- end }}
diff --git a/charts/sapl/v0.2.0/templates/pvc-media.yaml b/charts/sapl/v0.2.0/templates/pvc-media.yaml
index b8d8a70..acca018 100644
--- a/charts/sapl/v0.2.0/templates/pvc-media.yaml
+++ b/charts/sapl/v0.2.0/templates/pvc-media.yaml
@@ -2,7 +2,9 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: media
+  name: {{ include "sapl.fullname" . }}-media
+  labels:
+    {{- include "sapl.labels" . | nindent 4 }}
 spec:
   accessModes:
   - {{ .Values.persistence.accessMode }}