diff --git a/infrahub/objects/04-interfaces.yml b/infrahub/objects/04-interfaces.yml
index 80ace90..77be787 100644
--- a/infrahub/objects/04-interfaces.yml
+++ b/infrahub/objects/04-interfaces.yml
@@ -11,75 +11,111 @@ spec:
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.1/32"
     - device: ["spine2"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.2/32"
     # Leaf loopbacks (Lo0 + Lo1)
     - device: ["leaf1"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.11/32"
     - device: ["leaf1"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.11/32"
     - device: ["leaf2"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.12/32"
     - device: ["leaf2"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.11/32"
     - device: ["leaf3"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.13/32"
     - device: ["leaf3"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.12/32"
     - device: ["leaf4"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.14/32"
     - device: ["leaf4"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.12/32"
     - device: ["leaf5"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.15/32"
     - device: ["leaf5"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.13/32"
     - device: ["leaf6"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.16/32"
     - device: ["leaf6"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.13/32"
     - device: ["leaf7"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.17/32"
     - device: ["leaf7"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.14/32"
     - device: ["leaf8"]
       name: Loopback0
       description: Router-ID
       enabled: true
+      ip_addresses:
+        - "10.0.250.18/32"
     - device: ["leaf8"]
       name: Loopback1
       description: VTEP
       enabled: true
+      ip_addresses:
+        - "10.0.255.14/32"
 ---
 apiVersion: infrahub.app/v1
 kind: Object
@@ -191,48 +227,64 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.0/31"
     - device: ["spine1"]
       name: Ethernet2
       description: leaf2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.2/31"
     - device: ["spine1"]
       name: Ethernet3
       description: leaf3
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.4/31"
     - device: ["spine1"]
       name: Ethernet4
       description: leaf4
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.6/31"
     - device: ["spine1"]
       name: Ethernet5
       description: leaf5
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.8/31"
     - device: ["spine1"]
       name: Ethernet6
       description: leaf6
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.10/31"
     - device: ["spine1"]
       name: Ethernet7
       description: leaf7
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.12/31"
     - device: ["spine1"]
       name: Ethernet8
       description: leaf8
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.14/31"
     # ============================================================
     # Spine2 Ethernet interfaces (underlay to leafs)
     # ============================================================
@@ -242,48 +294,64 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.0/31"
     - device: ["spine2"]
       name: Ethernet2
       description: leaf2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.2/31"
     - device: ["spine2"]
       name: Ethernet3
       description: leaf3
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.4/31"
     - device: ["spine2"]
       name: Ethernet4
       description: leaf4
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.6/31"
     - device: ["spine2"]
       name: Ethernet5
       description: leaf5
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.8/31"
     - device: ["spine2"]
       name: Ethernet6
       description: leaf6
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.10/31"
     - device: ["spine2"]
       name: Ethernet7
       description: leaf7
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.12/31"
     - device: ["spine2"]
       name: Ethernet8
       description: leaf8
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.14/31"
     # ============================================================
     # Leaf Ethernet interfaces
     # Each leaf has: Ethernet1 (host), Ethernet10 (mlag peer-link),
@@ -308,12 +376,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.1/31"
     - device: ["leaf1"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.1/31"
     # Leaf2
     - device: ["leaf2"]
       name: Ethernet1
@@ -333,12 +405,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.3/31"
     - device: ["leaf2"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.3/31"
     # Leaf3
     - device: ["leaf3"]
       name: Ethernet1
@@ -358,12 +434,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.5/31"
     - device: ["leaf3"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.5/31"
     # Leaf4
     - device: ["leaf4"]
       name: Ethernet1
@@ -383,12 +463,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.7/31"
     - device: ["leaf4"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.7/31"
     # Leaf5
     - device: ["leaf5"]
       name: Ethernet1
@@ -408,12 +492,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.9/31"
     - device: ["leaf5"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.9/31"
     # Leaf6
     - device: ["leaf6"]
       name: Ethernet1
@@ -433,12 +521,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.11/31"
     - device: ["leaf6"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.11/31"
     # Leaf7
     - device: ["leaf7"]
       name: Ethernet1
@@ -458,12 +550,16 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.13/31"
     - device: ["leaf7"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.2.13/31"
     # Leaf8
     - device: ["leaf8"]
       name: Ethernet1
@@ -483,10 +579,13 @@ spec:
       enabled: true
       mtu: 9214
       mode: routed
+      ip_addresses:
+        - "10.0.1.15/31"
     - device: ["leaf8"]
       name: Ethernet12
       description: spine2
       enabled: true
       mtu: 9214
       mode: routed
-
+      ip_addresses:
+        - "10.0.2.15/31"
diff --git a/infrahub/objects/05-ipam.yml b/infrahub/objects/05-ipam.yml
index ac8c06a..12ebcf1 100644
--- a/infrahub/objects/05-ipam.yml
+++ b/infrahub/objects/05-ipam.yml
@@ -11,371 +11,121 @@ spec:
     # ============================================================
     - address: "10.0.250.1/32"
       description: spine1 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["spine1"]
-          name: Loopback0
     - address: "10.0.250.2/32"
       description: spine2 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["spine2"]
-          name: Loopback0
     - address: "10.0.250.11/32"
       description: leaf1 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf1"]
-          name: Loopback0
     - address: "10.0.250.12/32"
       description: leaf2 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf2"]
-          name: Loopback0
     - address: "10.0.250.13/32"
       description: leaf3 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf3"]
-          name: Loopback0
     - address: "10.0.250.14/32"
       description: leaf4 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf4"]
-          name: Loopback0
     - address: "10.0.250.15/32"
       description: leaf5 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf5"]
-          name: Loopback0
     - address: "10.0.250.16/32"
       description: leaf6 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf6"]
-          name: Loopback0
     - address: "10.0.250.17/32"
       description: leaf7 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf7"]
-          name: Loopback0
     - address: "10.0.250.18/32"
       description: leaf8 Router-ID
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf8"]
-          name: Loopback0
     # ============================================================
     # Loopback1 addresses (VTEP) — /32
     # ============================================================
     - address: "10.0.255.11/32"
       description: leaf1 VTEP (shared VTEP1)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf1"]
-          name: Loopback1
     - address: "10.0.255.11/32"
       description: leaf2 VTEP (shared VTEP1)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf2"]
-          name: Loopback1
     - address: "10.0.255.12/32"
       description: leaf3 VTEP (shared VTEP2)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf3"]
-          name: Loopback1
     - address: "10.0.255.12/32"
       description: leaf4 VTEP (shared VTEP2)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf4"]
-          name: Loopback1
     - address: "10.0.255.13/32"
       description: leaf5 VTEP (shared VTEP3)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf5"]
-          name: Loopback1
     - address: "10.0.255.13/32"
       description: leaf6 VTEP (shared VTEP3)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf6"]
-          name: Loopback1
     - address: "10.0.255.14/32"
       description: leaf7 VTEP (shared VTEP4)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf7"]
-          name: Loopback1
     - address: "10.0.255.14/32"
       description: leaf8 VTEP (shared VTEP4)
-      interface:
-        kind: InfraInterfaceLoopback
-        data:
-          device: ["leaf8"]
-          name: Loopback1
     # ============================================================
     # Spine1 P2P underlay — /31
     # ============================================================
     - address: "10.0.1.0/31"
       description: spine1 Ethernet1 to leaf1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet1
     - address: "10.0.1.2/31"
       description: spine1 Ethernet2 to leaf2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet2
     - address: "10.0.1.4/31"
       description: spine1 Ethernet3 to leaf3
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet3
     - address: "10.0.1.6/31"
       description: spine1 Ethernet4 to leaf4
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet4
     - address: "10.0.1.8/31"
       description: spine1 Ethernet5 to leaf5
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet5
     - address: "10.0.1.10/31"
       description: spine1 Ethernet6 to leaf6
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet6
     - address: "10.0.1.12/31"
       description: spine1 Ethernet7 to leaf7
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet7
     - address: "10.0.1.14/31"
       description: spine1 Ethernet8 to leaf8
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine1"]
-          name: Ethernet8
     # ============================================================
     # Spine2 P2P underlay — /31
     # ============================================================
     - address: "10.0.2.0/31"
       description: spine2 Ethernet1 to leaf1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet1
     - address: "10.0.2.2/31"
       description: spine2 Ethernet2 to leaf2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet2
     - address: "10.0.2.4/31"
       description: spine2 Ethernet3 to leaf3
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet3
     - address: "10.0.2.6/31"
       description: spine2 Ethernet4 to leaf4
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet4
     - address: "10.0.2.8/31"
       description: spine2 Ethernet5 to leaf5
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet5
     - address: "10.0.2.10/31"
       description: spine2 Ethernet6 to leaf6
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet6
     - address: "10.0.2.12/31"
       description: spine2 Ethernet7 to leaf7
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet7
     - address: "10.0.2.14/31"
       description: spine2 Ethernet8 to leaf8
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["spine2"]
-          name: Ethernet8
     # ============================================================
     # Leaf P2P underlay (leaf side) — /31
     # ============================================================
     # Leaf1
     - address: "10.0.1.1/31"
       description: leaf1 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf1"]
-          name: Ethernet11
     - address: "10.0.2.1/31"
       description: leaf1 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf1"]
-          name: Ethernet12
     # Leaf2
     - address: "10.0.1.3/31"
       description: leaf2 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf2"]
-          name: Ethernet11
     - address: "10.0.2.3/31"
       description: leaf2 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf2"]
-          name: Ethernet12
     # Leaf3
     - address: "10.0.1.5/31"
       description: leaf3 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf3"]
-          name: Ethernet11
     - address: "10.0.2.5/31"
       description: leaf3 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf3"]
-          name: Ethernet12
     # Leaf4
     - address: "10.0.1.7/31"
       description: leaf4 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf4"]
-          name: Ethernet11
     - address: "10.0.2.7/31"
       description: leaf4 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf4"]
-          name: Ethernet12
     # Leaf5
     - address: "10.0.1.9/31"
       description: leaf5 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf5"]
-          name: Ethernet11
     - address: "10.0.2.9/31"
       description: leaf5 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf5"]
-          name: Ethernet12
     # Leaf6
     - address: "10.0.1.11/31"
       description: leaf6 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf6"]
-          name: Ethernet11
     - address: "10.0.2.11/31"
       description: leaf6 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf6"]
-          name: Ethernet12
     # Leaf7
     - address: "10.0.1.13/31"
       description: leaf7 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf7"]
-          name: Ethernet11
     - address: "10.0.2.13/31"
       description: leaf7 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf7"]
-          name: Ethernet12
     # Leaf8
     - address: "10.0.1.15/31"
       description: leaf8 Ethernet11 to spine1
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf8"]
-          name: Ethernet11
     - address: "10.0.2.15/31"
       description: leaf8 Ethernet12 to spine2
-      interface:
-        kind: InfraInterfaceEthernet
-        data:
-          device: ["leaf8"]
-          name: Ethernet12
diff --git a/infrahub/objects/07-interface-vlans.yml b/infrahub/objects/07-interface-vlans.yml
index 69ec20e..82743e7 100644
--- a/infrahub/objects/07-interface-vlans.yml
+++ b/infrahub/objects/07-interface-vlans.yml
@@ -13,48 +13,64 @@ spec:
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.254/31"
     - device: ["leaf2"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.255/31"
     - device: ["leaf3"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.252/31"
     - device: ["leaf4"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.253/31"
     - device: ["leaf5"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.250/31"
     - device: ["leaf6"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.251/31"
     - device: ["leaf7"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.248/31"
     - device: ["leaf8"]
       name: Vlan4090
       description: MLAG Peer-Link
       enabled: true
       autostate: false
       vlan: ["4090"]
+      ip_addresses:
+        - "10.0.199.249/31"
     # Vlan4091 — MLAG iBGP Peering SVI (all leafs)
     - device: ["leaf1"]
       name: Vlan4091
@@ -62,48 +78,64 @@ spec:
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.0/31"
     - device: ["leaf2"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.1/31"
     - device: ["leaf3"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.2/31"
     - device: ["leaf4"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.3/31"
     - device: ["leaf5"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.4/31"
     - device: ["leaf6"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.5/31"
     - device: ["leaf7"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.6/31"
     - device: ["leaf8"]
       name: Vlan4091
       description: MLAG iBGP Peering
       enabled: true
       mtu: 9214
       vlan: ["4091"]
+      ip_addresses:
+        - "10.0.3.7/31"
     # Vlan34 — VRF gold subnet (leaf3/leaf4)
     - device: ["leaf3"]
       name: Vlan34
@@ -111,12 +143,16 @@ spec:
       enabled: true
       virtual_router_address: "10.34.34.1"
       vlan: ["34"]
+      ip_addresses:
+        - "10.34.34.2/24"
     - device: ["leaf4"]
       name: Vlan34
       description: VRF gold subnet
       enabled: true
       virtual_router_address: "10.34.34.1"
       vlan: ["34"]
+      ip_addresses:
+        - "10.34.34.3/24"
     # Vlan78 — VRF gold subnet (leaf7/leaf8)
     - device: ["leaf7"]
       name: Vlan78
@@ -124,20 +160,28 @@ spec:
       enabled: true
       virtual_router_address: "10.78.78.1"
       vlan: ["78"]
+      ip_addresses:
+        - "10.78.78.2/24"
     - device: ["leaf8"]
       name: Vlan78
       description: VRF gold subnet
       enabled: true
       virtual_router_address: "10.78.78.1"
       vlan: ["78"]
+      ip_addresses:
+        - "10.78.78.3/24"
     # Vlan900 — BGP border peering (leaf7/leaf8)
     - device: ["leaf7"]
       name: Vlan900
       description: BGP border peering
       enabled: true
       vlan: ["900"]
+      ip_addresses:
+        - "10.90.90.2/29"
     - device: ["leaf8"]
       name: Vlan900
       description: BGP border peering
       enabled: true
-      vlan: ["900"]
\ No newline at end of file
+      vlan: ["900"]
+      ip_addresses:
+        - "10.90.90.3/29"
diff --git a/infrahub/objects/08-ipam-vlans.yml b/infrahub/objects/08-ipam-vlans.yml
index 2fc93f2..759a1f2 100644
--- a/infrahub/objects/08-ipam-vlans.yml
+++ b/infrahub/objects/08-ipam-vlans.yml
@@ -11,164 +11,54 @@ spec:
     # ============================================================
     - address: "10.0.199.254/31"
       description: leaf1 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf1"]
-          name: Vlan4090
     - address: "10.0.199.255/31"
       description: leaf2 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf2"]
-          name: Vlan4090
     - address: "10.0.199.252/31"
       description: leaf3 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf3"]
-          name: Vlan4090
     - address: "10.0.199.253/31"
       description: leaf4 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf4"]
-          name: Vlan4090
     - address: "10.0.199.250/31"
       description: leaf5 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf5"]
-          name: Vlan4090
     - address: "10.0.199.251/31"
       description: leaf6 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf6"]
-          name: Vlan4090
     - address: "10.0.199.248/31"
       description: leaf7 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf7"]
-          name: Vlan4090
     - address: "10.0.199.249/31"
       description: leaf8 MLAG peer-link
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf8"]
-          name: Vlan4090
     # ============================================================
     # MLAG iBGP Peering SVI (Vlan4091) — /31
     # ============================================================
     - address: "10.0.3.0/31"
       description: leaf1 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf1"]
-          name: Vlan4091
     - address: "10.0.3.1/31"
       description: leaf2 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf2"]
-          name: Vlan4091
     - address: "10.0.3.2/31"
       description: leaf3 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf3"]
-          name: Vlan4091
     - address: "10.0.3.3/31"
       description: leaf4 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf4"]
-          name: Vlan4091
     - address: "10.0.3.4/31"
       description: leaf5 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf5"]
-          name: Vlan4091
     - address: "10.0.3.5/31"
       description: leaf6 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf6"]
-          name: Vlan4091
     - address: "10.0.3.6/31"
       description: leaf7 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf7"]
-          name: Vlan4091
     - address: "10.0.3.7/31"
       description: leaf8 MLAG iBGP peering
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf8"]
-          name: Vlan4091
     # ============================================================
     # VRF gold SVI addresses — /24
     # ============================================================
     # Vlan34 (leaf3/leaf4)
     - address: "10.34.34.2/24"
       description: leaf3 Vlan34 VRF gold
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf3"]
-          name: Vlan34
     - address: "10.34.34.3/24"
       description: leaf4 Vlan34 VRF gold
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf4"]
-          name: Vlan34
     # Vlan78 (leaf7/leaf8)
     - address: "10.78.78.2/24"
       description: leaf7 Vlan78 VRF gold
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf7"]
-          name: Vlan78
     - address: "10.78.78.3/24"
       description: leaf8 Vlan78 VRF gold
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf8"]
-          name: Vlan78
     # Vlan900 — BGP border (leaf7/leaf8)
     - address: "10.90.90.2/29"
       description: leaf7 Vlan900 BGP border
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf7"]
-          name: Vlan900
     - address: "10.90.90.3/29"
       description: leaf8 Vlan900 BGP border
-      interface:
-        kind: InfraInterfaceVlan
-        data:
-          device: ["leaf8"]
-          name: Vlan900