4 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/aaf/templates/pv-config.yaml b/kubernetes/aaf/templates/pv-config.yaml
index b004fe43cd..5ed3e62aeb 100644
--- a/kubernetes/aaf/templates/pv-config.yaml
+++ b/kubernetes/aaf/templates/pv-config.yaml
@@ -24,7 +24,7 @@ metadata:
   labels:
     app: {{ include "common.fullname" . }}-config
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
     name: {{ include "common.fullname" . }}
 spec:
@@ -34,7 +34,7 @@ spec:
     - {{ .Values.persistence.config.accessMode }}
   persistentVolumeReclaimPolicy: {{ .Values.persistence.config.volumeReclaimPolicy }}
   hostPath:
-     path: {{ .Values.persistence.config.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.config.mountSubPath }}
+     path: {{ .Values.persistence.config.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.config.mountSubPath }}
   storageClassName: "{{ include "common.fullname" . }}-config"
 {{- end -}}
 {{- end -}}
diff --git a/kubernetes/aaf/templates/pv-status.yaml b/kubernetes/aaf/templates/pv-status.yaml
index 455e32216c..d8f5980b9b 100644
--- a/kubernetes/aaf/templates/pv-status.yaml
+++ b/kubernetes/aaf/templates/pv-status.yaml
@@ -24,7 +24,7 @@ metadata:
   labels:
     app: {{ include "common.fullname" . }}-status
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
     name: {{ include "common.fullname" . }}
 spec:
@@ -34,7 +34,7 @@ spec:
     - {{ .Values.persistence.status.accessMode }}
   persistentVolumeReclaimPolicy: {{ .Values.persistence.status.volumeReclaimPolicy }}
   hostPath:
-     path: {{ .Values.persistence.status.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.status.mountSubPath }}
+     path: {{ .Values.persistence.status.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.status.mountSubPath }}
   storageClassName: "{{ include "common.fullname" . }}-status"
 {{- end -}}
 {{- end -}}
diff --git a/kubernetes/aaf/templates/pvc-config.yaml b/kubernetes/aaf/templates/pvc-config.yaml
index 3431fb0c85..dc71dceff1 100644
--- a/kubernetes/aaf/templates/pvc-config.yaml
+++ b/kubernetes/aaf/templates/pvc-config.yaml
@@ -18,12 +18,12 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Release.Name }}-aaf-config
+  name: {{ include "common.release" . }}-aaf-config
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
 {{- if .Values.persistence.annotations }}
   annotations:
diff --git a/kubernetes/aaf/templates/pvc-status.yaml b/kubernetes/aaf/templates/pvc-status.yaml
index 0413914831..3cda088fba 100644
--- a/kubernetes/aaf/templates/pvc-status.yaml
+++ b/kubernetes/aaf/templates/pvc-status.yaml
@@ -18,12 +18,12 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Release.Name }}-aaf-status
+  name: {{ include "common.release" . }}-aaf-status
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
 {{- if .Values.persistence.annotations }}
   annotations: