diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbef016a70a1c9d4193e42d6326d844976ebeebd..2d4e3f4ce7dc6f70a1e7419212429ae9491c08c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,10 +61,10 @@ build:
     - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
     - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/
     - docker image ls
-    - docker tag ""$CI_REGISTRY_IMAGE/pvs_core"" ""$CI_REGISTRY_IMAGE/pvs_core:latest"
-    - docker tag "$CI_REGISTRY_IMAGE/pvs_cache" "$CI_REGISTRY_IMAGE/pvs_cache:latest"
-    - docker tag "$CI_REGISTRY_IMAGE/pvs_preprocessor" "$CI_REGISTRY_IMAGE/pvs_preprocessor:latest"
-    - docker tag "$CI_REGISTRY_IMAGE/pvs_client" "$CI_REGISTRY_IMAGE/pvs_client:latest"
+    - docker tag "$CI_REGISTRY_IMAGE/pvs_core:CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_core:latest"
+    - docker tag "$CI_REGISTRY_IMAGE/pvs_cache:CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_cache:latest"
+    - docker tag "$CI_REGISTRY_IMAGE/pvs_preprocessor:CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_preprocessor:latest"
+    - docker tag "$CI_REGISTRY_IMAGE/pvs_client:CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE/pvs_client:latest"
     - chmod +x env_setup.sh wait_for_container.sh
     - ./env_setup.sh
     - mkdir data