diff --git a/.bashrc b/.bashrc
index 7f91be6e46bb02a9db1c63b3aee39040837cba4d..5af1b47ed75f781e3eb55b1dd13789a2958433ab 100644
--- a/.bashrc
+++ b/.bashrc
@@ -48,6 +48,7 @@ export LESS_TERMCAP_se=$'\E[0m'
 # Underline (dark grey).
 export LESS_TERMCAP_us=$'\E[01;32m'
 export LESS_TERMCAP_ue=$'\E[0m'
+export HELM_HOME="$HOME/.helm"
 
 alias ll='ls -lha'
 alias la='ls -A'
diff --git a/.githooks/post-merge b/.githooks/post-merge
index ed930bc0675b834399d47a90f3584c4ce3ad04f0..4d39554340ceb07691afc70af5309b368d62f245 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -1,5 +1,7 @@
 #!/bin/sh
 set -eu
+# shellcheck disable=SC1090
+. ~/.bashrc
 cd "$(git rev-parse --show-toplevel)"
 echo Installing Golang apps >> /dev/stderr
 go get github.com/giantswarm/semver-bump || true
diff --git a/.helm/plugins/.gitkeep b/.helm/plugins/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Makefile b/Makefile
index 438973fc32528d83f545329e1f339246f1bc43d3..af7cb19a57240c538c5827874f086ab825284b42 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ download = $(curl) --output $@
 all: binaries vendored generated
 vendored: .config/pythonrc.py .bash_completion.d/aws .bash_completion.d/docker-compose .bash_completion.d/docker-machine.bash .bash_completion.d/docker-machine.bash .travis/travis.sh .bash_completion.d/molecule Documents/bin/rabbitmqadmin .bash_completion.d/google-cloud-sdk
 generated: .ssh/config .bash_completion.d/helm .bash_completion.d/kops .bash_completion.d/kubectl .bash_completion.d/kompose .bash_completion.d/minikube .bash_completion.d/pipenv .bash_completion.d/pandoc .bash_completion.d/skaffold .bash_completion.d/rabbitmqadmin .ssh/localhost .ssh/localhost.pub .ssh/authorized_keys .bash_completion.d/minishift .bash_completion.d/oc
-binaries: $(DESTDIR)/share/bfg/bfg.jar $(DESTDIR)/bin/rke $(DESTDIR)/bin/docker-machine $(DESTDIR)/bin/packer $(DESTDIR)/bin/terraform $(DESTDIR)/bin/vault $(DESTDIR)/bin/kubectl $(DESTDIR)/bin/kops $(DESTDIR)/bin/kompose $(DESTDIR)/bin/minikube $(DESTDIR)/bin/docker-machine-driver-kvm2 $(DESTDIR)/bin/kustomize $(DESTDIR)/bin/pack $(DESTDIR)/bin/skaffold $(DESTDIR)/bin/minishift $(DESTDIR)/bin/oc $(DESTDIR)/bin/docker-machine-driver-kvm
+binaries: $(DESTDIR)/share/bfg/bfg.jar $(DESTDIR)/bin/rke $(DESTDIR)/bin/docker-machine $(DESTDIR)/bin/packer $(DESTDIR)/bin/terraform $(DESTDIR)/bin/vault $(DESTDIR)/bin/kubectl $(DESTDIR)/bin/kops $(DESTDIR)/bin/kompose $(DESTDIR)/bin/minikube $(DESTDIR)/bin/docker-machine-driver-kvm2 $(DESTDIR)/bin/kustomize $(DESTDIR)/bin/pack $(DESTDIR)/bin/skaffold $(DESTDIR)/bin/minishift $(DESTDIR)/bin/oc $(DESTDIR)/bin/docker-machine-driver-kvm $(HELM_HOME)/plugins/helm-diff/bin/diff $(DESTDIR)/bin/gomplate
 
 
 ## Binary files
@@ -115,6 +115,15 @@ $(DESTDIR)/bin/docker-machine-driver-kvm:
 	-$(download) https://github.com/dhiltgen/docker-machine-kvm/releases/download/v0.10.0/docker-machine-driver-kvm-ubuntu16.04
 	-chmod +x $@
 
+$(HELM_HOME)/plugins/helm-diff/bin/diff: $(DESTDIR)/bin/helm
+	mkdir -p $(HELM_HOME)/plugins
+	$(DESTDIR)/bin/helm plugin install https://github.com/databus23/helm-diff --version master
+
+$(DESTDIR)/bin/gomplate:
+	mkdir -p $$(dirname $@)
+	-$(download) https://github.com/hairyhenderson/gomplate/releases/download/v3.4.0/gomplate_$(goos)-$(goarch)
+	-chmod +x $@
+
 
 ## Vendored files