diff --git a/deployment/kubernetes/templates/storage/persistent.yml b/deployment/kubernetes/templates/storage/persistent.yml
index 26bec61..c1e0b4b 100644
--- a/deployment/kubernetes/templates/storage/persistent.yml
+++ b/deployment/kubernetes/templates/storage/persistent.yml
@@ -1,13 +1,15 @@
 kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
-  name: storage-persistent
+  name: storage-{{ .Release.Name }}-persistent
   labels:
     app.kubernetes.io/name:	"{{ .Chart.Name }}"
-    app.kubernetes.io/instance:	"{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app.kubernetes.io/version: "{{ .Chart.appVersion }}"
-    app.kubernetes.io/component: "storage-persistent"
+    app.kubernetes.io/instance:	"{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "persistent storage"
     app.kubernetes.io/part-of:	"{{ .Chart.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 provisioner: {{ .Values.STORAGE.PROVISIONER }}
 reclaimPolicy: {{ .Values.STORAGE.RECLAIM_POLICY }}
 volumeBindingMode: {{ .Values.STORAGE.VOLUME_BINDING_MODE }}