diff --git a/Makefile b/Makefile
index 73530d660..7de4f832b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,13 @@ all: build
 build:
 	GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/...
 
+# usage: make build-cross dist VERSION=v2.0.0-alpha.3
 .PHONY: build-cross
 build-cross:
 	gox -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -os="darwin linux windows" -arch="amd64 386" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
 
-# usage: make dist VERSION=v2.0.0-alpha.3
 .PHONY: dist
-dist: build-cross
+dist:
 	( \
 		cd _dist && \
 		$(DIST_DIRS) cp ../LICENSE {} \; && \
diff --git a/circle.yml b/circle.yml
index 74fab120f..182e2f238 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,12 +6,14 @@ machine:
     GOVERSION: "1.7"
     GOPATH:  "${HOME}/.go_workspace"
     WORKDIR: "${GOPATH}/src/k8s.io/helm"
+    PROJECT_NAME: "kubernetes-helm"
 
   services:
     - docker
 
 dependencies:
   pre:
+    # remove old go files
     - sudo rm -rf /usr/local/go
     - rm -rf "$GOPATH"
 
@@ -39,7 +41,18 @@ deployment:
   gcr:
     branch: master
     commands:
-      - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
+      # setup gcloud tools
+      - sudo /opt/google-cloud-sdk/bin/gcloud --quiet components update
+      - echo "${GCLOUD_SERVICE_KEY}" | base64 --decode > "${HOME}/gcloud-service-key.json"
+      - sudo /opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file "${HOME}/glcoud-service-key.json"
+      - sudo /opt/google-cloud-sdk/bin/gcloud config set project "${PROJECT_NAME}"
       - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
+
+      # build canary tiller image and push
       - make docker-build
       - docker push gcr.io/kubernetes-helm/tiller:canary
+
+      # build canary helm binaries and push
+      - make build-cross
+      - make dist VERSION=canary
+      - sudo /opt/google-cloud-sdk/bin/gsutil cp ./_dist/* "gs://${PROJECT_NAME}"