diff --git a/circle.yml b/circle.yml
index 83b4dcadd..3bc78e7b2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,43 +1,38 @@
 machine:
   environment:
-    GLIDE_VERSION: "0.10.1"
-    GO15VENDOREXPERIMENT: 1
-    GOPATH: /usr/local/go_workspace
-    HOME: /home/ubuntu
-    IMPORT_PATH: "k8s.io/helm"
-    PATH: $HOME/go/bin:$PATH
-    GOROOT: $HOME/go
+    GOVERSION: "1.6.2"
+    GOPATH:  "${HOME}/.go_workspace"
+    WORKDIR: "${GOPATH}/src/k8s.io/helm"
 
   services:
     - docker
 
 dependencies:
+  pre:
+    - sudo rm -rf /usr/local/go
+    - rm -rf "$GOPATH"
+
   override:
-    - mkdir -p $HOME/go
-    - wget "https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz"
-    - tar -C $HOME -xzf go1.6.linux-amd64.tar.gz
-    - go version
+    - wget "https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz"
+    - sudo tar -C /usr/local -xzf "go${GOVERSION}.linux-amd64.tar.gz"
+
+    - mkdir -p "$(dirname ${WORKDIR})"
+    - cp -R "${HOME}/helm" "${WORKDIR}"
+
+    - cd "${WORKDIR}" && make bootstrap
+
+  post:
     - go env
-    - sudo chown -R $(whoami):staff /usr/local
-    - cd $GOPATH
-    - mkdir -p $GOPATH/src/$IMPORT_PATH
-    - cd $HOME/helm
-    - rsync -az --delete ./ "$GOPATH/src/$IMPORT_PATH/"
-    - wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz"
-    - mkdir -p $HOME/bin
-    - tar -vxz -C $HOME/bin --strip=1 -f glide-$GLIDE_VERSION-linux-amd64.tar.gz
-    - export PATH="$HOME/bin:$PATH" GLIDE_HOME="$HOME/.glide"
 
 test:
   override:
-    - cd $GOPATH/src/$IMPORT_PATH && make bootstrap test
+    - cd "${WORKDIR}" && make test
 
 deployment:
-  master-branch:
+  gcr:
     branch: master
     commands:
       - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
-      - sudo docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
-      - cd $GOPATH/src/$IMPORT_PATH
-      - make docker-build
-      - sudo docker push gcr.io/kubernetes-helm/tiller:canary
+      - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
+      - cd "${WORKDIR}" && make docker-build
+      - docker push gcr.io/kubernetes-helm/tiller:canary