diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0e6aa7e..75532ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,10 +2,7 @@ version: 2.1
 workflows:
   build_and_test:
     jobs:
-      - docker_build
-      - build:
-          requires:
-            - docker_build
+      - build
       - lint:
           requires:
             - build
@@ -18,6 +15,13 @@ workflows:
       - doc:
           requires:
             - build
+      - docker_build:
+          requires:
+            - build
+            - doc
+            - tests
+            - e2e
+            - lint
 
 
 jobs:
@@ -100,14 +104,10 @@ jobs:
       - restore_cache:
           key: yarn-cache{{ checksum "yarn.lock" }}
       - setup_remote_docker
-      - run: docker image build --tag julienm1/my-awesome-ci-expr:CIRCLE_BUILD_NUM .
+      - run: docker image build --tag julienm1/my-awesome-ci-expr:$CIRCLE_BUILD_NUM .
       - run: docker save -o image.tar julienm1/my-awesome-ci-expr
       - run: docker login -u "julienm1" -p "Vajumacl04"
-      - run: docker push julienm1/my-awesome-ci-expr:CIRCLE_BUILD_NUM
-      - persist_to_workspace:
-          root: ./
-          paths:
-            - ./docker/image.tar
+      - run: docker push julienm1/my-awesome-ci-expr:$CIRCLE_BUILD_NUM
       - save_cache:
           key: yarn-cache{{ checksum "yarn.lock" }}
           paths: