diff --git a/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2 b/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
index 7d54bb9538ef375e2c68c809d1be34c618d1035f..56af87be7fabc7ec7fac0632b8aff3ea18fe58ee 100644
--- a/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
+++ b/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ tiller_namespace }}
 subjects:
   - kind: ServiceAccount
-    name: tiller
+    name: {{ tiller_service_account }}
     namespace: {{ tiller_namespace }}
 roleRef:
   kind: ClusterRole
@@ -20,7 +20,7 @@ metadata:
   name: psp:tiller
 subjects:
   - kind: ServiceAccount
-    name: tiller
+    name: {{ tiller_service_account }}
     namespace: {{ tiller_namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2 b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
index d7eb974a31b990b94a65b43a26d68a57b58926cc..8a17b19722b67c0d267722db0a2057236c8c841d 100644
--- a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
+++ b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: tiller
+  name: {{ tiller_service_account }}
   namespace: {{ tiller_namespace }}