diff --git a/helm/kubectl_configured.sls b/helm/kubectl_configured.sls
index 5622204..d7b9fb0 100644
--- a/helm/kubectl_configured.sls
+++ b/helm/kubectl_configured.sls
@@ -17,7 +17,7 @@
     {%- endif %}
 
 {%- if config.kubectl.config.gce_service_token %}
-{{ constants.gce_service_token_path }}:
+{{ constants.kubectl.gce_service_token_path }}:
   file.managed:
     - source: salt://helm/files/gce_token.json.j2
     - mode: 400
diff --git a/helm/map.jinja b/helm/map.jinja
index 974ed5b..82087aa 100644
--- a/helm/map.jinja
+++ b/helm/map.jinja
@@ -44,7 +44,7 @@
       bin: /usr/bin/kubectl
       config_file: /srv/helm/kubeconfig.yaml
       config:
-        gce_service_token: 
+        gce_service_token:
 {%- endload %}
 
 {%- set config = salt['pillar.get']('helm:client', base_config.helm.client, merge=true) %}
@@ -71,23 +71,20 @@
 %}
 
 {%- if "host" in config.tiller %}
-{%- do constants.update({
-     "helm": {
+  {%- do constants.helm.update({
        "cmd": config.bin + " --host '{}'".format(config.tiller.host),
        "tiller_arg": "- tiller_host: \"{}\"".format(config.tiller.host)
-     }
-   })
-%}
+     })
+  %}
 {%- endif %}
 
 {%- if config.kubectl.config.gce_service_token %}
-{%- do constants.update({
-     "helm": {
-       "gce_state_arg": "- gce_service_token: \"{}\"".format(constants.gce_service_token_path),
-     },
-     "tiller": {
-       "gce_env_var": "- GOOGLE_APPLICATION_CREDENTIALS: \"{}\"".format(gce_service_token_path)
-     }
-   })
-%}
+  {%- do constants.helm.update({
+         "gce_state_arg": "- gce_service_token: \"{}\"".format(constants.kubectl.gce_service_token_path),
+      })
+  %}
+  {%- do constants.tiller.update({
+         "gce_env_var": "- GOOGLE_APPLICATION_CREDENTIALS: \"{}\"".format(constants.kubectl.gce_service_token_path)
+      })
+  %}
 {%- endif %}
\ No newline at end of file
diff --git a/pillar.example b/pillar.example
index 16e906b..6846703 100644
--- a/pillar.example
+++ b/pillar.example
@@ -145,6 +145,7 @@
       #     username: admin
       #     password: uberadminpass
       #   user_name: admin
+      #   gce_service_token: yourtokenhere
       
 
     #