diff --git a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json
index 2d064a69..ed582c18 100644
--- a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json
+++ b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json
@@ -9,7 +9,7 @@
             "Batch tx power (optional, can run all passed in on command line) : 1 2 3 4 5 6 7 8 ",
             "sample command from tools directory:",
             " ./lf_check.py --json_rig ./ct_rig_json/ct_9136_WLC1_lanforge.json --json_dut ./ct_dut_json/ct_9136_dut.json",
-            " --json_test ./ct_test_json/ct_9136_tx_power_tests.json --suite suite_tx_power --path '/home/lanforge/html-reports/ct-us-9136"
+            " --json_test ./ct_tests_json/ct_9136_tx_power_tests.json --suite suite_tx_power --path '/home/lanforge/html-reports/ct-us-9136"
         ]  
     },
     "test_suites":{
@@ -42,7 +42,8 @@
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w optional --wifi_mode auto",
                     " --channel USE_BATCH_CHANNEL --nss USE_BATCH_NSS --bandwidth USE_BATCH_BANDWIDTH  --txpower USE_BATCH_TX_POWER",
-                    " --outfile tx_power_24g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --outfile tx_power_24g_2B24 --no_cleanup_station --no_cleanup",
+                    " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },
@@ -74,7 +75,7 @@
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w optional --wifi_mode auto",
                     " --channel '5' --nss '5' --bandwidth '20'  --txpower '6'",
-                    " --outfile tx_power_override_24g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --outfile tx_power_override_24g_2B24 --no_cleanup_station --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },
@@ -106,7 +107,8 @@
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w optional --wifi_mode auto",
                     " --channel USE_BATCH_CHANNEL --nss USE_BATCH_NSS --bandwidth USE_BATCH_BANDWIDTH  --txpower USE_BATCH_TX_POWER",
-                    " --outfile tx_power_5g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --outfile tx_power_5g_2B24 --no_cleanup_station --no_cleanup",
+                    " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },
@@ -138,7 +140,8 @@
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w optional --wifi_mode auto",
                     " --channel '36 100' --nss '1 2' --bandwidth '40 160'  --txpower '4 8'",
-                    " --outfile tx_power_5g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --outfile tx_power_5g_2B24 --no_cleanup_station --no_cleanup",
+                    " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },
@@ -164,14 +167,15 @@
                     " --user admin --passwd Cisco123 --prompt WLC1",
                     " --series 9800 --band 6g --module cc_module_9800_3504",
                     " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_6g 2",
-                    " use_ssid_idx=1 --wlan SSID_USED --wlan_id 2 --wlan_ssid SSID_USED",
+                    " use_ssid_idx=2 --wlan SSID_USED --wlan_id 2 --wlan_ssid SSID_USED",
                     " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile",
                     " use_ssid_idx=2 --radio wiphy2 --station sta0000 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED",
                     " --pathloss 59 --antenna_gain 0",
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w required --wifi_mode auto",
                     " --channel USE_BATCH_CHANNEL --nss USE_BATCH_NSS --bandwidth USE_BATCH_BANDWIDTH  --txpower USE_BATCH_TX_POWER",
-                    " --outfile tx_power_5g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --outfile tx_power_5g_2B24 --no_cleanup_station --no_cleanup",
+                    " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },
@@ -184,10 +188,6 @@
                     "USE_BATCH_TX_POWER for tx_power batch"],
                 "enabled":"TRUE",
                 "load_db":"skip",
-                "batch_channel":"1 33 65 97 129 161 193",
-                "batch_nss":"1 2",
-                "batch_bandwidth":"20 40 80 160",
-                "batch_tx_power":"1 2 3 4 5 6 7 8",
                 "timeout":"180",
                 "command":"lf_tx_power.py",
                 "args":"",
@@ -195,15 +195,16 @@
                     " --scheme ssh --dest localhost --port 8887",
                     " --user admin --passwd Cisco123 --prompt WLC1",
                     " --series 9800 --band 6g --module cc_module_9800_3504",
-                    " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_5g 1",
+                    " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_6g 2",
                     " use_ssid_idx=2 --wlan SSID_USED --wlan_id 1 --wlan_ssid SSID_USED",
                     " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile",
-                    " use_ssid_idx=1 --radio wiphy2 --station sta0000 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED",
+                    " use_ssid_idx=2 --radio wiphy2 --station sta0000 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED",
                     " --pathloss 59 --antenna_gain 0",
                     " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1",
                     " --vht160 --ieee80211w required --wifi_mode auto",
-                    " --channel '33' --nss '1' --bandwidth '160'  --txpower '4 8'",
-                    " --outfile tx_power_override_6g_2B24 --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
+                    " --channel '33' --nss '1' --bandwidth '160'  --txpower '4'",
+                    " --outfile tx_power_override_6g_2B24 --no_cleanup_station --no_cleanup",
+                    " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5",
                     " --local_lf_report_dir REPORT_PATH"
                 ]
             },