diff --git a/auth-service/src/main.rs b/auth-service/src/main.rs
index f9010d2..a1dd3cb 100644
--- a/auth-service/src/main.rs
+++ b/auth-service/src/main.rs
@@ -25,13 +25,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .init();
 
     // Set the gRPC server address
-    let addr = env::var("AUTH_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let port = env::var("AUTH_SERVICE_PORT").unwrap_or_else(|_| "50051".to_string());
     let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8081".to_string());
 
     let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "auth-service".to_string());
-    let service_address = addr.as_str();
+    let service_address = env::var("AUTH_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let service_port = port.clone();
     let health_check_url = format!("http://{}:{}/health", service_address, health_port);
     let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
@@ -45,7 +45,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         &consul_url,
         service_id.as_str(),
         service_name.as_str(),
-        service_address,
+        service_address.as_str(),
         service_port.parse().unwrap_or(50052),
         tags,
         meta,
diff --git a/character-service/src/main.rs b/character-service/src/main.rs
index e30b52a..ca676c5 100644
--- a/character-service/src/main.rs
+++ b/character-service/src/main.rs
@@ -15,13 +15,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .init();
 
     // Set the gRPC server address
-    let addr = env::var("CHARACTER_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let port = env::var("CHARACTER_SERVICE_PORT").unwrap_or_else(|_| "50053".to_string());
     let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8083".to_string());
 
     let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "character-service".to_string());
-    let service_address = addr.as_str();
+    let service_address = env::var("CHARACTER_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let service_port = port.clone();
     let health_check_url = format!("http://{}:{}/health", service_address, health_port);
     let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         &consul_url,
         service_id.as_str(),
         service_name.as_str(),
-        service_address,
+        service_address.as_str(),
         service_port.parse().unwrap_or(50052),
         tags,
         meta,
diff --git a/database-service/src/main.rs b/database-service/src/main.rs
index 923dd3e..d7120a3 100644
--- a/database-service/src/main.rs
+++ b/database-service/src/main.rs
@@ -23,7 +23,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_max_level(Level::from_str(&env::var("LOG_LEVEL").unwrap_or_else(|_| "info".to_string())).unwrap_or_else(|_| Level::INFO))
         .init();
 
-    let addr = env::var("DATABASE_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let port = env::var("DATABASE_SERVICE_PORT").unwrap_or_else(|_| "50052".to_string());
     let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8080".to_string());
 
@@ -32,7 +32,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "database-service".to_string());
-    let service_address = addr.as_str();
+    let service_address = env::var("DATABASE_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());;
     let service_port = port.clone();
     let health_check_url = format!("http://{}:{}/health", service_address, health_port);
     let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
@@ -45,7 +45,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         &consul_url,
         service_id.as_str(),
         service_name.as_str(),
-        service_address,
+        service_address.as_str(),
         service_port.parse().unwrap_or(50052),
         tags,
         meta,
diff --git a/packet-service/src/main.rs b/packet-service/src/main.rs
index c1d28e1..e06f703 100644
--- a/packet-service/src/main.rs
+++ b/packet-service/src/main.rs
@@ -72,13 +72,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .init();
 
     // Set the gRPC server address
-    let addr = env::var("PACKET_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let port = env::var("PACKET_SERVICE_PORT").unwrap_or_else(|_| "4000".to_string());
     let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8082".to_string());
 
     let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "packet-service".to_string());
-    let service_address = addr.as_str();
+    let service_address = env::var("PACKET_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let service_port = port.clone();
     let health_check_url = format!("http://{}:{}/health", service_address, health_port);
     let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
@@ -92,7 +92,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         &consul_url,
         service_id.as_str(),
         service_name.as_str(),
-        service_address,
+        service_address.as_str(),
         service_port.parse().unwrap_or(50052),
         tags,
         meta,
diff --git a/world-service/src/main.rs b/world-service/src/main.rs
index f066b7f..bba100b 100644
--- a/world-service/src/main.rs
+++ b/world-service/src/main.rs
@@ -15,13 +15,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .init();
 
     // Set the gRPC server address
-    let addr = env::var("WORLD_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let port = env::var("WORLD_SERVICE_PORT").unwrap_or_else(|_| "50054".to_string());
     let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8084".to_string());
 
     let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "world-service".to_string());
-    let service_address = addr.as_str();
+    let service_address = env::var("WORLD_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
     let service_port = port.clone();
     let health_check_url = format!("http://{}:{}/health", service_address, health_port);
     let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
@@ -36,7 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         &consul_url,
         service_id.as_str(),
         service_name.as_str(),
-        service_address,
+        service_address.as_str(),
         service_port.parse().unwrap_or(50054),
         tags,
         meta,