diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8fd3c12..8bb829f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -101,63 +101,26 @@ jobs:
             git push https://heroku:02467a97-3871-4afd-95ab-2b1a1c190165@git.heroku.com/warm-fortress-97103.git HEAD:main
    
    
-  build_docker:
-    environment:
-        IMAGE_NAME: etiamayedze/tp_devops_final_backend
-    docker:
-      - image: circleci/buildpack-deps:stretch
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: docker image build --tag $IMAGE_NAME:app .
-      - run: docker save -o image.tar $IMAGE_NAME
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./image.tar 
-            
-  publish_image:
+  
+
+  docker-build-and-push:
     docker:
-      - image: circleci/buildpack-deps:stretch
+      - image: docker:17.05.0-ce-git
     steps:
       - checkout
-      - attach_workspace:
-          at: /tmp/workspace
       - setup_remote_docker
-      - run: docker load -i /tmp/workspace/image.tar
       - run:
-          command:
-#            docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p 'DOCKERPASSWORD'
-#            echo "$DOCKERPASSWORD" | docker login --username etiamayedze --password-stdin
-#            docker tag etiamayedze/docker-tp-ci:app etiamayedze/tp_devops_final_backend:$CIRCLE_BUILD_NUM
-#            docker tag etiamayedze/docker-tp-ci:app etiamayedze/tp_devops_final_backend:latest
-#            docker push etiamayedze/docker-tp-ci:latest
-#            docker push etiamayedze/docker-tp-ci:$CIRCLE_BUILD_NUM
-            docker login -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD
-            docker tag app $DOCKER_HUB_USER_ID/tp_devops_final_backend:$CIRCLE_BUILD_NUM
-            docker tag app $DOCKER_HUB_USER_ID/tp_devops_final_backend:latest
-            docker push $DOCKER_HUB_USER_ID/tp_devops_final_backend:$CIRCLE_BUILD_NUM
-            docker push $DOCKER_HUB_USER_ID/tp_devops_final_backend:latest            
-   
-
-#  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 'DOCKERPASSWORD'
-#            docker tag app $DOCKER_HUB_USER_ID/my-python-app:$CIRCLE_BUILD_NUM
-#            docker tag app $DOCKER_HUB_USER_ID/my-python-app:latest
-#            docker push $DOCKER_HUB_USER_ID/my-python-app:$CIRCLE_BUILD_NUM
-#            docker push $DOCKER_HUB_USER_ID/my-python-app:latest
+          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 'DOCKERPASSWORD'
+            docker tag app $DOCKER_HUB_USER_ID/my-python-app:$CIRCLE_BUILD_NUM
+            docker tag app $DOCKER_HUB_USER_ID/my-python-app:latest
+            docker push $DOCKER_HUB_USER_ID/my-python-app:$CIRCLE_BUILD_NUM
+            docker push $DOCKER_HUB_USER_ID/my-python-app:latest
 
 
             
@@ -175,10 +138,7 @@ workflows:
 #      - docker-build-and-push:
 #          context:
 #            - docker 
-      - build_docker
-      - publish_image:
-            context: 
-                - docker
+      - docker-build-and-push
             requires:
-                - build_docker
+                - build
             
\ No newline at end of file