diff --git a/.github/workflows/continuous-e2e-account-creation-test.yaml b/.github/workflows/continuous-e2e-account-creation-test.yaml
index c4551edc2dee2..e0e0b082f6679 100644
--- a/.github/workflows/continuous-e2e-account-creation-test.yaml
+++ b/.github/workflows/continuous-e2e-account-creation-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-account-creation-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: account_creation
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-changing-working-quorum-test copy.yaml b/.github/workflows/continuous-e2e-changing-working-quorum-test copy.yaml
index 803563b4dfc84..ed6d95f4bb69a 100644
--- a/.github/workflows/continuous-e2e-changing-working-quorum-test copy.yaml	
+++ b/.github/workflows/continuous-e2e-changing-working-quorum-test copy.yaml	
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-changing-working-quorum-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 1200
       FORGE_TEST_SUITE: changing_working_quorum_test
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-changing-working-quorum-test-high-load.yaml b/.github/workflows/continuous-e2e-changing-working-quorum-test-high-load.yaml
index ba68dde6ec5d5..9a53f254d9c5c 100644
--- a/.github/workflows/continuous-e2e-changing-working-quorum-test-high-load.yaml
+++ b/.github/workflows/continuous-e2e-changing-working-quorum-test-high-load.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-changing-working-quorum-test-high-load
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: changing_working_quorum_test_high_load
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-compat-test.yaml b/.github/workflows/continuous-e2e-compat-test.yaml
index a856cfdb695a6..80394e7f42b4c 100644
--- a/.github/workflows/continuous-e2e-compat-test.yaml
+++ b/.github/workflows/continuous-e2e-compat-test.yaml
@@ -15,10 +15,9 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-compat
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 5 minutes
       FORGE_RUNNER_DURATION_SECS: 300
       # This will upgrade from testnet branch to the latest main
       FORGE_TEST_SUITE: compat
       IMAGE_TAG: testnet
-      POST_TO_SLACK: true
\ No newline at end of file
+      POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-consensus-stress-test.yaml b/.github/workflows/continuous-e2e-consensus-stress-test.yaml
index 0b03f5ad7e323..3cc06159fba5b 100644
--- a/.github/workflows/continuous-e2e-consensus-stress-test.yaml
+++ b/.github/workflows/continuous-e2e-consensus-stress-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-consensus-stress-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 2400
       FORGE_TEST_SUITE: consensus_stress_test
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-different-node-speed-and-reliability-test.yaml b/.github/workflows/continuous-e2e-different-node-speed-and-reliability-test.yaml
index e70491572c3e9..63d9b1f56e758 100644
--- a/.github/workflows/continuous-e2e-different-node-speed-and-reliability-test.yaml
+++ b/.github/workflows/continuous-e2e-different-node-speed-and-reliability-test.yaml
@@ -12,12 +12,11 @@ on:
 jobs:
   ### Please remember to use different namespace for different tests
   # Performance test in an optimal setting
-  run-different-node-speed-and-reliability-test:
+  run-forge-different-node-speed-and-reliability-test:
     uses: ./.github/workflows/run-forge.yaml
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-different-node-speed-and-reliability-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: different_node_speed_and_reliability_test
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-full-node-reboot-stress-test.yaml b/.github/workflows/continuous-e2e-full-node-reboot-stress-test.yaml
index 6b9ffdffd0395..a87462f861bd6 100644
--- a/.github/workflows/continuous-e2e-full-node-reboot-stress-test.yaml
+++ b/.github/workflows/continuous-e2e-full-node-reboot-stress-test.yaml
@@ -15,7 +15,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-fullnode-reboot-stress
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 40 minutes
       FORGE_RUNNER_DURATION_SECS: 1800
       FORGE_TEST_SUITE: fullnode_reboot_stress_test
diff --git a/.github/workflows/continuous-e2e-graceful-overload-test.yaml b/.github/workflows/continuous-e2e-graceful-overload-test.yaml
index b3fb1b474baaa..1687abaa063cf 100644
--- a/.github/workflows/continuous-e2e-graceful-overload-test.yaml
+++ b/.github/workflows/continuous-e2e-graceful-overload-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-graceful-overload-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 1800
       FORGE_TEST_SUITE: graceful_overload
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-network-latency-test.yaml b/.github/workflows/continuous-e2e-network-latency-test.yaml
index 1064783e31634..fa852c85c5444 100644
--- a/.github/workflows/continuous-e2e-network-latency-test.yaml
+++ b/.github/workflows/continuous-e2e-network-latency-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-three-region
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 30 minutes
       FORGE_RUNNER_DURATION_SECS: 1800
       # Pre release has chaos applied
diff --git a/.github/workflows/continuous-e2e-network-partition-test.yaml b/.github/workflows/continuous-e2e-network-partition-test.yaml
index 2814b29fa1209..410139d442860 100644
--- a/.github/workflows/continuous-e2e-network-partition-test.yaml
+++ b/.github/workflows/continuous-e2e-network-partition-test.yaml
@@ -15,7 +15,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-network-partition
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 15 minutes
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: network_partition
diff --git a/.github/workflows/continuous-e2e-nft-mint-test.yaml b/.github/workflows/continuous-e2e-nft-mint-test.yaml
index 46444c278e85d..851086f66b53a 100644
--- a/.github/workflows/continuous-e2e-nft-mint-test.yaml
+++ b/.github/workflows/continuous-e2e-nft-mint-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-nft-mint-test
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: nft_mint
       POST_TO_SLACK: true
diff --git a/.github/workflows/continuous-e2e-performance-test.yaml b/.github/workflows/continuous-e2e-performance-test.yaml
index ededc4e83cf5e..ac76c82a2fb7a 100644
--- a/.github/workflows/continuous-e2e-performance-test.yaml
+++ b/.github/workflows/continuous-e2e-performance-test.yaml
@@ -17,7 +17,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-performance
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 2 hours
       FORGE_RUNNER_DURATION_SECS: 7200
       # Land blocking is performance test
diff --git a/.github/workflows/continuous-e2e-single-vfn-test.yaml b/.github/workflows/continuous-e2e-single-vfn-test.yaml
index fac4ec5e98185..41cac8b6f0602 100644
--- a/.github/workflows/continuous-e2e-single-vfn-test.yaml
+++ b/.github/workflows/continuous-e2e-single-vfn-test.yaml
@@ -16,7 +16,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-continuous-e2e-single-vfn
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 8 minutes
       FORGE_RUNNER_DURATION_SECS: 480
       FORGE_TEST_SUITE: single_vfn_perf
diff --git a/.github/workflows/continuous-e2e-state-sync-perf-fullnode-apply-test.yaml b/.github/workflows/continuous-e2e-state-sync-perf-fullnode-apply-test.yaml
index ee67c785036b5..8892774aa3b56 100644
--- a/.github/workflows/continuous-e2e-state-sync-perf-fullnode-apply-test.yaml
+++ b/.github/workflows/continuous-e2e-state-sync-perf-fullnode-apply-test.yaml
@@ -16,7 +16,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-state-sync-perf-fullnode-apply
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 40 minutes
       FORGE_RUNNER_DURATION_SECS: 2400
       FORGE_TEST_SUITE: state_sync_perf_fullnodes_apply_outputs
diff --git a/.github/workflows/continuous-e2e-state-sync-perf-fullnode-execute-test.yaml b/.github/workflows/continuous-e2e-state-sync-perf-fullnode-execute-test.yaml
index 9f2984df2b0be..d4273f256ccb5 100644
--- a/.github/workflows/continuous-e2e-state-sync-perf-fullnode-execute-test.yaml
+++ b/.github/workflows/continuous-e2e-state-sync-perf-fullnode-execute-test.yaml
@@ -16,7 +16,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-state-sync-perf-fullnode-execute
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 40 minutes
       FORGE_RUNNER_DURATION_SECS: 2400
       FORGE_TEST_SUITE: state_sync_perf_fullnodes_execute_transactions
diff --git a/.github/workflows/continuous-e2e-state-sync-perf-validator-test.yaml b/.github/workflows/continuous-e2e-state-sync-perf-validator-test.yaml
index cceab1d304ec5..0f58b6fccf255 100644
--- a/.github/workflows/continuous-e2e-state-sync-perf-validator-test.yaml
+++ b/.github/workflows/continuous-e2e-state-sync-perf-validator-test.yaml
@@ -16,7 +16,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-state-sync-perf-validator
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 40 minutes
       FORGE_RUNNER_DURATION_SECS: 2400
       FORGE_TEST_SUITE: state_sync_perf_validators
diff --git a/.github/workflows/continuous-e2e-validator-reboot-stress-test.yaml b/.github/workflows/continuous-e2e-validator-reboot-stress-test.yaml
index c037a0469e5e8..62800e740b841 100644
--- a/.github/workflows/continuous-e2e-validator-reboot-stress-test.yaml
+++ b/.github/workflows/continuous-e2e-validator-reboot-stress-test.yaml
@@ -15,7 +15,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-validator-reboot-stress
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       # Run for 40 minutes
       FORGE_RUNNER_DURATION_SECS: 2400
       FORGE_TEST_SUITE: validator_reboot_stress_test
diff --git a/.github/workflows/twin-validator-test.yaml b/.github/workflows/twin-validator-test.yaml
index 2853e327fe1a3..73be634d4ffce 100644
--- a/.github/workflows/twin-validator-test.yaml
+++ b/.github/workflows/twin-validator-test.yaml
@@ -15,7 +15,6 @@ jobs:
     secrets: inherit
     with:
       FORGE_NAMESPACE: forge-twin-validator
-      FORGE_CLUSTER_NAME: aptos-forge-big-1
       FORGE_RUNNER_DURATION_SECS: 900
       FORGE_TEST_SUITE: twin_validator_test
       POST_TO_SLACK: true
diff --git a/testsuite/forge/src/backend/k8s/stateful_set.rs b/testsuite/forge/src/backend/k8s/stateful_set.rs
index cef55af73790c..cb194b09ab727 100644
--- a/testsuite/forge/src/backend/k8s/stateful_set.rs
+++ b/testsuite/forge/src/backend/k8s/stateful_set.rs
@@ -121,7 +121,7 @@ async fn check_stateful_set_status(
                 .map_err(|e| WorkloadScalingError::RetryableError(e.to_string()))?
                 .status
             {
-                if let Some(container_statuses) = status.container_statuses {
+                if let Some(ref container_statuses) = status.container_statuses {
                     if let Some(container_status) = container_statuses.last() {
                         if let Some(state) = &container_status.state {
                             if let Some(waiting) = &state.waiting {
@@ -161,8 +161,8 @@ async fn check_stateful_set_status(
                     info!("Pod {} at phase {}", &pod_name, phase)
                 }
                 Err(WorkloadScalingError::RetryableError(format!(
-                    "Retry due to pod {} status",
-                    &pod_name
+                    "Retry due to pod {} status {:?}",
+                    &pod_name, status
                 )))
             } else {
                 Err(WorkloadScalingError::FinalError(format!(
@@ -292,17 +292,15 @@ pub async fn check_for_container_restart(
             let pod_api: Api<Pod> = Api::namespaced(kube_client.clone(), kube_namespace);
             Box::pin(async move {
                 // Get the StatefulSet's Pod status
-                if let Some(status) = pod_api
-                    .get_status(format!("{}-0", sts_name).as_str())
-                    .await?
-                    .status
-                {
+                let pod_name = format!("{}-0", sts_name);
+                if let Some(status) = pod_api.get_status(&pod_name).await?.status {
                     if let Some(container_statuses) = status.container_statuses {
                         for container_status in container_statuses {
                             if container_status.restart_count > 0 {
                                 bail!(
-                                    "Container {} restarted {} times ",
+                                    "Container {} in pod {} restarted {} times ",
                                     container_status.name,
+                                    &pod_name,
                                     container_status.restart_count
                                 );
                             }