diff --git a/ansible/roles/test/tasks/single_lag_lacp_rate_test.yml b/ansible/roles/test/tasks/single_lag_lacp_rate_test.yml
index 88d67bcd287..f6c27937d81 100644
--- a/ansible/roles/test/tasks/single_lag_lacp_rate_test.yml
+++ b/ansible/roles/test/tasks/single_lag_lacp_rate_test.yml
@@ -29,12 +29,8 @@
     neighbor_interface: "{{vm_neighbors[flap_intf]['port']}}"
     peer_hwsku: 'Arista-VM'
 
-##############################################################################################
-##### TODO:  use minigraph/and VM configuration to figure out neighbor host access info #####
-#####        try not using lldp dynamic info to find neighbor access
-##############################################################################################
 - set_fact:
-    peer_host: "{{ lldp[flap_intf]['chassis']['mgmt-ip'] }}"
+    peer_host: "{{ minigraph_devices[peer_device]['mgmt_addr'] }}"
 
 ### Now prepare for the remote VM interfaces that using PTF docker to check teh LACP DU packet rate is correct
 
diff --git a/ansible/roles/test/tasks/single_lag_test.yml b/ansible/roles/test/tasks/single_lag_test.yml
index 915c84fc8b7..de8e558abee 100644
--- a/ansible/roles/test/tasks/single_lag_test.yml
+++ b/ansible/roles/test/tasks/single_lag_test.yml
@@ -39,12 +39,8 @@
     neighbor_interface: "{{vm_neighbors[flap_intf]['port']}}"
     peer_hwsku: 'Arista-VM'
 
-##############################################################################################
-##### TODO:  use minigraph/and VM configuration to figure out neighbor host access info #####
-#####        try not using lldp dynamic info to find neighbor access
-##############################################################################################
 - set_fact:
-    peer_host: "{{ lldp[flap_intf]['chassis']['mgmt-ip'] }}"
+    peer_host: "{{ minigraph_devices[peer_device]['mgmt_addr'] }}"
 
 - name: test vm interface flap (no physical port down, more like remote port lock) that lag interface can change to correct po status follow minimum links requirement
   include: lag_minlink.yml