diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..5de35a9
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,18 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/build
+    docker:
+      - image: circleci/golang:latest
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 17.05.0-ce
+      - run: make image
+      - deploy: |
+          if [[ "$CIRCLE_BRANCH" == "master" ]]; then
+            docker tag ctop quay.io/vektorlab/ctop:latest
+            docker tag ctop quay.io/vektorlab/ctop:$(cat VERSION)
+            docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
+            docker push quay.io/vektorlab/ctop
+          fi
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 61d181c..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-machine:
-  services:
-    - docker
-  environment:
-    IMAGE_NAME: quay.io/vektorlab/ctop
-
-dependencies:
-  override:
-    - docker info
-    - make image
-
-test:
-  override:
-    - docker run -ti ctop -v
-
-deployment:
-  hub:
-    branch: master
-    commands:
-      - docker tag ctop ${IMAGE_NAME}:latest
-      - docker tag ctop ${IMAGE_NAME}:$(cat VERSION)
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
-      - docker push ${IMAGE_NAME}