diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1481038b..bc8964eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,9 +33,6 @@ variables:
     description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of
       sovereign-workplace-env included above."
     value: "dev"
-  BASE_DOMAIN:
-    description: "Define the Cluster Base Domain."
-    value: "souvap.cloud"
   MASTER_PASSWORD_WEB_VAR:
     description: "Optional: Provide a passphrase to be used for password generation."
     value: ""
@@ -150,9 +147,6 @@ variables:
   UMS_TESTS_BRANCH:
     description: "Branch of E2E test suite of SouvAP Dev team"
     value: "main"
-  # please use the following set of variables with normalized names:
-  DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
-  ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
 
 .deploy-common:
   cache: {}
@@ -204,7 +198,6 @@ env-cleanup:
 env-start:
   environment:
     name: "${NAMESPACE}"
-    url: "https://portal.${DOMAIN}"
     on_stop: "env-stop"
   extends: ".deploy-common"
   image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"
@@ -443,10 +436,6 @@ run-tests:
   extends: ".deploy-common"
   environment:
     name: "${NAMESPACE}"
-  tags:
-    - "docker"
-    - "kubernetes"
-    - "${CLUSTER}"
   stage: "tests"
   rules:
     - if: >
@@ -503,10 +492,6 @@ run-souvap-dev-tests:
   extends: ".deploy-common"
   environment:
     name: "${NAMESPACE}"
-  tags:
-    - "docker"
-    - "kubernetes"
-    - "${CLUSTER}"
   stage: "tests"
   rules:
     - if: >
diff --git a/docs/ci.md b/docs/ci.md
index 4cdbd2bb..eff7bda0 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -18,13 +18,12 @@ The project includes a `.gitlab-ci.yml` that allows you to execute the deploymen
 
 When starting the pipeline through the Gitlab UI, you will be queried for some variables plus the following ones:
 
-- `BASE_DOMAIN`: The base domain the SWP will use. For example: `souvap.cloud`
+- `DOMAIN` = The domain to deploy to.
+- `ISTIO_DOMAIN` = istio.`DOMAIN`
 - `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed
 - `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD`
 
 Based on your input, the following variables will be set:
-- `DOMAIN` = `NAMESPACE`.`BASE_DOMAIN`
-- `ISTIO_DOMAIN` = istio.`DOMAIN`
 - `MASTER_PASSWORD` = `MASTER_PASSWORD_WEB_VAR`. If `MASTER_PASSWORD_WEB_VAR`
   is not set, the default for `MASTER_PASSWORD` will be used, unless you set
   `MASTER_PASSWORD` as a masked CI/CD variable in Gitlab to supersede the default.