diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f03414abf6ba716b5961ecabb4ea61442ab817ef..fc03a0c0da459d86a2827dca819e7da5c1ffe0d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,13 @@ build:
   stage: build
   services:
     - docker:18.09.6-dind
-  before_script:
-    - export TAG=${CI_COMMIT_TAG:-latest}
   script:
+    - echo $CI_COMMIT_TAG
+    - export TAG=${CI_COMMIT_TAG:-latest}
+    - echo $TAG
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.e-biz.fr
     - ./build.sh $TAG $CI_REGISTRY_IMAGE
     - docker push $CI_REGISTRY_IMAGE:$TAG
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
\ No newline at end of file
+    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_TAG != null'
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 139cf5c72db8f49ccfd776688aee39f88e72b3f0..f60db1450dc52e5e537ccc59e96f05ee8c617122 100755
--- a/build.sh
+++ b/build.sh
@@ -5,4 +5,6 @@ set -e
 TAG=${1:-latest}
 REGISTRY=${2:-theia}
 
+echo $TAG
+
 docker build --build-arg "version=$TAG" . -t "$REGISTRY:$TAG" --no-cache
\ No newline at end of file