diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..c32c9f08d
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,46 @@
+version: 2
+jobs:
+  build:
+    working_directory: /go/src/k8s.io/helm
+    parallelism: 3
+    docker:
+      - image: golang:1.8
+    environment:
+      PROJECT_NAME: "kubernetes-helm"
+    steps:
+      - checkout
+      - run:
+          name: install dependencies
+          command: make bootstrap
+      - run:
+          name: go env
+          command: go env
+      - save_cache:
+          key: vendor-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
+          paths:
+            - vendor
+      - run:
+          name: test
+          command: ./scripts/ci.sh
+  deployment:
+    working_directory: /go/src/k8s.io/helm
+    docker:
+      - image: golang:1.8
+    environment:
+      PROJECT_NAME: "kubernetes-helm"
+    filters:
+      tags:
+        only: /.*/
+      branches:
+        only: master
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - vendor-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
+      - run:
+          name: go env
+          command: go env
+      - deploy:
+        name: deploy
+        command: ./scripts/ci/deploy.sh
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 5b30c8be4..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-machine:
-  pre:
-    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
-
-  environment:
-    GOVERSION: "1.8.3"
-    GOPATH:  "${HOME}/.go_workspace"
-    WORKDIR: "${GOPATH}/src/k8s.io/helm"
-    PROJECT_NAME: "kubernetes-helm"
-
-  services:
-    - docker
-
-dependencies:
-  cache_directories:
-    - "~/.glide"
-
-  pre:
-    # remove old go files
-    - sudo rm -rf /usr/local/go
-    - rm -rf "$GOPATH"
-
-  override:
-    # install go
-    - wget "https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz" -O "${HOME}/go${GOVERSION}.tar.gz"
-    - sudo tar -C /usr/local -xzf "${HOME}/go${GOVERSION}.tar.gz"
-
-    # move repository to the canonical import path
-    - mkdir -p "$(dirname ${WORKDIR})"
-    - cp -R "${HOME}/helm" "${WORKDIR}"
-
-    # install dependencies
-    - cd "${WORKDIR}" && make bootstrap
-
-  post:
-    - go env
-
-test:
-  override:
-    - cd "${WORKDIR}" && ./scripts/ci.sh:
-        parallel: true
-
-deployment:
-  release:
-    tag: /.*/
-    commands:
-      - cd "${WORKDIR}" && ./scripts/ci/deploy.sh
-
-  canary:
-    branch: master
-    commands:
-      - cd "${WORKDIR}" && ./scripts/ci/deploy.sh