diff --git a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
index 891526b..4a8ae39 100644
--- a/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
@@ -125,4 +125,7 @@
         resources:
           requests:
             storage: {{ .Values.persistence.size | quote }}
+        selector:
+          matchLabels:
+            release: "{{ .Release.Name }}"
   {{- end }}
diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index b6bd8f6..960d97e 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -143,4 +143,7 @@
         resources:
           requests:
             storage: {{ .Values.persistence.size | quote }}
+        selector:
+          matchLabels:
+            release: "{{ .Release.Name }}"
   {{- end }}
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index d3bad4f..2266bfc 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -126,4 +126,7 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size | quote }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
 {{- end }}
diff --git a/kubernetes/common/mongo/templates/pvc.yaml b/kubernetes/common/mongo/templates/pvc.yaml
index d1558f1..372c106 100644
--- a/kubernetes/common/mongo/templates/pvc.yaml
+++ b/kubernetes/common/mongo/templates/pvc.yaml
@@ -25,6 +25,7 @@
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    name: {{ include "common.fullname" . }}
 {{- if .Values.persistence.annotations }}
   annotations:
 {{ toYaml .Values.persistence.annotations | indent 4 }}
@@ -35,5 +36,8 @@
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
+  selector:
+    matchLabels:
+      name: {{ include "common.fullname" . }}
   storageClassName: "{{ include "common.fullname" . }}-data"
 {{- end -}}
diff --git a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
index e67a2c3..009c40d 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
@@ -132,4 +132,7 @@
         resources:
           requests:
             storage: {{ .Values.persistence.size | quote }}
+        selector:
+          matchLabels:
+            release: "{{ .Release.Name }}"
   {{- end }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
index 1efd466..135b59e 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
@@ -185,4 +185,7 @@
         resources:
           requests:
             storage: {{ .Values.persistence.size | quote }}
+        selector:
+          matchLabels:
+            release: "{{ .Release.Name }}"
   {{- end }}
diff --git a/kubernetes/common/mysql/templates/statefulset.yaml b/kubernetes/common/mysql/templates/statefulset.yaml
index 1744940..f73b10f 100644
--- a/kubernetes/common/mysql/templates/statefulset.yaml
+++ b/kubernetes/common/mysql/templates/statefulset.yaml
@@ -251,4 +251,7 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
   {{ end }}
diff --git a/kubernetes/common/postgres/templates/statefulset.yaml b/kubernetes/common/postgres/templates/statefulset.yaml
index 3c7ae65..db4a256 100644
--- a/kubernetes/common/postgres/templates/statefulset.yaml
+++ b/kubernetes/common/postgres/templates/statefulset.yaml
@@ -149,4 +149,7 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
 #{{ end }}
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
index 3e20e37..5a5b220 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
@@ -113,3 +113,6 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 32d9884..b30ef38 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -195,4 +195,7 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
   {{ end }}
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
index 0c77a17..e90b156 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/templates/statefulset.yaml
@@ -120,6 +120,8 @@
   volumeClaimTemplates:
   - metadata:
       name: {{ include "common.fullname" . }}-data
+      labels:
+        name: {{ include "common.fullname" . }}
       annotations:
   {{- if .Values.persistence.storageClass }}
         volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
@@ -132,4 +134,7 @@
       resources:
         requests:
           storage: {{ .Values.persistence.size | quote }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}
 {{- end }}