diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f030ff..78f41a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,6 +12,10 @@ globals:
     image: &dockerhub-image devops-tpfinal-front
   backends:
     prod: &prod-backend-url https://tpfinal-devops-back.herokuapp.com
+    dev: &dev-backend-url https://tpfinal-devops-back-dev.herokuapp.com
+  netlify.
+    prod-siteid: &prod-siteid 4704e2ec-1222-4a40-be89-4a676233b5c9
+  develop-siteid: &dev-siteid d60f86f2-dc79-4d4d-b661-00f60e73e7a9
 
 
 # --- Commands --- #
@@ -68,7 +72,8 @@ jobs:
   docker-build:
     <<: *shared-config
     parameters:
-      backendurl:
+      tags:
+        default: ""
         type: string
     environment:
       DOCKER_HUB_PWD: *dockerhub-password
@@ -80,16 +85,17 @@ jobs:
           version: 20.10.7
       - run:
           name: Build docker image
-          command: |
-            docker build -t app --build-arg backend_url=<<parameters.backendurl>> .
+          command: docker build -t app .
       - deploy:
           name: Publish image to Docker Hub
           command: |
             echo $DOCKERHUB_PASSWORD | docker login -u $DOCKER_HUB_USER_ID --password-stdin
-            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
-            docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
-            docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM
-            docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest
+
+            for tag in <<parameters.tags>>
+            do
+              docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
+              docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag
+            done
 
   build-netlify:
     <<: *shared-config
@@ -115,7 +121,13 @@ jobs:
 
   deploy-netlify:
     <<: *shared-config
+    parameters:
+      siteurl:
+        type: string
     working_directory: ~/todoapp
+    environment:
+      NETLIFY_SITE_ID: <<parameters.siteurl>>
+
     steps:
       - attach_workspace:
           at: /tmp
@@ -143,6 +155,7 @@ workflows:
             - build
 
       - build-netlify:
+          name: build-netlify-prod
           backendurl: *prod-backend-url
           requires:
             - test
@@ -152,15 +165,40 @@ workflows:
               only:
                 - main
 
+      - build-netlify:
+          name: build-netlify-dev
+          backendurl: *dev-backend-url
+          requires:
+            - test
+            - lint
+#          filters:
+#            branches:
+#              only:
+#                - develop
+
       - deploy-netlify:
+          name: deploy-netlify-prod
+          siteid: *prod-siteid
           requires:
-            - build-netlify
+            - build-netlify-prod
           filters:
             branches:
               only:
                 - main
 
+      - deploy-netlify:
+          name: deploy-netlify-dev
+          siteid: *dev-siteid
+          requires:
+            - build-netlify-dev
+#          filters:
+#            branches:
+#              only:
+#                - develop
+
       - docker-build:
+          name: docker-build-prod
+          tags: "latest $CIRCLE_BUILD_NUM"
           backendurl: *prod-backend-url
           requires:
             - test
@@ -169,3 +207,15 @@ workflows:
             branches:
               only:
                 - main
+
+      - docker-build:
+          name: docker-build-dev
+          tags: "dev $CIRCLE_BUILD_NUM-dev"
+          backendurl: *prod-backend-url
+          requires:
+            - test
+            - lint
+#          filters:
+#            branches:
+#              only:
+#                - develop