diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
index c1428029f9..d0c1b9cf80 100755
--- a/stable/metrics-server/Chart.yaml
+++ b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.3.2
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 2.8.1
+version: 2.8.2
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server
diff --git a/stable/metrics-server/templates/metric-server-service.yaml b/stable/metrics-server/templates/metric-server-service.yaml
index 6824e3625c..bf149f9a9a 100644
--- a/stable/metrics-server/templates/metric-server-service.yaml
+++ b/stable/metrics-server/templates/metric-server-service.yaml
@@ -7,8 +7,8 @@ metadata:
     chart: {{ template "metrics-server.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-    {{- with .Values.service.labels }}
-    {{- toYaml . | indent 4}}
+    {{- with .Values.service.labels -}}
+    {{ toYaml . | nindent 4 }}
     {{- end }}
   annotations:
     {{- toYaml .Values.service.annotations | nindent 4 }}