diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56b2e25a7..84bd0c6c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,13 +176,15 @@ deploy production:
 .deploy-test: &deploy-test
     <<: *deploy
     rules:
-        - if: $CI_COMMIT_TAG =~ /^deploy-.*/ && $CI_COMMIT_TAG_MESSAGE == 'test/$ENVIRONMENT_INSTANCE'
-        - if: $CI_COMMIT_REF_PROTECTED == 'true' && $DEPLOY_TARGET == 'test/$ENVIRONMENT_INSTANCE'
+        - if: $CI_COMMIT_TAG =~ /^deploy-.*/ && $CI_COMMIT_TAG_MESSAGE == $ENVIRONMENT_NAME
+        - if: $CI_COMMIT_REF_PROTECTED == 'true' && $DEPLOY_TARGET == $ENVIRONMENT_NAME
         - if: $CI_COMMIT_REF_PROTECTED == 'true'
           when: manual
     environment:
         name: test/$ENVIRONMENT_INSTANCE
         url: https://$ENVIRONMENT_DOMAIN
+    variables:
+        ENVIRONMENT_NAME: 'test/$ENVIRONMENT_INSTANCE'
     allow_failure: true
 
 deploy test: