diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f994e6..1656356 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,6 +54,27 @@ jobs:
           environment:
             DATABASE_URL: postgres://psqluer:psqlpassword@localhost:5432/psqluer
 
+  docker-build-and-push:
+    working_directory: /dockerapp
+    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 .
+            echo true
+      - 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/my-awesome-ci-expr:$CIRCLE_BUILD_NUM
+            docker tag app $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest
+            docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:$CIRCLE_BUILD_NUM
+            docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest
+
   back-deploy-heroku:
     docker:
       - image: buildpack-deps:trusty
@@ -85,6 +106,15 @@ workflows:
       - lint:
           requires:
             - build
+      - docker-build-and-push:
+          requires:
+            - build
+            - lint
+            - back-test-e2e
+            - back-test-unit
+          filters:
+            branches:
+              only: main      
       - back-deploy-heroku:
           requires:
             - build