diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7dee50f6..109b09a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,21 +47,17 @@ jobs:
               -n lecoffre-<<parameters.env>>
               --create-namespace
               --set lecoffreBack.image.repository='rg.fr-par.scw.cloud/lecoffre/back'
-              --set lecoffreBack.image.tag=$TAG         
+              --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7}         
 
 
 workflows:
   version: 2
   build-and-register-stg:
-    when:
-      and:
-        - equal: [ staging, << pipeline.git.branch >> ]
-        - << pipeline.git.tag >> 
     jobs:
       - build-push-docker-image:
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: staging
       - deploy-docker-image:
           env: stg
           requires:
@@ -69,19 +65,15 @@ workflows:
           context: 
             - sc-shared-prd
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: staging
 
   build-and-register-ppd:
-    when:
-      and:
-        - equal: [ preprod, << pipeline.git.branch >> ]
-        - << pipeline.git.tag >> 
     jobs:
       - build-push-docker-image:
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: preprod
       - deploy-docker-image:
           env: ppd
           requires:
@@ -89,19 +81,15 @@ workflows:
           context: 
             - sc-shared-prd
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: preprod
 
   build-and-register-prd:
-    when:
-      and:
-        - equal: [ main, << pipeline.git.branch >> ]
-        - << pipeline.git.tag >> 
     jobs:
       - build-push-docker-image:
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: main
       - deploy-docker-image:
           env: prd
           requires:
@@ -109,6 +97,6 @@ workflows:
           context: 
             - sc-shared-prd
           filters:
-            tags:
-              only: /^v.*/
+            branches:
+              only: main