diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index 556d233a44d692d044d3b2101c3c1c51d8d1d436..d051f67c5a0a8dbe0b8bd74d51a857aaae67500e 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -70,9 +70,9 @@ deploy_ocf_staging:
       echo "### download dependencies###"
       helm dependency build helm/capif
       echo "### updating capif###"
-      helm upgrade --install -n NAMESPACE_DEV ocf-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \
-      --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \
-      --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING" \
+      helm upgrade --install -n $NAMESPACE_DEV ocf-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set nginx.nginx.env.registerHostname=register-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING" \
       --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \
       --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \