diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6a7b004ad4797d68f6fcbb91150b8596e0e84b2..e4688ce940240259bb27bbfe53d926a0b1b62cf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,16 @@
 variables:
   docker_registry_user: "robot$$gitlab"
-  docker_image_tag: "ubuntu_base"
 
 stages:
   - build
 
-build_base:
+build_image:
   stage: build
   script:
-    - docker build -f base/Dockerfile -t docker-registry.ebrains.eu/clb-jupyter-image/base:$docker_image_tag .
+    - docker build -f base/Dockerfile -t docker-registry.ebrains.eu/clb-jupyter-image/ebrains:$CI_COMMIT_TAG .
     - docker login -u $docker_registry_user -p $docker_registry_prod_token docker-registry.ebrains.eu
-    - docker push docker-registry.ebrains.eu/clb-jupyter-image/base:$docker_image_tag
+    - docker push docker-registry.ebrains.eu/clb-jupyter-image/ebrains:$CI_COMMIT_TAG
+  only:
+    - tags
   tags:
     - shell-runner