diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..913e9781f3
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,20 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/ng
+    docker:
+      - image: alexeagle/ngcontainer
+    steps:
+      - checkout
+      - restore_cache:
+          key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
+      - run: npm install
+      - run: npm run postinstall
+      - run: ./node_modules/.bin/gulp lint
+      # Build twice, workaround for
+      # https://github.com/bazelbuild/bazel/issues/3114
+      - run: bazel build ... || bazel build ...
+      - save_cache:
+          key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
+          paths:
+            - "node_modules"
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 11bf953a58..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-machine:
-  node:
-    version: 6.9.5
-
-dependencies:
-  pre:
-    - npm install -g npm@3.10.7
-    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.21.3
-
-test:
-  override:
-    - gulp lint