diff --git a/circle.yml b/circle.yml
index 09db231ba..84c0a45cf 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,8 +12,9 @@ machine:
 
 dependencies:
   pre:
-    - sudo rm -rf /usr/local/go
-    - rm -rf "$GOPATH"
+    # clean up gopath
+    - sudo rm -rf /usr/local/go;
+    - rm -rf "$GOPATH";
 
   override:
     # install go
@@ -27,19 +28,32 @@ dependencies:
     # install dependencies
     - cd "${WORKDIR}" && make bootstrap
 
+    # docker login to gcr.io
+    - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
+    - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
+
   post:
+    # check your work
     - go env
 
 test:
   override:
+    # run tests in parallel
     - cd "${WORKDIR}" && ./scripts/ci.sh:
         parallel: true
 
 deployment:
-  gcr:
+
+  # build and push an immutable tagged image on a tagged relase
+  release:
+    tag: /^v[0-9]+\.{3}.*$/
+    commands:
+      - make docker-build VERSION="${CIRCLE_TAG}"
+      - docker push "gcr.io/kubernetes-helm/tiller:${CIRCLE_TAG}"
+
+  # build and upload a canary image on a successful master build
+  canary:
     branch: master
     commands:
-      - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
-      - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
       - make docker-build
       - docker push gcr.io/kubernetes-helm/tiller:canary