diff --git a/README.rst b/README.rst
index e56ccdb..1bf7c33 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,12 @@
 
-==================================
-Helm Formula README
-==================================
+============
+Helm formula
+============
 
 This formula installs Helm client, installs Tiller on Kubernetes cluster and
 creates releases in it.
 
+
 Sample pillars
 ==============
 
@@ -110,42 +111,42 @@
             gce_service_token: base64_of_json_token_downloaded_from_cloud_console
 
 
-Development and testing
-=======================
+More Information
+================
 
-Development and test workflow with `Test Kitchen <http://kitchen.ci>`_ and
-`kitchen-salt <https://github.com/simonmcc/kitchen-salt>`_ provisioner plugin.
-
-Test Kitchen is a test harness tool to execute your configured code on one or more platforms in isolation.
-There is a ``.kitchen.yml`` in main directory that defines *platforms* to be tested and *suites* to execute on them.
-
-Kitchen CI can spin instances locally or remote, based on used *driver*.
-For local development ``.kitchen.yml`` defines a `vagrant <https://github.com/test-kitchen/kitchen-vagrant>`_ or
-`docker  <https://github.com/test-kitchen/kitchen-docker>`_ driver.
-
-To use backend drivers or implement your CI follow the section `INTEGRATION.rst#Continuous Integration`__.
-
-The `Busser <https://github.com/test-kitchen/busser>`_ *Verifier* is used to setup and run tests
-implementated in `<repo>/test/integration`. It installs the particular driver to tested instance
-(`Serverspec <https://github.com/neillturner/kitchen-verifier-serverspec>`_,
-`InSpec <https://github.com/chef/kitchen-inspec>`_, Shell, Bats, ...) prior the verification is executed.
-
-Usage:
-
-.. code-block:: shell
-
-  # list instances and status
-  kitchen list
-
-  # manually execute integration tests
-  kitchen [test || [create|converge|verify|exec|login|destroy|...]] [instance] -t tests/integration
-
-  # use with provided Makefile (ie: within CI pipeline)
-  make kitchen
+* https://github.com/kubernetes/charts
+* https://fabric8.io/helm/
 
 
+Documentation and Bugs
+======================
 
-Read more
-=========
+To learn how to install and update salt-formulas, consult the documentation
+available online at:
 
-* links
+    http://salt-formulas.readthedocs.io/
+
+In the unfortunate event that bugs are discovered, they should be reported to
+the appropriate issue tracker. Use Github issue tracker for specific salt
+formula:
+
+    https://github.com/salt-formulas/salt-formula-helm/issues
+
+For feature requests, bug reports or blueprints affecting entire ecosystem,
+use Launchpad salt-formulas project:
+
+    https://launchpad.net/salt-formulas
+
+You can also join salt-formulas-users team and subscribe to mailing list:
+
+    https://launchpad.net/~salt-formulas-users
+
+Developers wishing to work on the salt-formulas projects should always base
+their work on master branch and submit pull request against specific formula.
+
+    https://github.com/salt-formulas/salt-formula-home-assistant
+
+Any questions or feedback is always welcome so feel free to join our IRC
+channel:
+
+    #salt-formulas @ irc.freenode.net
diff --git a/helm/client.sls b/helm/client.sls
index 0c63fbe..34edfea 100644
--- a/helm/client.sls
+++ b/helm/client.sls
@@ -87,6 +87,20 @@
         content: {{ client.kubectl.config.gce_service_token }}
 {%- endif %}
 
+helm_env_home_param:
+   environ.setenv:
+   - name: HELM_HOME
+   - value: {{ helm_home }}
+   - update_minion: True
+
+helm_env_kubeconfig_param:
+   environ.setenv:
+   - name: KUBECONFIG
+   - value: {{ kube_config }}
+   - update_minion: True
+   - require:
+     - environ: helm_env_home_param
+
 {%- if client.tiller.install %}
 install_tiller:
   cmd.run:
@@ -99,6 +113,7 @@
     - require:
       - cmd: prepare_client
       - file: {{ kube_config }}
+      - environ: helm_env_kubeconfig_param
       {{ gce_require }}
 
 wait_for_tiller:
@@ -206,6 +221,7 @@
       {{ gce_env_var }}
     - require:
       - file: {{ kube_config }}
+      - environ: helm_env_kubeconfig_param
       {{ gce_require }}
     {%- if client.kubectl.install %}
       - file: {{ kubectl_bin }}