diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc7de6f5926bc5cbd4c872614c6648ca210165af..88fcdba130eaf56d0262a48aeaddcd6443d653bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   REGISTRY_USER: chembl/eubopen
   APPLICATION: eubopen-web
-  SERVER_IMAGE_TAG_STAGING: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}:staging
+  SERVER_IMAGE_TAG_STAGING: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}_staging
   SERVER_IMAGE_TAG_LATEST_STAGING: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:latest_staging
-  SERVER_IMAGE_TAG_PROD_HX: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}:prod_hx
+  SERVER_IMAGE_TAG_PROD_HX: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}_prod_hx
   SERVER_IMAGE_TAG_LATEST_PROD_HX: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:latest_prod_hx
-  SERVER_IMAGE_TAG_PROD_HL: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}:prod_hl
+  SERVER_IMAGE_TAG_PROD_HL: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}_prod_hl
   SERVER_IMAGE_TAG_LATEST_PROD_HL: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:latest_prod_hl
   DOCKER_DRIVER: overlay
   CONFIGS_FOLDER: run_config