diff --git a/ansible/roles/sonic/tasks/vsonic.yml b/ansible/roles/sonic/tasks/vsonic.yml
index 83c1ce443e1..2f286d2c1ea 100644
--- a/ansible/roles/sonic/tasks/vsonic.yml
+++ b/ansible/roles/sonic/tasks/vsonic.yml
@@ -30,7 +30,7 @@
 
 - name: create interface config
   shell: >
-          sonic-cfggen -p /usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/port_config.ini -k Force10-S6000 --print-data
+          sonic-cfggen -p /usr/share/sonic/device/x86_64-kvm_x86_64-r0/SONiC-VM/port_config.ini -k SONiC-VM --print-data
           | jq '.PORT[].admin_status |= "up"'
           > config-port.json
   when: hostname in configuration
diff --git a/ansible/roles/sonic/templates/configdb-t0-leaf.j2 b/ansible/roles/sonic/templates/configdb-t0-leaf.j2
index 0af57ab6307..555a0342111 100644
--- a/ansible/roles/sonic/templates/configdb-t0-leaf.j2
+++ b/ansible/roles/sonic/templates/configdb-t0-leaf.j2
@@ -21,7 +21,7 @@
 {% if iface['lacp'] is defined %}
     "PORTCHANNEL_MEMBER": {
 {% set index = name | replace("Ethernet", "") | int - 1 %}
-        "PortChannel{{ iface['lacp'] }}|Ethernet{{ index * 4}}": {}
+        "PortChannel{{ iface['lacp'] }}|Ethernet{{ index + 1}}": {}
     },
 {% endif %}
 {% endfor %}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 125cbcbedeb..7437647803e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,3 +45,17 @@ stages:
         ptf_name: ptf_vms6-2
         tbtype: t1-lag
         vmtype: ceos
+
+  - job:
+    pool: sonictest-sonic-t0
+    displayName: "kvmtest-t0-sonic"
+    timeoutInMinutes: 240
+
+    steps:
+    - template: .azure-pipelines/run-test-template.yml
+      parameters:
+        dut: vlab-01
+        tbname: vms-kvm-t0
+        ptf_name: ptf_vms6-1
+        tbtype: t0-sonic
+        vmtype: vsonic
diff --git a/tests/kvmtest.sh b/tests/kvmtest.sh
index 5fc8bc52c5e..71faf9d2fe6 100755
--- a/tests/kvmtest.sh
+++ b/tests/kvmtest.sh
@@ -163,7 +163,7 @@ test_t0_sonic() {
     tests="bgp/test_bgp_fact.py"
 
     pushd $SONIC_MGMT_DIR/tests
-    ./run_tests.sh $RUNTEST_CLI_COMMON_OPTS -c "$tests" -p logs/$tgname -e "--neighbor_type=sonic --skip_sanity --disable_loganalyzer"
+    ./run_tests.sh $RUNTEST_CLI_COMMON_OPTS -c "$tests" -p logs/$tgname -e "--neighbor_type=sonic"
     popd
 }