diff --git a/schemas/extensions.yml b/schemas/extensions.yml
index 4f9e8c7..d2d8c9e 100644
--- a/schemas/extensions.yml
+++ b/schemas/extensions.yml
@@ -72,12 +72,6 @@ nodes:
       - name: description
         kind: Text
         description: Link description (e.g., spine1:eth1 <-> leaf1:eth11)
-      - name: local_ip
-        kind: IPNetwork
-        description: Local interface IP with mask
-      - name: remote_ip
-        kind: IPNetwork
-        description: Remote interface IP with mask
       - name: mtu
         kind: Number
         default_value: 9214
@@ -97,6 +91,11 @@ nodes:
         identifier: underlay_link_local_interface
         cardinality: one
         direction: outbound
+      - name: local_ip_address
+        peer: InfraIPAddress
+        identifier: underlay_link_local_ip
+        cardinality: one
+        direction: outbound
       - name: remote_device
         peer: InfraDevice
         identifier: underlay_link_remote_device
@@ -107,6 +106,11 @@ nodes:
         identifier: underlay_link_remote_interface
         cardinality: one
         direction: outbound
+      - name: remote_ip_address
+        peer: InfraIPAddress
+        identifier: underlay_link_remote_ip
+        cardinality: one
+        direction: outbound
 
   # ================================================================
   # Host Connection