diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..2e6bee4
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,15 @@
+version: 2.1
+
+jobs:
+  build:
+    machine:
+      docker_layer_caching: true
+    working_directory: ~/codeclimate/codeclimate-sonar-java
+    steps:
+      - checkout
+      - run:
+          name: Build
+          command: make image
+      - run:
+          name: Test
+          command: make test
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index c7dd860..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-machine:
-  services:
-    - docker
-
-dependencies:
-  override:
-    - >
-      docker run
-      --env CIRCLE_BRANCH
-      --env CIRCLE_PROJECT_REPONAME
-      --env CIRCLE_TOKEN
-      --env GCR_JSON_KEY
-      --volume /var/run/docker.sock:/var/run/docker.sock
-      codeclimate/patrick pull || true
-    - make image
-
-test:
-  override:
-    - make test
-
-deployment:
-  registry:
-    branch: /master|channel\/[\w-]+/
-    owner: codeclimate
-    commands:
-      - >
-        docker run
-        --env CIRCLE_BUILD_NUM
-        --env CIRCLE_PROJECT_REPONAME
-        --env GCR_JSON_KEY
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        codeclimate/patrick push gcr
-
-notify:
-  webhooks:
-    - url: https://cc-slack-proxy.herokuapp.com/circle