diff --git a/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml b/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml
index a77470b..0e7d0d6 100644
--- a/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml
@@ -108,7 +108,7 @@ spec:
       volumes:
         - name: data
           persistentVolumeClaim:
-            claimName: data
+            claimName: {{ include "portalmodelo.fullname" . }}-data
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/portalmodelo/v0.5.0/templates/plonecfg-job.yaml b/charts/portalmodelo/v0.5.0/templates/plonecfg-job.yaml
index b28720f..26c970d 100644
--- a/charts/portalmodelo/v0.5.0/templates/plonecfg-job.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/plonecfg-job.yaml
@@ -81,7 +81,7 @@ spec:
       volumes:
         - name: data
           persistentVolumeClaim:
-            claimName: data
+            claimName: {{ include "portalmodelo.fullname" . }}-data
       {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/portalmodelo/v0.5.0/templates/pvc.yaml b/charts/portalmodelo/v0.5.0/templates/pvc.yaml
index b1e7306..7213aa0 100644
--- a/charts/portalmodelo/v0.5.0/templates/pvc.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/pvc.yaml
@@ -2,7 +2,9 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: data
+  name: {{ include "portalmodelo.fullname" . }}-data
+  labels:
+    {{- include "portalmodelo.labels" . | nindent 4 }
 spec:
   accessModes:
   - {{ .Values.persistence.accessMode }}
diff --git a/charts/portalmodelo/v0.5.0/templates/zeopack-cronjob.yaml b/charts/portalmodelo/v0.5.0/templates/zeopack-cronjob.yaml
index 36dfa5a..66c17aa 100644
--- a/charts/portalmodelo/v0.5.0/templates/zeopack-cronjob.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/zeopack-cronjob.yaml
@@ -47,7 +47,7 @@ spec:
           volumes:
             - name: data
               persistentVolumeClaim:
-                claimName: data
+                claimName: {{ include "portalmodelo.fullname" . }}-data
           {{- end }}
           {{- with .Values.nodeSelector }}
           nodeSelector:
diff --git a/charts/portalmodelo/v0.5.0/templates/zeoserver-deployment.yaml b/charts/portalmodelo/v0.5.0/templates/zeoserver-deployment.yaml
index a208eeb..2ce452b 100644
--- a/charts/portalmodelo/v0.5.0/templates/zeoserver-deployment.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/zeoserver-deployment.yaml
@@ -102,7 +102,7 @@ spec:
         - name: data
         {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: data
+            claimName: {{ include "portalmodelo.fullname" . }}-data
         {{- else }}
           emptyDir: {}
         {{- end }}