diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml
index c515e3eb..24a6ecc2 100644
--- a/charts/tiller/templates/deployment-tiller.yaml
+++ b/charts/tiller/templates/deployment-tiller.yaml
@@ -55,6 +55,7 @@ spec:
       labels:
         app: helm
         name: tiller
+{{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       containers:
diff --git a/charts/tiller/templates/tiller-service.yaml b/charts/tiller/templates/tiller-service.yaml
index d1ac811e..33adeb38 100644
--- a/charts/tiller/templates/tiller-service.yaml
+++ b/charts/tiller/templates/tiller-service.yaml
@@ -33,7 +33,10 @@ spec:
   selector:
     app: helm
     name: tiller
-{{ tuple $envAll "tiller" "service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+    template:
+      metadata:
+        labels:
+{{ tuple $envAll "tiller" "service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 10 }}
   sessionAffinity: None
   type: ClusterIP
 {{- end }}