diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04d2b3cb..ef2c5b8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,6 @@ image-test:
   tags:
     - docker
 
-
 image-build:
   image: registry.gitlab.com/openstapps/projectmanagement/builder
   stage: publish
@@ -66,11 +65,15 @@ image-build:
   services:
     - docker:dind
   script:
+    - export VERSION=$(echo -n "$CI_BUILD_REF_NAME" | cut -c 2-)
+    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE
+    - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION
+    - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH$CI_COMMIT_REF_NAME:latest .
-    - docker push $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH$CI_COMMIT_REF_NAME:latest
+    - docker build -t $IMAGETAG_VERSION -t $IMAGETAG_LATEST .
+    - docker push $IMAGETAG_BASE
   only:
-    - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
+    - /^v[0-9]+\.[0-9]+\.[0-9]+$/
   tags:
     - docker