diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd1254c..b07fa16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,7 @@ workflows:
     jobs:
       - install
       - back-deploy-heroku
+      - docker-build-and-push
 jobs:
   install:
     docker:
@@ -71,4 +72,22 @@ jobs:
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
               exit 1; \
-            fi
\ No newline at end of file
+            fi
+  docker-build-and-push:
+    docker:
+      - image: docker:17.05.0-ce-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build application Docker image
+          command: |
+            docker build --cache-from=app -t app .
+      - deploy:
+          name: Publish application to docker hub
+          command: |
+            docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD
+            docker tag app $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
+            docker tag app $DOCKER_HUB_USER_ID/devops-back-final:latest
+            docker push $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
+            docker push $DOCKER_HUB_USER_ID/devops-back-final:latest
\ No newline at end of file