diff --git a/loction_server/siro/connect.php b/loction_server/siro/connect.php
index ad1d5684..32a8cbbc 100755
--- a/loction_server/siro/connect.php
+++ b/loction_server/siro/connect.php
@@ -33,18 +33,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 // $TRIPZ_SMTP_PASSWORD=getenv('TRIPZ_SMTP_PASSWORD');
- $dbname = getenv('dbname');
 // --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_TRACKING_NAME') ?: (getenv('dbname') ?: 'locationDB');
+    $dbHost = getenv('DB_TRACKING_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER'); // Still used for DB connection
-    $pass = getenv('PASS'); // Still used for DB connection
+    $user = getenv('DB_TRACKING_USER') ?: (getenv('USER') ?: 'root');
+    $pass = getenv('DB_TRACKING_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 //$con->exec("SET time_zone = '+03:00'");
     // --- JWT Authentication ---
diff --git a/loction_server/siro/jwtconnect.php b/loction_server/siro/jwtconnect.php
index d2f4fcc4..c954ecaf 100755
--- a/loction_server/siro/jwtconnect.php
+++ b/loction_server/siro/jwtconnect.php
@@ -33,18 +33,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 // $TRIPZ_SMTP_PASSWORD=getenv('TRIPZ_SMTP_PASSWORD');
- $dbname = getenv('dbname');
 // --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_TRACKING_NAME') ?: (getenv('dbname') ?: 'locationDB');
+    $dbHost = getenv('DB_TRACKING_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER'); // Still used for DB connection
-    $pass = getenv('PASS'); // Still used for DB connection
+    $user = getenv('DB_TRACKING_USER') ?: (getenv('USER') ?: 'root');
+    $pass = getenv('DB_TRACKING_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 //$con->exec("SET time_zone = '+03:00'");
     // --- JWT Authentication ---
diff --git a/payment_server/v2/main/jwtconnect.php b/payment_server/v2/main/jwtconnect.php
index 87b2a6ff..8f39750d 100755
--- a/payment_server/v2/main/jwtconnect.php
+++ b/payment_server/v2/main/jwtconnect.php
@@ -50,19 +50,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
-
-// --- Database Connection ---
+// --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
-    $pass = getenv('PASS');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
     // --- Load Functions ---
diff --git a/payment_server/v2/main/loginWalletAdmin.php b/payment_server/v2/main/loginWalletAdmin.php
index 7af4789d..3a10d7af 100755
--- a/payment_server/v2/main/loginWalletAdmin.php
+++ b/payment_server/v2/main/loginWalletAdmin.php
@@ -52,10 +52,11 @@ try {
     }
 
     // --- الاتصال بقاعدة البيانات ---
-    $dbuser = getenv('USER');
-    $dbpass = getenv('PASS');
-    $dbname = getenv('dbname');
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
+    $dbuser = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
+    $dbpass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
 
     $con = new PDO($dsn, $dbuser, $dbpass, [
         PDO::ATTR_EMULATE_PREPARES => false,
diff --git a/payment_server/v2/main/ride/ecash/driver/webhook_connect.php b/payment_server/v2/main/ride/ecash/driver/webhook_connect.php
index 2615948c..ca8966a4 100755
--- a/payment_server/v2/main/ride/ecash/driver/webhook_connect.php
+++ b/payment_server/v2/main/ride/ecash/driver/webhook_connect.php
@@ -19,18 +19,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
 // --- Database Connection ONLY ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES   => false,
         PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
-    $pass = getenv('PASS');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
 } catch (PDOException $e) {
diff --git a/payment_server/v2/main/ride/ecash/passenger/webhook_connect.php b/payment_server/v2/main/ride/ecash/passenger/webhook_connect.php
index 2615948c..ca8966a4 100755
--- a/payment_server/v2/main/ride/ecash/passenger/webhook_connect.php
+++ b/payment_server/v2/main/ride/ecash/passenger/webhook_connect.php
@@ -19,18 +19,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
 // --- Database Connection ONLY ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES   => false,
         PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
-    $pass = getenv('PASS');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
 } catch (PDOException $e) {