diff --git a/kubernetes/common/cassandra/templates/pv.yaml b/kubernetes/common/cassandra/templates/pv.yaml
index fbbb5ba..fd0a758 100644
--- a/kubernetes/common/cassandra/templates/pv.yaml
+++ b/kubernetes/common/cassandra/templates/pv.yaml
@@ -20,13 +20,13 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ $global.Release.Name }}-{{ $global.Values.service.name }}-{{ $i }}
+  name: {{ include "common.release" $global }}-{{ $global.Values.service.name }}-{{ $i }}
   namespace: {{ $global.Release.Namespace }}
   labels:
     type: {{ $global.Values.persistence.storageType }}
     app: {{ $global.Values.service.name }}
     chart: {{ $global.Chart.Name }}-{{ $global.Chart.Version | replace "+" "_" }}
-    release: {{ $global.Release.Name }}
+    release: {{ include "common.release" $global }}
     heritage: {{ $global.Release.Service }}
 spec:
   capacity:
@@ -40,7 +40,7 @@
   persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
   storageClassName: "{{ include "common.fullname" $global }}-data"
   hostPath:
-    path: {{ $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}-{{ $i }}
+    path: {{ $global.Values.persistence.mountPath }}/{{ include "common.release" $global }}/{{ $global.Values.persistence.mountSubPath }}-{{ $i }}
 {{- end -}}
 {{- end -}}
 {{- end -}}