diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..54ec5d4
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,41 @@
+version: 2.1
+
+orbs:
+  base: dmx-io/base@2.0.88
+
+jobs:
+  build:
+    working_directory: /app
+    docker:
+      - image: docker:17.09.0-ce-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Install dependencies
+          command: |
+            apk update
+            apk upgrade
+            apk add --no-cache curl
+            apk add --no-cache make
+      - run:
+          name: Build application Docker image
+          command: |
+            make docker-build
+      - deploy:
+          name: Push Docker image to Docker Hub
+          command: |
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            make docker-tag-ci
+            make docker-push-ci
+
+workflows:
+  main:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only:
+                - master
+                - develop
+              ignore: /.*/
diff --git a/Makefile b/Makefile
index 05e6a5d..4081502 100644
--- a/Makefile
+++ b/Makefile
@@ -234,6 +234,11 @@ docker-build:
 docker-tag:
 	docker tag cointop/cointop:latest cointop/cointop:$(VERSION)
 
+docker-tag-ci:
+	# docker tag cointop/cointop:latest cointop/cointop:$(VERSION)
+	docker tag cointop/cointop:latest cointop/cointop:$(CIRCLE_SHA1)
+	docker tag cointop/cointop:latest cointop/cointop:$(CIRCLE_BRANCH)
+
 docker-run:
 	docker run -it cointop/cointop
 
@@ -241,6 +246,12 @@ docker-push:
 	docker push cointop/cointop:$(VERSION)
 	docker push cointop/cointop:latest
 
+docker-push-ci:
+	# docker push cointop/cointop:$(VERSION)
+	docker push cointop/cointop:$(CIRCLE_SHA1)
+	docker push cointop/cointop:$(CIRCLE_BRANCH)
+	test $(CIRCLE_BRANCH) == "master" && docker push cointop/cointop:latest; true
+
 docker-build-and-push: docker-build docker-tag docker-push
 
 docker-run-ssh: