diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95c0dbb..9ae95d4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,3 +12,4 @@ jobs:
      - run: docker run -it --rm govau/cga-cf-bosh-cli:$CIRCLE_BRANCH terraform --version
      - run: docker run -it --rm govau/cga-cf-bosh-cli:$CIRCLE_BRANCH bosh --version
      - run: docker run -it --rm govau/cga-cf-bosh-cli:$CIRCLE_BRANCH ansible --version
+     - run: docker run -it --rm govau/cga-cf-bosh-cli:$CIRCLE_BRANCH helm version --client
diff --git a/Dockerfile b/Dockerfile
index dac7691..efff4c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,21 +2,21 @@ FROM ubuntu:16.04
 
 # Install base packages, ansible, nodejs
 RUN apt-get update && apt-get -y install \
-        awscli \
-        curl \
-        dnsutils \
-        gcc \
-        git \
-        jq \
-        software-properties-common \
-        unzip \
-        wget && \
+    awscli \
+    curl \
+    dnsutils \
+    gcc \
+    git \
+    jq \
+    software-properties-common \
+    unzip \
+    wget && \
     apt-add-repository ppa:ansible/ansible && \
     apt-get update && apt-get -y install \
-        ansible && \
+    ansible && \
     bash -o pipefail -c "curl -L https://deb.nodesource.com/setup_8.x | bash" && \
     apt-get -y install \
-        nodejs && \
+    nodejs && \
     rm -rf /var/lib/apt/lists/*
 
 # Install bosh-cli
@@ -38,14 +38,14 @@ RUN mkdir -p /go/bin && \
 
 # Install go tools
 RUN go get \
-        github.com/golang/dep/cmd/dep \
-        github.com/GeertJohan/fgt \
-        github.com/golang/lint/golint \
-        github.com/golang/protobuf/protoc-gen-go \
-        github.com/govau/le-dns-certs/cmd/route53renewer \
-        github.com/govau/sdget \
-        github.com/jteeuwen/go-bindata/... \
-        golang.org/x/tools/cmd/cover
+    github.com/golang/dep/cmd/dep \
+    github.com/GeertJohan/fgt \
+    github.com/golang/lint/golint \
+    github.com/golang/protobuf/protoc-gen-go \
+    github.com/govau/le-dns-certs/cmd/route53renewer \
+    github.com/govau/sdget \
+    github.com/jteeuwen/go-bindata/... \
+    golang.org/x/tools/cmd/cover
 
 # Install common NPM stuff:
 RUN cd $(npm root -g)/npm && \
@@ -70,3 +70,11 @@ RUN mkdir -p /root/.terraform.d/plugins/linux_amd64 && \
 # Install kubectl
 RUN curl -L https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/linux/amd64/kubectl > /usr/local/bin/kubectl && \
     chmod a+x /usr/local/bin/kubectl
+
+# Install helm
+# RUN bash -o pipefail -c "curl -L https://storage.googleapis.com/kubernetes-helm/helm-v2.12.2-linux-amd64.tar.gz | tar -xz -C /usr/local/bin"
+RUN curl -L https://storage.googleapis.com/kubernetes-helm/helm-v2.12.2-linux-amd64.tar.gz > /tmp/helm.tar.gz && \
+    mkdir /tmp/helm && \
+    tar -xz -C /tmp/helm -f /tmp/helm.tar.gz && \
+    mv /tmp/helm/linux-amd64/helm /tmp/helm/linux-amd64/tiller /usr/local/bin
+