diff --git a/stolon/Chart.yaml b/stolon/Chart.yaml
index a5f444a..d87ee9c 100755
--- a/stolon/Chart.yaml
+++ b/stolon/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: stolon
-version: 0.8.1
+version: 0.8.2
 appVersion: 0.13.0
 home: https://github.com/sorintlab/stolon
 description: Stolon Helm Chart for Kubernetes.
diff --git a/stolon/templates/cluster-create-job.yaml b/stolon/templates/cluster-create-job.yaml
index a3cf76c..9c9e86c 100644
--- a/stolon/templates/cluster-create-job.yaml
+++ b/stolon/templates/cluster-create-job.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "stolon.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.fullname" . }}
+    app: {{ template "stolon.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "stolon.fullname" . }}
+        app: {{ template "stolon.name" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
@@ -48,4 +48,3 @@ spec:
           - --yes
           - '{  "initMode": "new"{{- if or .Values.keeper.client_ssl.enabled .Values.slow_queries.enabled }}, "pgParameters": { {{- if .Values.keeper.client_ssl.enabled }} "ssl": "on", "ssl_cert_file": "/etc/secrets/ssl/server.crt", "ssl_key_file": "/etc/secrets/ssl/server.key"{{- end }}{{- if and .Values.keeper.client_ssl.enabled .Values.slow_queries.enabled }},{{- end }}{{ if .Values.slow_queries.enabled }} "log_min_duration_statement" :  "{{ .Values.slow_queries.min_duration }}" {{ end }} }{{- end}} }'
 {{ end }}
-
diff --git a/stolon/templates/keeper-ro-service.yaml b/stolon/templates/keeper-ro-service.yaml
index bdd5bf4..ccfd9e4 100644
--- a/stolon/templates/keeper-ro-service.yaml
+++ b/stolon/templates/keeper-ro-service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.keeper.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.keeper.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-keeper"
@@ -17,7 +17,7 @@ spec:
     - port: {{ .Values.ports.externalPort }}
       targetPort: {{ .Values.ports.internalPort }}
   selector:
-    app: {{ template "stolon.keeper.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-keeper"
diff --git a/stolon/templates/keeper-statefulset.yaml b/stolon/templates/keeper-statefulset.yaml
index 8a100e9..d57434c 100644
--- a/stolon/templates/keeper-statefulset.yaml
+++ b/stolon/templates/keeper-statefulset.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.keeper.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.keeper.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-keeper"
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "stolon.keeper.fullname" . }}
+        app: {{ template "stolon.name" . }}
         release: "{{ .Release.Name }}"
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         component: "stolon-keeper"
diff --git a/stolon/templates/proxy-deploy.yaml b/stolon/templates/proxy-deploy.yaml
index bf3c65c..4dd1a58 100644
--- a/stolon/templates/proxy-deploy.yaml
+++ b/stolon/templates/proxy-deploy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.proxy.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.proxy.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-proxy"
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "stolon.proxy.fullname" . }}
+        app: {{ template "stolon.name" . }}
         release: "{{ .Release.Name }}"
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         component: "stolon-proxy"
diff --git a/stolon/templates/proxy-service.yaml b/stolon/templates/proxy-service.yaml
index d0b21b6..d64ac30 100644
--- a/stolon/templates/proxy-service.yaml
+++ b/stolon/templates/proxy-service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.proxy.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.proxy.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-proxy"
@@ -17,7 +17,7 @@ spec:
     - port: {{ .Values.ports.externalPort }}
       targetPort: {{ .Values.ports.internalPort }}
   selector:
-    app: {{ template "stolon.proxy.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-proxy"
diff --git a/stolon/templates/secret.yaml b/stolon/templates/secret.yaml
index c9b2436..364dd48 100644
--- a/stolon/templates/secret.yaml
+++ b/stolon/templates/secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stolon/templates/sentinel-deploy.yaml b/stolon/templates/sentinel-deploy.yaml
index 68db7bc..a204182 100644
--- a/stolon/templates/sentinel-deploy.yaml
+++ b/stolon/templates/sentinel-deploy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "stolon.sentinel.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.sentinel.fullname" . }}
+    app: {{ template "stolon.name" . }}
     release: "{{ .Release.Name }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "stolon-sentinel"
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "stolon.sentinel.fullname" . }}
+        app: {{ template "stolon.name" . }}
         release: "{{ .Release.Name }}"
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         component: "stolon-sentinel"
diff --git a/stolon/templates/stolon-role.yaml b/stolon/templates/stolon-role.yaml
index 3ffa1f6..11e7aac 100644
--- a/stolon/templates/stolon-role.yaml
+++ b/stolon/templates/stolon-role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "stolon.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.fullname" . }}
+    app: {{ template "stolon.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
diff --git a/stolon/templates/stolon-rolebinding.yaml b/stolon/templates/stolon-rolebinding.yaml
index 5b31ecb..acd8c3f 100644
--- a/stolon/templates/stolon-rolebinding.yaml
+++ b/stolon/templates/stolon-rolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "stolon.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.fullname" . }}
+    app: {{ template "stolon.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
diff --git a/stolon/templates/stolon-serviceaccount.yaml b/stolon/templates/stolon-serviceaccount.yaml
index 5d795ab..fedc44c 100644
--- a/stolon/templates/stolon-serviceaccount.yaml
+++ b/stolon/templates/stolon-serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "stolon.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "stolon.fullname" . }}
+    app: {{ template "stolon.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}