diff --git a/.travis.yml b/.travis.yml
index b1e3667a6b..e9594c9c15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,8 @@ env:
         - REDIRECT_URI=/
         - BROWSER_RUN=true
         - MAXINSTANCES=2
-        - PROXY_HOST_ADF=$E2E_HOST
+        - PROXY_HOST_ECM=$E2E_HOST
+        - PROXY_HOST_BPM=$E2E_HOST
         - HOST_SSO=$HOST_SSO
         - USERNAME_ADF=$E2E_USERNAME
         - PASSWORD_ADF=$E2E_PASSWORD
@@ -378,6 +379,7 @@ jobs:
               - FOLDER="process-services-cloud/form-field"
               - PROVIDER="ALL"
               - AUTH_TYPE="OAUTH"
+              - PROXY_HOST_BPM=$E2E_HOST_APA
 
         - stage: "e2e Test"
           name: "Process Cloud : People"
@@ -395,6 +397,7 @@ jobs:
               - FOLDER="process-services-cloud/people"
               - PROVIDER="ALL"
               - AUTH_TYPE="OAUTH"
+              - PROXY_HOST_BPM=$E2E_HOST_APA
 
         - stage: "e2e Test"
           name: "Process Cloud : Process"
@@ -412,6 +415,7 @@ jobs:
               - FOLDER="process-services-cloud/process"
               - PROVIDER="ALL"
               - AUTH_TYPE="OAUTH"
+              - PROXY_HOST_BPM=$E2E_HOST_APA
 
         - stage: "e2e Test"
           name: "Process Cloud : Start Task"
@@ -429,6 +433,7 @@ jobs:
               - FOLDER="process-services-cloud/start-task"
               - PROVIDER="ALL"
               - AUTH_TYPE="OAUTH"
+              - PROXY_HOST_BPM=$E2E_HOST_APA
 
         - stage: "e2e Test"
           name: "Process Cloud : Tasks List"
@@ -446,6 +451,7 @@ jobs:
              - FOLDER="process-services-cloud/task-list"
              - PROVIDER="ALL"
              - AUTH_TYPE="OAUTH"
+             - PROXY_HOST_BPM=$E2E_HOST_APA
 
         - stage: Check bundle
           script:
diff --git a/e2e/test.config.js b/e2e/test.config.js
index edd4287d96..1989491156 100644
--- a/e2e/test.config.js
+++ b/e2e/test.config.js
@@ -9,8 +9,8 @@ const HOST = process.env.URL_HOST_ADF;
 
 const LOG = process.env.LOG;
 
-const HOST_ECM = process.env.PROXY_HOST_ADF || HOST || 'ecm';
-const HOST_BPM = process.env.PROXY_HOST_ADF || HOST || 'bpm';
+const HOST_ECM = process.env.PROXY_HOST_ECM || HOST || 'ecm';
+const HOST_BPM = process.env.PROXY_HOST_BPM || HOST || 'bpm';
 
 const PROVIDER = process.env.PROVIDER ? process.env.PROVIDER : 'ALL';
 const AUTH_TYPE = process.env.AUTH_TYPE ? process.env.AUTH_TYPE : 'BASIC';
diff --git a/scripts/ci/check-env/check-ps-cloud-env.sh b/scripts/ci/check-env/check-ps-cloud-env.sh
index 03f4ccb794..e59b061257 100755
--- a/scripts/ci/check-env/check-ps-cloud-env.sh
+++ b/scripts/ci/check-env/check-ps-cloud-env.sh
@@ -6,4 +6,4 @@ cd $DIR/../../../
 
 echo "====== Check PS Cloud UP ====="
 
-./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env --host "$E2E_HOST" --modelerUsername "$E2E_MODELER_USERNAME" --modelerPassword "$E2E_MODELER_PASSWORD" --devopsUsername "$E2E_DEVOPS_USERNAME" --devopsPassword "$E2E_DEVOPS_PASSWORD" --clientId 'alfresco' || exit 1
+./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env --oauth "$E2E_HOST" --host "$E2E_HOST_APA" --modelerUsername "$E2E_MODELER_USERNAME" --modelerPassword "$E2E_MODELER_PASSWORD" --devopsUsername "$E2E_DEVOPS_USERNAME" --devopsPassword "$E2E_DEVOPS_PASSWORD" --clientId 'alfresco' || exit 1