diff --git a/ansible/roles/test/tasks/lag_lacp_timing_test.yml b/ansible/roles/test/tasks/lag_lacp_timing_test.yml
index 41308c7f8df..fdaefd24087 100644
--- a/ansible/roles/test/tasks/lag_lacp_timing_test.yml
+++ b/ansible/roles/test/tasks/lag_lacp_timing_test.yml
@@ -16,17 +16,17 @@
     packet_timing: "{{ lacp_timer }}"
     packet_timeout: 35
 
-- name: Check LACP timing on eth{{ iface_behind_lag_member_0 }} (interface behind {{ vm_name }}).
+- name: Check LACP timing on eth{{ iface_behind_lag_member[0] }} (interface behind {{ vm_name }}).
   include: lag_run_ptf.yml
   vars:
     lag_ptf_test_name: LacpTimingTest
-    params: "exp_iface={{ iface_behind_lag_member_0 }}; timeout={{ packet_timeout }}; packet_timing={{ packet_timing }}; ether_type={{ lacp_ether_type }}"
+    params: "exp_iface={{ iface_behind_lag_member[0] }}; timeout={{ packet_timeout }}; packet_timing={{ packet_timing }}; ether_type={{ lacp_ether_type }}"
     change_dir: /tmp
 
-- name: Check LACP timing on eth{{ iface_behind_lag_member_1 }} (interface behind {{ vm_name }}).
+- name: Check LACP timing on eth{{ iface_behind_lag_member[1] }} (interface behind {{ vm_name }}).
   include: lag_run_ptf.yml
   vars:
     lag_ptf_test_name: LacpTimingTest
-    params: "exp_iface={{ iface_behind_lag_member_1 }}; timeout={{ packet_timeout }}; packet_timing={{ packet_timing }}; ether_type={{ lacp_ether_type }}"
+    params: "exp_iface={{ iface_behind_lag_member[1] }}; timeout={{ packet_timeout }}; packet_timing={{ packet_timing }}; ether_type={{ lacp_ether_type }}"
     change_dir: /tmp
-  when: iface_behind_lag_member_1 is defined
+  when: iface_behind_lag_member[1] is defined
diff --git a/ansible/roles/test/tasks/single_lag_test.yml b/ansible/roles/test/tasks/single_lag_test.yml
index 348c130f932..4ee9547adfd 100644
--- a/ansible/roles/test/tasks/single_lag_test.yml
+++ b/ansible/roles/test/tasks/single_lag_test.yml
@@ -52,13 +52,12 @@
     wait_down_time: 120
 
 ### Now prepare for the remote VM interfaces that using PTF docker to check teh LACP DU packet rate is correct 
+- set_fact: 
+     iface_behind_lag_member: []
 - set_fact:
-    iface_behind_lag_member_0: "{{ topology['VMs'][peer_device]['vlans'][0] }}"
-
-- set_fact:
-    iface_behind_lag_member_1: "{{ topology['VMs'][peer_device]['vlans'][1] }}"
-  when: testbed_type == 't1-lag'
-
+     iface_behind_lag_member: "{{iface_behind_lag_member}}+ ['{{minigraph_port_indices[item.key]}}']"
+  with_dict: "{{ minigraph_neighbors }}"
+  when: peer_device == "{{item.value.name}}"
 - set_fact:
     neighbor_lag_intfs: []