diff --git a/py-scripts/tools/ct_test_rig.json b/py-scripts/tools/ct_test_rig.json
index efaa5c76..53343414 100644
--- a/py-scripts/tools/ct_test_rig.json
+++ b/py-scripts/tools/ct_test_rig.json
@@ -12,7 +12,7 @@
         "LF_MGR_PORT": "8080",
         "LF_MGR_USER": "lanforge",
         "LF_MGR_PASS": "lanforge",
-        "UPSTREAM_PORT":"eth2",
+        "UPSTREAM_PORT":"1.1.eth2",
         "TEST_TIMEOUT": 600,
         "EMAIL_LIST_PRODUCTION": "support@candelatech.com",
         "EMAIL_LIST_TEST": "support@candelatech.com",
diff --git a/py-scripts/tools/ct_us_001_scripts.json b/py-scripts/tools/ct_us_001_scripts.json
index 6c2e7527..fdddccdd 100755
--- a/py-scripts/tools/ct_us_001_scripts.json
+++ b/py-scripts/tools/ct_us_001_scripts.json
@@ -268,7 +268,17 @@
                 "enabled":"TRUE",
                 "command":"./wlan_capacity_calculator.py",
                 "args":"",
-                "args_list":["-sta 11ac -t Voice -d 9 -spa 3 -ch 20 -gu 800 -high 1 -e TKIP -q Yes -ip 3 -mc 0 -b 6 12 24 54 -m 1518 -co Greenfield -cw 15 -rc Yes"]}
+                "args_list":["-sta 11ac -t Voice -d 9 -spa 3 -ch 20 -gu 800 -high 1 -e TKIP -q Yes -ip 3 -mc 0 -b 6 12 24 54 -m 1518 -co Greenfield -cw 15 -rc Yes"]},
+            "lf_qa":{
+                    "enabled":"TRUE",
+                    "timeout":"600",
+                    "load_db":"skip",
+                    "command":"./tools/lf_qa.py",
+                    "args":"",
+                    "args_list":[
+                        " --path REPORT_PATH --store --png --database DATABASE_SQLITE"
+                    ]
+            }
         }
     }
 }
diff --git a/py-scripts/tools/ct_us_002_rig.json b/py-scripts/tools/ct_us_002_rig.json
index 2940b393..43819d0d 100644
--- a/py-scripts/tools/ct_us_002_rig.json
+++ b/py-scripts/tools/ct_us_002_rig.json
@@ -12,7 +12,7 @@
         "LF_MGR_PORT": "8080",
         "LF_MGR_USER": "lanforge",
         "LF_MGR_PASS": "lanforge",
-        "UPSTREAM_PORT": "eth2",
+        "UPSTREAM_PORT": "1.1.eth2",
         "TEST_TIMEOUT": 600,
         "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com",
         "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com",
diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json
index 4aa6c648..744bb96c 100644
--- a/py-scripts/tools/ct_us_002_tests.json
+++ b/py-scripts/tools/ct_us_002_tests.json
@@ -139,7 +139,7 @@
                 "args_list":[
                     " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984_wc",
                     " --upstream UPSTREAM_PORT --batch_size 1,5,15 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
-                    " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'",
+                    " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984'",
                     " --test_rig TEST_RIG",
                     " --set DUT_SET_NAME "
                 ]
diff --git a/py-scripts/tools/ct_us_003_rig.json b/py-scripts/tools/ct_us_003_rig.json
index 99b07679..053ea38f 100644
--- a/py-scripts/tools/ct_us_003_rig.json
+++ b/py-scripts/tools/ct_us_003_rig.json
@@ -12,7 +12,7 @@
         "LF_MGR_PORT": "8080",
         "LF_MGR_USER": "lanforge",
         "LF_MGR_PASS": "lanforge",
-        "UPSTREAM_PORT":"eth1",
+        "UPSTREAM_PORT":"1.1.eth1",
         "TEST_TIMEOUT": 600,
         "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com",
         "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com",
diff --git a/py-scripts/tools/ct_us_003_tests.json b/py-scripts/tools/ct_us_003_tests.json
index 6bb589af..6bb418fd 100644
--- a/py-scripts/tools/ct_us_003_tests.json
+++ b/py-scripts/tools/ct_us_003_tests.json
@@ -103,7 +103,7 @@
                 "args_list":[
                     " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
                     " --create_scenario mt7915e_dp ",
-                    " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ",
+                    " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
                     " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""                    
                 ]
             },
@@ -115,7 +115,7 @@
                 "args":"",
                 "args_list":[
                     " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name mt7915e_dp",
-                    " --config_name test_con --upstream 1.1.eth1 --dut asus_5g --duration 30s --station 1.1.wlan7",
+                    " --config_name test_con --upstream 1.1.eth1 --dut asus_5g --duration 30s --station 1.1.wlan1",
                     " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ",
                     " --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ",
                     " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'",
diff --git a/py-scripts/tools/ct_us_004_rig.json b/py-scripts/tools/ct_us_004_rig.json
index 5315d37e..6d386d46 100644
--- a/py-scripts/tools/ct_us_004_rig.json
+++ b/py-scripts/tools/ct_us_004_rig.json
@@ -12,7 +12,7 @@
         "LF_MGR_PORT": "8080",
         "LF_MGR_USER": "lanforge",
         "LF_MGR_PASS": "lanforge",
-        "UPSTREAM_PORT": "eth2",
+        "UPSTREAM_PORT": "1.1.eth2",
         "TEST_TIMEOUT": 300,
         "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com",
         "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com",