diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2c848606191297e3efa084c5bdccabd3b506757..9a73dc0f0e2616332e36412b680680ef03294dc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   VAULT_ADDR: "https://${CLUSTER_ADDR}:8200"
 
 before_script:
-  - if [ $CI_COMMIT_REF_NAME == 'master' ]; then PREFIX='PROD_'; else PREFIX='DEV_'; fi
+  - if [[ $CI_COMMIT_REF_NAME == 'master' || -n ${CI_COMMIT_TAG+x} ]]; then PREFIX='PROD_'; else PREFIX='DEV_'; fi
   - eval 'vars=${!'"$PREFIX"'@}'
   - for v in $vars; do eval 'export '"${v#$PREFIX}"'=$'$v; done