diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e19ffd8a9..1042bbe51a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -103,6 +103,20 @@ jobs:
         - store_artifacts:
             path: /tmp/circleci-test-results
 
+    build_phraseanet-setup:
+        machine:
+          image: ubuntu-2004:202201-02
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build --target phraseanet-setup -t ${AWS_ACCOUNT_URL}/phraseanet-setup:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-setup"
+                tag: "${CIRCLE_BRANCH}"
 
     build_phraseanet-fpm:
         machine:
@@ -149,6 +163,35 @@ jobs:
                 repo: "phraseanet-nginx"
                 tag: "${CIRCLE_BRANCH}"
 
+    build_phraseanet-db:
+        machine:
+          image: ubuntu-2004:202201-02
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet/
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build -f ./docker/db/Dockerfile -t ${AWS_ACCOUNT_URL}/phraseanet-db:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-db"
+                tag: "${CIRCLE_BRANCH}"
+     
+    build_phraseanet-elasticsearch:
+        machine:
+          image: ubuntu-2004:202201-02
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet/docker/elasticsearch
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build -f ./docker/elasticsearch/Dockerfile  -t ${AWS_ACCOUNT_URL}/phraseanet-elasticsearch:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-elasticsearch"
+                tag: "${CIRCLE_BRANCH}"
 
 workflows:
     version: 2
@@ -157,9 +200,15 @@ workflows:
             - build
     newfashion:
         jobs:
+            - build_phraseanet-setup:
+                context: "AWS Paris"
             - build_phraseanet-fpm:
-                context: "AWS London"
+                context: "AWS Paris"
             - build_phraseanet-worker:
-                context: "AWS London"
+                context: "AWS Paris"
             - build_phraseanet-nginx:
-                context: "AWS London"
+                context: "AWS Paris"
+            - build_phraseanet-db:
+                context: "AWS Paris"
+            - build_phraseanet-elasticsearch:
+                context: "AWS Paris"