diff --git a/apps/auth-e2e/src/support/test-setup.ts b/apps/auth-e2e/src/support/test-setup.ts
index 4356c82..4ca8a61 100644
--- a/apps/auth-e2e/src/support/test-setup.ts
+++ b/apps/auth-e2e/src/support/test-setup.ts
@@ -4,7 +4,7 @@ import axios from 'axios';
 
 module.exports = async function () {
   // Configure axios for tests to use.
-  const host = process.env.HOST ?? 'localhost';
-  const port = process.env.PORT ?? '15003';
+  const host = process.env.AUTH_HOST ?? 'localhost';
+  const port = process.env.AUTH_PORT ?? '15003';
   axios.defaults.baseURL = `http://${host}:${port}`;
 };
diff --git a/apps/gateway-e2e/src/support/test-setup.ts b/apps/gateway-e2e/src/support/test-setup.ts
index ae6198b..5ebd0ab 100644
--- a/apps/gateway-e2e/src/support/test-setup.ts
+++ b/apps/gateway-e2e/src/support/test-setup.ts
@@ -4,7 +4,7 @@ import axios from 'axios';
 
 module.exports = async function () {
   // Configure axios for tests to use.
-  const host = process.env.HOST ?? 'localhost';
-  const port = process.env.PORT ?? '3333';
+  const host = process.env.GATEWAY_HOST ?? 'localhost';
+  const port = process.env.GATEWAY_PORT ?? '3333';
   axios.defaults.baseURL = `http://${host}:${port}`;
 };
diff --git a/apps/tasks-e2e/src/support/test-setup.ts b/apps/tasks-e2e/src/support/test-setup.ts
index 9e144c4..74ebd55 100644
--- a/apps/tasks-e2e/src/support/test-setup.ts
+++ b/apps/tasks-e2e/src/support/test-setup.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
 
 module.exports = async function () {
   // Configure axios for tests to use.
-  const host = process.env.HOST ?? 'localhost';
-  const port = process.env.PORT ?? '15002';
+  const host = process.env.TASKS_HOST ?? 'localhost';
+  const port = process.env.TASKS_PORT ?? '15002';
   axios.defaults.baseURL = `http://${host}:${port}`;
 };
diff --git a/apps/users-e2e/src/support/test-setup.ts b/apps/users-e2e/src/support/test-setup.ts
index 6cfc4b0..99887d7 100644
--- a/apps/users-e2e/src/support/test-setup.ts
+++ b/apps/users-e2e/src/support/test-setup.ts
@@ -4,7 +4,7 @@ import axios from 'axios';
 
 module.exports = async function () {
   // Configure axios for tests to use.
-  const host = process.env.HOST ?? 'localhost';
-  const port = process.env.PORT ?? '15001';
+  const host = process.env.USERS_HOST ?? 'localhost';
+  const port = process.env.USERS_PORT ?? '15001';
   axios.defaults.baseURL = `http://${host}:${port}`;
 };