diff --git a/charts/aai-elasticsearch/templates/deployment.yaml b/charts/aai-elasticsearch/templates/deployment.yaml
index 0417536..40c6210 100644
--- a/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/charts/aai-elasticsearch/templates/deployment.yaml
@@ -17,6 +17,7 @@
     metadata:
       labels:
         app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
diff --git a/charts/aai-elasticsearch/templates/service.yaml b/charts/aai-elasticsearch/templates/service.yaml
index 54ee8b6..f3a6dbb 100644
--- a/charts/aai-elasticsearch/templates/service.yaml
+++ b/charts/aai-elasticsearch/templates/service.yaml
@@ -20,6 +20,6 @@
       name: {{ .Values.service.portName }}
     {{- end}}
   selector:
-    app: {{ include "common.fullname" . }}
+    app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
   clusterIP: None