diff --git a/test/infra/control/run-multi-group.bash b/test/infra/control/run-multi-group.bash
index 56012d8a0..0bf18ec96 100755
--- a/test/infra/control/run-multi-group.bash
+++ b/test/infra/control/run-multi-group.bash
@@ -92,13 +92,11 @@ run_single_group() {
     local log_file="${RESULTS_DIR}/${group}.log"
     local start_time end_time duration
 
-    # Add random delay (0-15 seconds) to stagger infrastructure startup
+    # Add random delay (1-20 seconds) to stagger infrastructure startup
     # This prevents resource contention when running multiple groups in parallel
-    local delay=$((RANDOM % 15))
-    if [ "${delay}" -gt 0 ]; then
-        echo "[$(date '+%Y-%m-%d %H:%M:%S')] ${group}: Waiting ${delay}s to stagger startup..." | tee -a "${log_file}"
-        sleep "${delay}"
-    fi
+    local delay=$((RANDOM % 20 + 1))
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] ${group}: Waiting ${delay}s to stagger startup..." | tee -a "${log_file}"
+    sleep "${delay}"
 
     start_time=$(date +%s)
     echo "[$(date '+%Y-%m-%d %H:%M:%S')] STARTING: ${group} (INFRA_ID: ${infra_id})" | tee -a "${log_file}"
diff --git a/test/infra/infra-mysql57/conf/orchestrator/orc1/orchestrator.conf.json b/test/infra/infra-mysql57/conf/orchestrator/orc1/orchestrator.conf.json
index cbf4c80e2..9a1567cd1 100644
--- a/test/infra/infra-mysql57/conf/orchestrator/orc1/orchestrator.conf.json
+++ b/test/infra/infra-mysql57/conf/orchestrator/orc1/orchestrator.conf.json
@@ -3,7 +3,7 @@
   "ListenAddress": ":3000",
   "MySQLTopologySSLSkipVerify": true,
   "MySQLTopologyUser": "root",
-  "MySQLTopologyPassword": "b566f2c146",
+  "MySQLTopologyPassword": "35ecf4109c",
   "BackendDB": "sqlite",
   "SQLite3DataFile": "/var/lib/orchestrator/orchestrator.db",
   "RaftEnabled": true,
diff --git a/test/infra/infra-mysql57/conf/orchestrator/orc2/orchestrator.conf.json b/test/infra/infra-mysql57/conf/orchestrator/orc2/orchestrator.conf.json
index 09732fda6..a49a908d9 100644
--- a/test/infra/infra-mysql57/conf/orchestrator/orc2/orchestrator.conf.json
+++ b/test/infra/infra-mysql57/conf/orchestrator/orc2/orchestrator.conf.json
@@ -3,7 +3,7 @@
   "ListenAddress": ":3000",
   "MySQLTopologySSLSkipVerify": true,
   "MySQLTopologyUser": "root",
-  "MySQLTopologyPassword": "b566f2c146",
+  "MySQLTopologyPassword": "35ecf4109c",
   "BackendDB": "sqlite",
   "SQLite3DataFile": "/var/lib/orchestrator/orchestrator.db",
   "RaftEnabled": true,
diff --git a/test/infra/infra-mysql57/conf/orchestrator/orc3/orchestrator.conf.json b/test/infra/infra-mysql57/conf/orchestrator/orc3/orchestrator.conf.json
index 584e3076a..808e2a008 100644
--- a/test/infra/infra-mysql57/conf/orchestrator/orc3/orchestrator.conf.json
+++ b/test/infra/infra-mysql57/conf/orchestrator/orc3/orchestrator.conf.json
@@ -3,7 +3,7 @@
   "ListenAddress": ":3000",
   "MySQLTopologySSLSkipVerify": true,
   "MySQLTopologyUser": "root",
-  "MySQLTopologyPassword": "b566f2c146",
+  "MySQLTopologyPassword": "35ecf4109c",
   "BackendDB": "sqlite",
   "SQLite3DataFile": "/var/lib/orchestrator/orchestrator.db",
   "RaftEnabled": true,