diff --git a/jenkins/scripts/perf/local/submit.py b/jenkins/scripts/perf/local/submit.py
index 7d2954429f71..9af04626da86 100755
--- a/jenkins/scripts/perf/local/submit.py
+++ b/jenkins/scripts/perf/local/submit.py
@@ -286,8 +286,6 @@ def generate_sbatch_params(args, hardware_config, work_dir):
         f"#SBATCH --segment={total_nodes}",
         f"#SBATCH --ntasks={total_gpus}",
         f"#SBATCH --ntasks-per-node={gpus_per_node}",
-        f"#SBATCH --gpus-per-node={gpus_per_node}",
-        f"#SBATCH --gres=gpu:{gpus_per_node}",
         f"#SBATCH --partition={args.partition}",
         f"#SBATCH --time={args.time}",
         f"#SBATCH --account={args.account}",
@@ -550,6 +548,13 @@ def main():
         test_name=select_pattern,
     )
 
+    if benchmark_mode in ("gen_only",):
+        config.setdefault("benchmark", {})["multi_round"] = 1
+        modified_config_path = os.path.join(work_dir, os.path.basename(config_yaml))
+        with open(modified_config_path, "w") as f:
+            yaml.dump(config, f, default_flow_style=False, sort_keys=False)
+        config_yaml = modified_config_path
+
     # Generate sbatch params
     sbatch_lines = generate_sbatch_params(args, hardware_config, work_dir)
 
diff --git a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con1_ctx1_dep4_gen1_tep8_eplb0_mtp3_ccb-UCX.yaml b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con1_ctx1_dep4_gen1_tep8_eplb0_mtp3_ccb-UCX.yaml
index 861b1fab55d1..dc6288dfa58b 100644
--- a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con1_ctx1_dep4_gen1_tep8_eplb0_mtp3_ccb-UCX.yaml
+++ b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con1_ctx1_dep4_gen1_tep8_eplb0_mtp3_ccb-UCX.yaml
@@ -18,7 +18,7 @@ benchmark:
   mode: e2e
   use_nv_sa_benchmark: false
   multi_round: 10
-  benchmark_ratio: 0.0
+  benchmark_ratio: 1.0
   streaming: true
   concurrency_list: '1'
   input_length: 32768
@@ -48,24 +48,27 @@ worker_config:
   gen:
     print_iter_log: true
     max_batch_size: 1
-    max_num_tokens: 256
+    max_num_tokens: 8
+    max_input_len: 32784
+    max_seq_len: 40960
     tensor_parallel_size: 8
     moe_expert_parallel_size: 8
     pipeline_parallel_size: 1
     context_parallel_size: 1
     enable_attention_dp: false
+    enable_lm_head_tp_in_adp: false
     cuda_graph_config:
       enable_padding: true
       max_batch_size: 1
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.9
+      free_gpu_memory_fraction: 0.25
       dtype: fp8
       tokens_per_block: 64
     moe_config:
       backend: TRTLLM
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: &id001
@@ -84,6 +87,8 @@ worker_config:
     print_iter_log: true
     max_batch_size: 1
     max_num_tokens: 32784
+    max_input_len: 32784
+    max_seq_len: 32832
     tensor_parallel_size: 4
     moe_expert_parallel_size: 4
     pipeline_parallel_size: 1
@@ -93,14 +98,14 @@ worker_config:
     cuda_graph_config: null
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.6
+      free_gpu_memory_fraction: 0.4
       dtype: fp8
       tokens_per_block: 64
     moe_config:
       backend: CUTEDSL
       use_low_precision_moe_combine: true
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: *id001
diff --git a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con2048_ctx1_dep4_gen1_dep32_eplb288_mtp1_ccb-UCX.yaml b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con2048_ctx1_dep4_gen1_dep32_eplb288_mtp1_ccb-UCX.yaml
index 502f14dc896d..a2b8f7b1a8f4 100644
--- a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con2048_ctx1_dep4_gen1_dep32_eplb288_mtp1_ccb-UCX.yaml
+++ b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con2048_ctx1_dep4_gen1_dep32_eplb288_mtp1_ccb-UCX.yaml
@@ -49,6 +49,8 @@ worker_config:
     print_iter_log: true
     max_batch_size: 64
     max_num_tokens: 128
+    max_input_len: 32784
+    max_seq_len: 40960
     tensor_parallel_size: 32
     moe_expert_parallel_size: 32
     pipeline_parallel_size: 1
@@ -60,7 +62,7 @@ worker_config:
       max_batch_size: 64
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.85
+      free_gpu_memory_fraction: 0.5
       dtype: fp8
       tokens_per_block: 64
     moe_config:
@@ -70,7 +72,7 @@ worker_config:
         num_slots: 288
         layer_updates_per_iter: 1
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: &id001
@@ -88,6 +90,8 @@ worker_config:
     print_iter_log: true
     max_batch_size: 1
     max_num_tokens: 32784
+    max_input_len: 32784
+    max_seq_len: 32832
     tensor_parallel_size: 4
     moe_expert_parallel_size: 4
     pipeline_parallel_size: 1
@@ -97,14 +101,14 @@ worker_config:
     cuda_graph_config: null
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.6
+      free_gpu_memory_fraction: 0.4
       dtype: fp8
       tokens_per_block: 64
     moe_config:
       backend: CUTEDSL
       use_low_precision_moe_combine: true
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: *id001
diff --git a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con256_ctx1_dep4_gen1_dep32_eplb0_mtp3_ccb-UCX.yaml b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con256_ctx1_dep4_gen1_dep32_eplb0_mtp3_ccb-UCX.yaml
index 24eb58b3b976..bdb9d1ded5ef 100644
--- a/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con256_ctx1_dep4_gen1_dep32_eplb0_mtp3_ccb-UCX.yaml
+++ b/tests/scripts/perf-sanity/disaggregated/gb200_deepseek-v32-fp4_32k4k_con256_ctx1_dep4_gen1_dep32_eplb0_mtp3_ccb-UCX.yaml
@@ -48,7 +48,9 @@ worker_config:
   gen:
     print_iter_log: true
     max_batch_size: 8
-    max_num_tokens: 256
+    max_num_tokens: 64
+    max_input_len: 32784
+    max_seq_len: 40960
     tensor_parallel_size: 32
     moe_expert_parallel_size: 32
     pipeline_parallel_size: 1
@@ -60,14 +62,14 @@ worker_config:
       max_batch_size: 8
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.85
+      free_gpu_memory_fraction: 0.5
       dtype: fp8
       tokens_per_block: 64
     moe_config:
       backend: CUTEDSL
       use_low_precision_moe_combine: true
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: &id001
@@ -85,6 +87,8 @@ worker_config:
     print_iter_log: true
     max_batch_size: 1
     max_num_tokens: 32784
+    max_input_len: 32784
+    max_seq_len: 32832
     tensor_parallel_size: 4
     moe_expert_parallel_size: 4
     pipeline_parallel_size: 1
@@ -94,14 +98,14 @@ worker_config:
     cuda_graph_config: null
     kv_cache_config:
       enable_block_reuse: false
-      free_gpu_memory_fraction: 0.6
+      free_gpu_memory_fraction: 0.4
       dtype: fp8
       tokens_per_block: 64
     moe_config:
       backend: CUTEDSL
       use_low_precision_moe_combine: true
     cache_transceiver_config:
-      max_tokens_in_buffer: 32768
+      max_tokens_in_buffer: 32832
       backend: UCX
     disable_overlap_scheduler: true
     speculative_config: *id001