diff --git a/objects/10-bgp-sessions.yml b/objects/10-bgp-sessions.yml
index 0af2483..23ec94d 100644
--- a/objects/10-bgp-sessions.yml
+++ b/objects/10-bgp-sessions.yml
@@ -508,7 +508,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "spine1__evpn"
+        - ["spine1__evpn"]
     # ============================================================
     # Spine2 address families
     # ============================================================
@@ -523,7 +523,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "spine2__evpn"
+        - ["spine2__evpn"]
     # ============================================================
     # Leaf1 address families
     # ============================================================
@@ -532,8 +532,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf1__underlay"
-        - "leaf1__underlay_ibgp"
+        - ["leaf1__underlay"]
+        - ["leaf1__underlay_ibgp"]
       networks:
         - ["10.0.250.11/32"]
         - ["10.0.255.11/32"]
@@ -542,7 +542,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf1__evpn"
+        - ["leaf1__evpn"]
     # ============================================================
     # Leaf2 address families
     # ============================================================
@@ -551,8 +551,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf2__underlay"
-        - "leaf2__underlay_ibgp"
+        - ["leaf2__underlay"]
+        - ["leaf2__underlay_ibgp"]
       networks:
         - ["10.0.250.12/32"]
         - ["10.0.255.11/32"]
@@ -561,7 +561,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf2__evpn"
+        - ["leaf2__evpn"]
     # ============================================================
     # Leaf3 address families
     # ============================================================
@@ -570,8 +570,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf3__underlay"
-        - "leaf3__underlay_ibgp"
+        - ["leaf3__underlay"]
+        - ["leaf3__underlay_ibgp"]
       networks:
         - ["10.0.250.13/32"]
         - ["10.0.255.12/32"]
@@ -580,7 +580,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf3__evpn"
+        - ["leaf3__evpn"]
     # ============================================================
     # Leaf4 address families
     # ============================================================
@@ -589,8 +589,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf4__underlay"
-        - "leaf4__underlay_ibgp"
+        - ["leaf4__underlay"]
+        - ["leaf4__underlay_ibgp"]
       networks:
         - ["10.0.250.14/32"]
         - ["10.0.255.12/32"]
@@ -599,7 +599,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf4__evpn"
+        - ["leaf4__evpn"]
     # ============================================================
     # Leaf5 address families
     # ============================================================
@@ -608,8 +608,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf5__underlay"
-        - "leaf5__underlay_ibgp"
+        - ["leaf5__underlay"]
+        - ["leaf5__underlay_ibgp"]
       networks:
         - ["10.0.250.15/32"]
         - ["10.0.255.13/32"]
@@ -618,7 +618,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf5__evpn"
+        - ["leaf5__evpn"]
     # ============================================================
     # Leaf6 address families
     # ============================================================
@@ -627,8 +627,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf6__underlay"
-        - "leaf6__underlay_ibgp"
+        - ["leaf6__underlay"]
+        - ["leaf6__underlay_ibgp"]
       networks:
         - ["10.0.250.16/32"]
         - ["10.0.255.13/32"]
@@ -637,7 +637,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf6__evpn"
+        - ["leaf6__evpn"]
     # ============================================================
     # Leaf7 address families
     # ============================================================
@@ -646,8 +646,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf7__underlay"
-        - "leaf7__underlay_ibgp"
+        - ["leaf7__underlay"]
+        - ["leaf7__underlay_ibgp"]
       networks:
         - ["10.0.250.17/32"]
         - ["10.0.255.14/32"]
@@ -656,7 +656,7 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf7__evpn"
+        - ["leaf7__evpn"]
     # ============================================================
     # Leaf8 address families
     # ============================================================
@@ -665,8 +665,8 @@ spec:
       afi: ipv4
       safi: unicast
       active_peer_groups:
-        - "leaf8__underlay"
-        - "leaf8__underlay_ibgp"
+        - ["leaf8__underlay"]
+        - ["leaf8__underlay_ibgp"]
       networks:
         - ["10.0.250.18/32"]
         - ["10.0.255.14/32"]
@@ -675,4 +675,4 @@ spec:
       afi: evpn
       safi: unicast
       active_peer_groups:
-        - "leaf8__evpn"
+        - ["leaf8__evpn"]
diff --git a/objects/12-mlag.yml b/objects/12-mlag.yml
index 29b8e56..c6d73bb 100644
--- a/objects/12-mlag.yml
+++ b/objects/12-mlag.yml
@@ -79,7 +79,7 @@ spec:
     # Leaf2 MLAG peer config
     - device: ["leaf2"]
       mlag_domain: ["leafs-1-2"]
-      local_interface_ip: "10.0.199.255/31"
+      local_interface_ip: "10.0.199.254/31"
       peer_address: "10.0.199.254"
       heartbeat_peer_ip: "172.16.0.25"
       local_interface: ["leaf2", "Vlan4090"]
@@ -95,7 +95,7 @@ spec:
     # Leaf4 MLAG peer config
     - device: ["leaf4"]
       mlag_domain: ["leafs-3-4"]
-      local_interface_ip: "10.0.199.253/31"
+      local_interface_ip: "10.0.199.252/31"
       peer_address: "10.0.199.252"
       heartbeat_peer_ip: "172.16.0.27"
       local_interface: ["leaf4", "Vlan4090"]
@@ -111,7 +111,7 @@ spec:
     # Leaf6 MLAG peer config
     - device: ["leaf6"]
       mlag_domain: ["leafs-5-6"]
-      local_interface_ip: "10.0.199.251/31"
+      local_interface_ip: "10.0.199.250/31"
       peer_address: "10.0.199.250"
       heartbeat_peer_ip: "172.16.0.29"
       local_interface: ["leaf6", "Vlan4090"]
@@ -127,7 +127,7 @@ spec:
     # Leaf8 MLAG peer config
     - device: ["leaf8"]
       mlag_domain: ["leafs-7-8"]
-      local_interface_ip: "10.0.199.249/31"
+      local_interface_ip: "10.0.199.248/31"
       peer_address: "10.0.199.248"
       heartbeat_peer_ip: "172.16.0.31"
       local_interface: ["leaf8", "Vlan4090"]