diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..3beb930
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  build:
+    working_directory: /go/src/github.com/Clever/amazon-kinesis-client-go
+    docker:
+    - image: circleci/golang:1.10.3-stretch
+    - image: circleci/mongo:3.2.20-jessie-ram
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+    steps:
+    - run:
+        command: cd $HOME && git clone --depth 1 -v https://github.com/Clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
+        name: Clone ci-scripts
+    - checkout
+    - setup_remote_docker
+    - run:
+        command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+        name: Set up CircleCI artifacts directories
+    - run: make install_deps
+    - run: make build
+    - run: make bench
+    - run: make test
+    - run:
+        command: |-
+          cd /tmp/ && wget https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py
+          sudo apt-get install python-dev
+          sudo pip install --upgrade awscli && aws --version
+          pip install --upgrade --user awscli
+        name: Install awscli for ECR publish
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index f9e5d6c..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-machine:
-  post:
-  - cd $HOME && git clone --depth 1 -v git@github.com:clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
-  - $HOME/ci-scripts/circleci/golang-install 1.10
-  services:
-  - docker
-checkout:
-  post:
-  - $HOME/ci-scripts/circleci/golang-move-project
-compile:
-  override:
-  - make install_deps
-  - make build
-  - make bench
-test:
-  override:
-  - make test
-general:
-  build_dir: ../.go_workspace/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME