diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e601fb..5c2bd3a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,25 +94,25 @@ jobs:
             API_HOST: localhost
             API_PROTOCOL: http
 
-  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 .
-      - 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
+#  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 .
+#      - 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:
@@ -125,3 +125,51 @@ jobs:
       - run:
           name: Smoke Test
           command: ./testMaster-III-TP-CD.sh
+
+workflows:
+  version: 2
+  build-test-and-lint:
+    jobs:
+      - build
+      - back-test-unit:
+          requires:
+            - build
+      - back-test-e2e:
+          requires:
+            - build
+      - 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
+            - lint
+            - back-test-e2e
+            - back-test-unit
+          filters:
+            branches:
+              only: main
+      - server-doc-build:
+          requires:
+            - build
+            - lint
+            - back-test-e2e
+            - back-test-unit
+          filters:
+            branches:
+              only: main
+      - server-doc-deploy:
+          requires:
+            - server-doc-build
+          filters:
+            branches:
+              only: main