diff --git a/OpenShift.gitlab-ci.yml b/OpenShift.gitlab-ci.yml
index bf697f72d836f07267b9e730435af248b413fe18..d3bb388a1e73c7e2a08959908b015026f6b1c656 100644
--- a/OpenShift.gitlab-ci.yml
+++ b/OpenShift.gitlab-ci.yml
@@ -39,10 +39,10 @@ review:
   stage: review
   variables:
     APP: $CI_COMMIT_REF_NAME
-    APP_HOST: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.$OPENSHIFT_DOMAIN
+    APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
   environment:
-    name: review/$CI_COMMIT_REF_NAME
-    url: http://$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.$OPENSHIFT_DOMAIN
+    name: review/$CI_COMMIT_REF_SLUG
+    url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
     on_stop: stop-review
   only:
     - branches
@@ -59,7 +59,7 @@ stop-review:
     APP: $CI_COMMIT_REF_NAME
     GIT_STRATEGY: none
   environment:
-    name: review/$CI_COMMIT_REF_NAME
+    name: review/$CI_COMMIT_REF_SLUG
     action: stop
   only:
     - branches
diff --git a/autodeploy/Kubernetes.gitlab-ci.yml b/autodeploy/Kubernetes.gitlab-ci.yml
index df5faa6c7f066697b22d0d9f009336d3958d63f9..c644560647f029cb3b4d21973a284b4fa9078891 100644
--- a/autodeploy/Kubernetes.gitlab-ci.yml
+++ b/autodeploy/Kubernetes.gitlab-ci.yml
@@ -24,12 +24,12 @@ build:
 production:
   stage: production
   variables:
-    CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: production
-    url: http://production.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   when: manual
   only:
     - master
@@ -37,24 +37,24 @@ production:
 staging:
   stage: staging
   variables:
-    CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: staging
-    url: http://staging.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   only:
     - master
 
 review:
   stage: review
   variables:
-    CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: review/$CI_COMMIT_REF_NAME
-    url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
     - branches
diff --git a/autodeploy/OpenShift.gitlab-ci.yml b/autodeploy/OpenShift.gitlab-ci.yml
index 4fc55fd676240a9e9e784bc6456bede98f9056e4..27c9107e0d795ca6eeed840eb711a5e02eac9ec1 100644
--- a/autodeploy/OpenShift.gitlab-ci.yml
+++ b/autodeploy/OpenShift.gitlab-ci.yml
@@ -24,12 +24,12 @@ build:
 production:
   stage: production
   variables:
-    CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: production
-    url: http://production.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
   when: manual
   only:
     - master
@@ -37,24 +37,24 @@ production:
 staging:
   stage: staging
   variables:
-    CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: staging
-    url: http://staging.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
   only:
     - master
 
 review:
   stage: review
   variables:
-    CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
+    CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
   script:
     - command deploy
   environment:
     name: review/$CI_COMMIT_REF_NAME
-    url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
+    url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
     on_stop: stop_review
   only:
     - branches