diff --git a/juniper-macros.j2 b/juniper-macros.j2
index 6a9d734..1a7ada4 100644
--- a/juniper-macros.j2
+++ b/juniper-macros.j2
@@ -252,7 +252,7 @@ routing-options {
                 session-mode automatic;
             }
 {% for interface in device.interfaces.filter(cable__isnull=False) %}
-            neighbor {{ interface.connected_endpoints[0].addresses.first().address.ip }};
+            neighbor {{ interface.connected_endpoints[0].ip_addresses.first().address.ip }};
 {% endfor %}
         }
 {%- endmacro %}
@@ -272,7 +272,7 @@ routing-options {
                 multiple-as;
             }
 {% for interface in device.interfaces.filter(cable__isnull=False) %}
-            neighbor {{ interface.connected_endpoints[0].addresses.first().address.ip }} {
+            neighbor {{ interface.connected_endpoints[0].ip_addresses.first().address.ip }} {
                 peer-as {{ interface.connected_endpoints[0].local_context_data['underlay_as'] }};
             }
 {% endfor %}