diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 810c6f09c59ce81aaac9b9358d4b3acc41d11f8d..3788c59771e83df6d59098081c5778a782177fdd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@ workflow:
   rules:
   - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" &&  ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH)
     variables:
-      DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_REF_SLUG-composer
-      DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG
-      DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG
+      DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_REF_SLUG-composer-$CI_COMMIT_SHORT_SHA
+      DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+      DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
       
 stages:
   - build_composer