diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5dfb2a8b8d9b60e65e24db659cab25700af728b..9a07996c889220aaa6629549e3407efab5fb2f5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,8 @@ stages:
   - quality
   - test
   - build
-  - push-build
-  - deploy
+  - push-deploy
+  - update-instances
   - publish
 
 variables:
@@ -112,64 +112,78 @@ test:
     - master
     - merge_requests
 
-build:
+build-dev:
   stage: build
   before_script:
     - apk add git
     - apk add bash
   script:
     - yarn
-    - yarn build
+    - yarn build-dev
   only:
-    - dev
-    - master
     - merge_requests
   artifacts:
+    expire_in: 1 day
     paths:
       - build/
 
-br_build_test:
-  stage: push-build
+build-prod:
+  stage: build
+  before_script:
+    - apk add git
+    - apk add bash
+  script:
+    - yarn
+    - yarn build
+  rules:
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build/
+
+deploy-dev:
+  stage: push-deploy
   before_script:
     - apk add git
     - apk add bash
   script:
     - yarn
-    - ls build
     - git config --global user.name build-pipeline
     - git config --global user.email "$GIT_USER"
     - git config --global user.password "$GIT_PWD"
     - git config user.email "$GIT_USER"
     - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo.git
     - git config --global credential.helper store
-    - yarn deploy-test
+    - yarn deploy-dev
   only:
     - merge_requests
-  needs:
-    - build
   when: manual
+  needs:
+    - build-dev
 
-br_build_dev:
-  stage: push-build
+deploy-test:
+  stage: push-deploy
   before_script:
     - apk add git
     - apk add bash
   script:
     - yarn
+    - ls build
     - git config --global user.name build-pipeline
     - git config --global user.email "$GIT_USER"
     - git config --global user.password "$GIT_PWD"
     - git config user.email "$GIT_USER"
     - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/factory/llle_project/ecolyo.git
     - git config --global credential.helper store
-    - yarn deploy-dev
+    - yarn deploy-test
   only:
     - dev
   needs:
-    - build
+    - build-dev
 
-br_build:
-  stage: push-build
+deploy:
+  stage: push-deploy
   before_script:
     - apk add git
     - apk add bash
@@ -185,41 +199,40 @@ br_build:
   only:
     - master
   needs:
-    - build
+    - build-dev
 
-deploy_test:
-  stage: deploy
+update-dev:
+  stage: update-instances
   tags:
     - deploy-alpha
   script:
     - cd /root/ecolyo-infra-scripts/cicid_scripts
-    - './update_ecolyo_dev.sh'
+    - './update_ecolyo_dev_dev.sh'
   only:
     - merge_requests
   environment:
     name: dev
     url: https://ecolyo.dev.cozy.self-data.alpha.grandlyon.com/
-  when: manual
   needs:
-    - br_build_test
+    - deploy-dev
 
-deploy_demo:
-  stage: deploy
+update-demo:
+  stage: update-instances
   tags:
     - deploy-alpha
   script:
     - cd /root/ecolyo-infra-scripts/cicid_scripts
-    - './update_ecolyodemo_dev.sh'
+    - './update_ecolyodemo_test.sh'
   only:
     - dev
   environment:
     name: ecolyodemo
     url: https://ecolyo.ecolyodemo.cozy.self-data.alpha.grandlyon.com/
   needs:
-    - br_build_dev
+    - deploy-test
 
-deploy_all:
-  stage: deploy
+update-all:
+  stage: update-instances
   tags:
     - deploy-alpha
   script:
@@ -228,7 +241,7 @@ deploy_all:
   only:
     - master
   needs:
-    - br_build
+    - deploy
 
 publish:
   stage: publish
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1f1e7b0bf6bb476eaa432a6a0377fc9abc92a62c..7b04b7e9ef37d8f0dc2c9fdf2f3ce4221357a219 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -41,6 +41,7 @@
     "backoffice",
     "barchart",
     "camelcase",
+    "cicid",
     "CONSO",
     "cozycloud",
     "dacc",
@@ -57,6 +58,7 @@
     "ecogestures",
     "ecolyo",
     "Ecolyo",
+    "ecolyodemo",
     "eglgrandlyon",
     "elec",
     "enedis",
@@ -78,6 +80,7 @@
     "konnector",
     "konnectors",
     "lastname",
+    "llle",
     "Lugdunum",
     "legalnotice",
     "luxon",
@@ -88,6 +91,7 @@
     "multifluid",
     "MULTIFLUID",
     "mutlifluid",
+    "numerique",
     "Picto",
     "profiletype",
     "PROFILETYPE",