diff --git a/OpenShift.gitlab-ci.yml b/OpenShift.gitlab-ci.yml
index d3bb388a1e73c7e2a08959908b015026f6b1c656..636cb0a9a99a77b914a45053b7d288b951625768 100644
--- a/OpenShift.gitlab-ci.yml
+++ b/OpenShift.gitlab-ci.yml
@@ -41,7 +41,7 @@ review:
     APP: $CI_COMMIT_REF_NAME
     APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
     on_stop: stop-review
   only:
@@ -59,7 +59,7 @@ stop-review:
     APP: $CI_COMMIT_REF_NAME
     GIT_STRATEGY: none
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   only:
     - branches
diff --git a/autodeploy/Kubernetes-with-canary.gitlab-ci.yml b/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
index ed77fd866e7bef8fa45e6888718866a580a50cae..555a51d35b9488c58c1d0b1da9b134a21d929848 100644
--- a/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
+++ b/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
@@ -59,7 +59,7 @@ review:
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -74,7 +74,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   allow_failure: true
diff --git a/autodeploy/Kubernetes.gitlab-ci.yml b/autodeploy/Kubernetes.gitlab-ci.yml
index 9312bff594ab4503e89f20a1d3c49f6c07656fd5..ee830ec2eb0372618c76ac1d01facd2889fba77a 100644
--- a/autodeploy/Kubernetes.gitlab-ci.yml
+++ b/autodeploy/Kubernetes.gitlab-ci.yml
@@ -23,8 +23,6 @@ build:
 
 production:
   stage: production
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
@@ -36,8 +34,6 @@ production:
 
 staging:
   stage: staging
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
@@ -48,12 +44,10 @@ staging:
 
 review:
   stage: review
-  variables:
-    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -68,7 +62,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   only:
diff --git a/autodeploy/OpenShift.gitlab-ci.yml b/autodeploy/OpenShift.gitlab-ci.yml
index 456f3d0a63f64b20350612b1f9b3de9b9c365cb1..27c9107e0d795ca6eeed840eb711a5e02eac9ec1 100644
--- a/autodeploy/OpenShift.gitlab-ci.yml
+++ b/autodeploy/OpenShift.gitlab-ci.yml
@@ -53,7 +53,7 @@ review:
   script:
     - command deploy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
@@ -68,7 +68,7 @@ stop_review:
   script:
     - command destroy
   environment:
-    name: review/$CI_COMMIT_REF_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   only: